diff --git a/Manifest b/Manifest
index e7e26ce98df7..512f4636736f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29309 BLAKE2B b544570f9957244aa630ac88a5c854c055812a781093a8f0e4fd07454942c53026a20409c4ea9c753f4fbdb4ef8c2436e09e9b265039bd1f1bb9a763ee3e35d2 SHA512 94d746a887c0dcd4a1c3b5aebdae73197794e7f6d72b8827119652ef0276aa171ba0f9134de4de762e8586cd72ebd31fc58f43c98de2ba78183189a630042dbf
-TIMESTAMP 2021-11-01T14:09:19Z
+MANIFEST Manifest.files.gz 29316 BLAKE2B 8c3f8f4a7021f1c572be8462793ac4c5e2e6fbb159c9f3f83aecd4604f6cb4b319950342a62b57ed795456542f5a3d6a774db6e713c37705a64ae259fade2b2a SHA512 013a0f0101f96e2f0b0412f621a1c79140244d73965f5d1fdbb471554ed471e57e4a67e1feaf2f9fe868c118e45848e062577de2f96e3e22208f3f7530cac26c
+TIMESTAMP 2021-11-02T12:09:18Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmF/9Q9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGBKm5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC9qw/9F/io0/W5atmPRSS27p6U7iPtuZfQ50sak5zDW6gQakmCvFk0u5iynT6K
-McPuwqbEXrKQbnql9cYAiJgUO8jkaziIkIqaT8ks50FfWll9PlCiGRPAiJafTODi
-wuEHGe6kjn+63wpCU624Q8Yx1kyOqLdLyYNcdY4Ok7OJOMYFtSfm/z/r8YQDLw16
-Czn4c33PfTf87eU2/Mf9OjQgwQTETT3G1ppQNVvrQozCodzUOpYXIXSmmkT3EW9g
-KykuSBLSTAMvcXTrqv7aZJTMwH66vNOT6AU8Xiuv6GDi7OrY8DUiiGuScGBhIjlq
-96VWntfobeXk500szi6HoWUY0e/7pdqwPs+20NGwyDu7HOj4+4MleXEqn6YHInuW
-JZ/Lgmll52OSCLLpVwhLmxFpwjAyBq4r2bPKaAckQa+JGsEYthC2DhC5j/Dy9PQN
-EHzRCSKET8rzGsNY4jwkZEn4BylySaRfT+wQKS41F4uQ/G4+9zjXYy86So1af1CZ
-zGJ8lpmLvGmAg+m2cml0jtZ+uocpwiPP25X1xYGQMereQZ2OF4ezeCaP4ShZIXO1
-skxrBNy5h+3JRXLuYgHjLW9r8KMWkr305Z2AbRjqKrUrHyvdJiVLzN2sMc6HQMYo
-JxeAR2QPoJma7zB8X3lVCmdk7Au5zIKav80Vf7CF3IU4B2QLr6s=
-=FWCf
+klBoUBAAlQASDzYlir2ETc9L8QH4cSinB635jkB5aqDKLVlWoQxMB2fhhWIW/JeU
+Lf6lbCRevq60XSTIEcqgUyh2qTQfsdBjtn/+norZYUQsS2/M6GkQE5jZ3LiANGAU
+fsk9IUjrB0OUvE6pmElxShz8BhA7bPOy1F72GpCTbMv64c0zq08oYRsaqF9mJic0
+TgmbEjE2gmeFFHnIq7VxR+c7lm/jjiQSi+G0eakIA1QTto53Xqwziz0YiwA4LsN6
+Uz5YqDCR0jNq9iY69OQ//TEpgo+MTnqX46m4bx1wpRCy14Ds5OJ+R5M3a05OzInq
+nbeUXqq5Gdf/z2Y/X3mNsCI7lO7q2XYfJpB1nXenj4HAoUVewO5gvTUuZhQAmnDM
+NrA7Xwvw68kAqnPUvCiVLKuC38+cTwgFl/ZVQ9m30n1423l4EJ1azP4O/Z9egI1t
+UTO9l1/EcfGSTQpAfE85enLfJ5BEB3M6ittuirvylIDs0/a3rkc0UCaBQEWz8dXA
+yOi3aLCT7FDGxQBuOeYoItJ0ZKrA8cMWXQv7pqTwPXzSk6+ARSvFkH9y/7n4PTwY
+1411PgDSK3j8C65Hn9M9ztKK9rB/CrwvU5eDv6THXCbfW/+g3I30bSScw3GYqlnJ
+RKq2wOfqYwQqArDB3Gl4hX7dZ7Mr3IHN2CIidekknJcDUJIpdyU=
+=To1u
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 9e9972b77ec0..0b231f71281e 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index fb2a89ee11b9..09bcb690892c 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 106bed99ded7..c661828f3605 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST awscli-1.20.65.tar.gz 2091702 BLAKE2B e8295cf4e859c1e642077f4014fdea333292e
 DIST awscli-1.21.5.tar.gz 2095418 BLAKE2B 152d0ac70e9e0120fb9b10451904af52035bce84168c055695e7dc93e56648bd7689f20ac0ecdbdfc54ccb846d51b33027d2e9ee09c5e5d1e915c0ec05b0fbfe SHA512 e3063252a50fc6033669a0ff80f82d73764a6728d623d75a27f0652e779cbeb452454d887bf5bd70199a7394df40f9758b14619778c6428a164d590e6c8aaa89
 DIST awscli-1.21.6.tar.gz 2095961 BLAKE2B 7c765168604cf98f2c1be1aebf1cacb425124dff51a0a1ba1792634187feab6361d740aa743eda7d41a671300d4196e852640e04f56aa399752ce3305ac1ce86 SHA512 912d81f96cef3ae1c2a0969050e1bce304d1019a98d6bf16e45de50c66f85f6f69a10ceffeae773aafa002227e657861a9f41d123368c1b4a93b5d49747137d3
 DIST awscli-1.21.7.tar.gz 2095914 BLAKE2B 6cb53fab223941a41eceeb8430d7158bc14da670a42609707ee5aea02a7e9d43f32fd7118ef7ab4ede54dd5312a4907eac7aa0e040d775ca7f606049dfc1a090 SHA512 8bf7dd4aaab890e4269a02fdd8735dd918a31783128dab46bc5077310ca385717fe4da913c2fb3c36e1132eaaea40cb7c4f434d6060fe27cd4bfc704581cd1e0
+DIST awscli-1.21.8.tar.gz 2096389 BLAKE2B 5af0d744e243f9251a4d70914db58d2e154959505960fc93de6804951c4f41851072f7431f13e91b0d8ac96e349bdfc67517e2166e33e4224a68f91d9d7749c4 SHA512 3ca4913070ed468ea95376b5e571244af8bc562972c1894b4144b7e5e1c6937f298267d9e4db65549fcd61f6b6b552354070091c5b387b6e10f67f8a36e3611c
 EBUILD awscli-1.20.53.ebuild 1306 BLAKE2B 1b1be64ca6072a28230aa36c66bea67684784f2d44e040ecdb6694ce5f023168e170a36d3a3e133a9a8559d15dd0aced5e7a78af349f3691a883bc19f7f60318 SHA512 6b9579b86a827d2a4d46568d17899f3a45b047621abec213da57f70603021ab2ac57dbe1e127ee12aa41edc93aafd503db911e13ab744fcaf5ea6d8b5d60ad6c
 EBUILD awscli-1.20.60.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.20.65.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.21.5.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.21.6.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.21.7.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.21.8.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.21.8.ebuild b/app-admin/awscli/awscli-1.21.8.ebuild
new file mode 100644
index 000000000000..81d5997098c2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.21.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index a975c0839075..c828408256d4 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress/Manifest b/app-benchmarks/stress/Manifest
index f481ee8d527f..6363fc9eff33 100644
--- a/app-benchmarks/stress/Manifest
+++ b/app-benchmarks/stress/Manifest
@@ -1,5 +1,5 @@
 DIST stress-1.0.4-r1.tar.gz 191800 BLAKE2B 560065d963823e734bb706840908998a58c07c82b21ab579f7a0fd5163e7a8591ca0f6abe430bba058bafd9a2dac1fcf33f011663cd6c3d2fdefb221a49e5e8f SHA512 623a7d9585828bed4b7673e19fb0cfdda904552cd56353d74106047b64249299d5f8da892ec135f1781ec3984c7d5835dcc6c0d8e659e06c8a1e4fb2af9fd9c4
 DIST stress_1.0.5.orig.tar.gz 105766 BLAKE2B 7bc4a1d7739828ccd4b58c814e8ded42cddbd0b226bb29e916fe220835bcfa9dcdb86191bb321247aa98bd0e58791556713770bdeda5dad399aa61f2703a766c SHA512 8ae2b74213e2a6e7d17948b8277bdd6143c135a6cee64fb43d183b10134eaea761981e1d76af86ea4700b2d41598d5ca53b17755e61982ab50802297b139b805
 EBUILD stress-1.0.4-r2.ebuild 508 BLAKE2B 135bd5cade1e0c0207b165fe8b3ec8d25ea6e5543ff11abfd9412abbae3c8854c6c5a8c46630465ff37f1e3960550cf2eb5181723fab049930daa7d7317c1b63 SHA512 df7987d9b8bf1cfdf45ae9f4d0deb24c161c0d58737d697024618b224ab709d9d8bcc417f38a3001890bcfc83163937de8b246d44d16787faa504e90aa8a379a
-EBUILD stress-1.0.5.ebuild 573 BLAKE2B 0bb970d92efc3ee9a4b83cf0d05006ad00ca9bd741cb694f8fa52f4d30785b2ad6e0254452e9c137877907249c369b207b20c7ad90619a09ed30b4ec262abdbe SHA512 00e40a500df5db3d54108eb75ed0b0a719c7e7765c1687929a7ce64253cc0cb4093c066517c4ea5d97648104dd5a678be18f64ab3b35d25f99d1ae41701f14b1
+EBUILD stress-1.0.5.ebuild 567 BLAKE2B 92b8b7a969a824607111560bad89e7db68ab702e7ddcb209b42536c082acc9428f4fa85069a14b55c678c5633beb50ac004a3d53ef89bf56ebc5feefe0bda5ee SHA512 c4c660930fad99bf1b079d1ead872805ef8b549883255b44859a767ab2968f84ee68ecc8ace37b0aef8006d7165369a1cc8719b9a47699a83387dc4392693972
 MISC metadata.xml 449 BLAKE2B 3017469519500c11712693bec0d179d89a31b9765ca4ab21939c4d5730afb664db66f746b8825d0b71410d704dfef9ad9e6e53233254e01fcb12f1f117a3995b SHA512 eaa43980bce8b1a58010b80b31396313fa50966f9b7229fa201af689308b83f8acd0acdc4b2669793cb5652871865c895ca3708097b96a048c5b10087cea8b0b
diff --git a/app-benchmarks/stress/stress-1.0.5.ebuild b/app-benchmarks/stress/stress-1.0.5.ebuild
index 60a9c7e1e06d..adc0493fb5ba 100644
--- a/app-benchmarks/stress/stress-1.0.5.ebuild
+++ b/app-benchmarks/stress/stress-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static"
 
 src_prepare() {
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8f1f1e1ddbc5..85e0350dad77 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index f093c7ffe368..1b812dfa6dda 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -203,5 +203,5 @@ DIST xcb-0.9.0.crate 129744 BLAKE2B 5854662e87fc75e07ea707263808c8a5c6fd53a65e4f
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD broot-1.6.6.ebuild 4641 BLAKE2B 76d3feda454feaa5702d32df04941d7d3f763f7c13ae04689f277b53b3be4588fc9164f9fbf9b557ddb096fad391e49fe5e734aab8e2a3e1151f48661c19d6c5 SHA512 15df95cf92947c5c4a728bf3d52136d25dc3703e45753e258ee2a96eb830c23c4cb050963ab7d242f31af7518aa24bff184ad4d600a98b4476fe5fb6955c5778
-EBUILD broot-1.7.0.ebuild 4507 BLAKE2B 9330cea524e5a0929450f42d2d65f86de68b5b0040538becf404b8121b3d5ca01ec7e77140714dc29599d3b849676fe0ac86f599af8244e36a8d8a52c57a2bfd SHA512 d69ae525c1b48f6fe550dbd0acb246c32e0f047b5106d9faaec2771d00af5de6ba1cbb8fea916a99f5b0b6ab07c0636a88c8953e5ad87604d5807f6025610e67
+EBUILD broot-1.7.0.ebuild 4537 BLAKE2B 59e50c764df8fc3f74dd310556828a9d7ae343449d3805fda5c4503c828e843cdd2d2c5c44ab8e1e287e4b2787442489f4ed162bf5513bd925f39f040c04c69d SHA512 2485cb46d40fcc7d9252744ed7dbbc256d1f9c7bcd1f8d01c602f2cd6c1306d3bac08e188b9bc7c7fcb8f1e0aeeb6bab4bdd85efc6d94650661faf64b3cb402b
 MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
diff --git a/app-misc/broot/broot-1.7.0.ebuild b/app-misc/broot/broot-1.7.0.ebuild
index f04c95fff990..43b95782a76c 100644
--- a/app-misc/broot/broot-1.7.0.ebuild
+++ b/app-misc/broot/broot-1.7.0.ebuild
@@ -221,6 +221,7 @@ RDEPEND="
 	X? ( x11-libs/libxcb:= )
 "
 DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/rust-1.56"
 
 QA_FLAGS_IGNORED="usr/bin/broot"
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9ccda238b189..eb2cc9c4b52a 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/inform/Manifest b/dev-lang/inform/Manifest
index 48e8d30712ef..ccb97fc11e88 100644
--- a/dev-lang/inform/Manifest
+++ b/dev-lang/inform/Manifest
@@ -1,3 +1,5 @@
 DIST inform-6.33.1-b2.tar.gz 1822648 BLAKE2B e2ea59aa310b2f0122d1b834d98b0b827b945a8031a3e61c70bf502f7a746f43b81035cc22805ab351abf6f9df9ba898ea6ea83da863ef9aa313840ed974d725 SHA512 12cc10b7dae4118600a4d19d0aa44c3a7c93dfc8aa17bd56df7b9237f21df0ae99db6840eefaa5b11ff346369c6f6f2f128167b3479c8f540c29e3e36666c368
-EBUILD inform-6.33.1_p2.ebuild 716 BLAKE2B 8dacc53e6cc8aca22ee5d4aae28d1870163acdc4267d22e6bfe6041a4885fdfda39e083a16dcf662da24a335a9a876a9c5c68cdc5d7eeb77d40dc97cd8a648c3 SHA512 1da71e2e8498c3e89c7764c4f5c7d6ac11ff4220f907bf51ffb89ed839b530889c90f97dede5871afb63b03a491df534f0e35eddaad7a4fd4e6dcea9dbb31640
-MISC metadata.xml 2555 BLAKE2B be44edd87ba20e7b4ed8c20f6844f15b327e4f11d36794562501df85bf98b24298d336ae42fc8e7314d19cde4825f59acc8c233e3b582fb6043d53e4c47e1bea SHA512 726f266399f5a374970a22cb6ad34173304e6c20ba60880b5bd083145e0cff58c64107f1bcf71ac0faf2e0d8ad849ff450f44eb6318fd4ea8d061fabae320492
+DIST inform-6.35-r4.tar.gz 2307089 BLAKE2B 9864324fe29fe920e226a239f92f327678ed796e5f5a27b3814f62b1158673b2c14d6771abd7af6f9743bb0949c4c6de75a6b591337b0e99196f8ab4d9f0c9f7 SHA512 c30c7067786845e0c77783f7a03a151ae1238978f648f6036fe9535a33662c76abc11db21bab00fe60c4742cd4da46e4674081711b9b3852520bfb14c1b068a6
+EBUILD inform-6.33.1_p2.ebuild 738 BLAKE2B 57cd9f597bd7c18bd38ec46186f30fcda437c77bd79f450c4cf76d6e62008ac2a0036e84e3eead371cd13f162a1f8924be6de884b59c4a57813c408907e1acc0 SHA512 54f5d0e522bdaa0cb2269e87842e1eb0bf72f8d4e8c20d5fd250aeac62d35567cd604009dad8593c416c5c0389774f0939b53b9cc70cd75ae74d2b94a5192be0
+EBUILD inform-6.35_p4.ebuild 1230 BLAKE2B 20a7adedbbdac392607fb623304a9a7b438cbf4d3608e73f62b949c7924b167be7705a2f784540dbf226ec62548c5fc68dcf6cc2f7412d1de3f7bbe6ac099298 SHA512 b9abe2a03a75b1546a422208b659a5d630414edd864a8748de81f58e41c7f2eb31dfec4ba9bce1edc1376275721e72a6c96f84fa0d6fb3f81d4294d2c98fb5c1
+MISC metadata.xml 435 BLAKE2B 2f4a52609bb35b017249a38e5ef83642a9e6e70eb7fdb2cfdf329f3761c1c580d165d328012293f0fa4480b3004bd44a35209e39ad669fe024c6386eed2ab5e1 SHA512 cd8065b1a6a8206f19fd3f3ce6f99c4900eae4201a3f18c4bdf17d45a167704a4f005553d084cb4e6d310f5999c48f05ebcc86e019f835a2068c8000fe56c11f
diff --git a/dev-lang/inform/inform-6.33.1_p2.ebuild b/dev-lang/inform/inform-6.33.1_p2.ebuild
index 939c464d7591..f07551c95d98 100644
--- a/dev-lang/inform/inform-6.33.1_p2.ebuild
+++ b/dev-lang/inform/inform-6.33.1_p2.ebuild
@@ -1,25 +1,31 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-MY_P=${P/_p/-b}
-DESCRIPTION="design system for interactive fiction"
-HOMEPAGE="http://www.inform-fiction.org/"
-SRC_URI="http://mirror.ifarchive.org/if-archive/infocom/compilers/inform6/source/${MY_P}.tar.gz"
+EAPI=8
+
+MY_P="${P/_p/-b}"
+
+DESCRIPTION="Design system for interactive fiction"
+HOMEPAGE="https://www.inform-fiction.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Artistic-2 Inform"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="emacs"
-PDEPEND="emacs? ( app-emacs/inform-mode )"
 
-S=${WORKDIR}/${MY_P}
+PDEPEND="emacs? ( app-emacs/inform-mode )"
 
 src_install() {
 	default
+
 	dodoc VERSION
+
 	docinto tutorial
 	dodoc tutor/README tutor/*.inf
-	mv "${ED}"/usr/share/${PN}/manual "${ED}"/usr/share/doc/${PF}/html
-	rmdir "${ED}"/usr/share/inform/{include,module}
+
+	mv "${ED}"/usr/share/{${PN}/manual,doc/${PF}/html} || die
+	rmdir "${ED}"/usr/share/inform/{include,module} || die
+	rm "${ED}"/usr/share/inform/6.33b2/include/SmartCantGo.h || die #723062
 }
diff --git a/dev-lang/inform/inform-6.35_p4.ebuild b/dev-lang/inform/inform-6.35_p4.ebuild
new file mode 100644
index 000000000000..3b193b357e92
--- /dev/null
+++ b/dev-lang/inform/inform-6.35_p4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P="${P/_p/-r}"
+
+DESCRIPTION="Design system for interactive fiction"
+HOMEPAGE="https://www.inform-fiction.org/"
+SRC_URI="https://ifarchive.org/if-archive/infocom/compilers/inform6/source/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Artistic-2 Inform"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="emacs tools"
+# non-interactive tests use ruby, seem broken, and return true even on failure
+RESTRICT="test"
+
+RDEPEND="
+	tools? (
+		dev-lang/perl
+		dev-perl/DateTime
+	)"
+PDEPEND="emacs? ( app-emacs/inform-mode )"
+
+src_compile() {
+	tc-export CC
+
+	emake PREFIX="${EPREFIX}"/usr OPTS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	local emakeargs=(
+		PREFIX="${ED}"/usr
+		REAL_PREFIX="${EPREFIX}"/usr
+		MANDIR="${ED}"/usr/share/man/man1
+		PUNYDOCS="${ED}"/usr/share/doc/${PF}/punyinform
+		PUNYTESTS="${T}" # don't install tests
+	)
+
+	emake -j1 "${emakeargs[@]}" install
+
+	dodoc AUTHORS NEWS README.md VERSION docs/README*
+
+	use tools || rm "${ED}"/usr/bin/*blorb* || die
+
+	find "${ED}"/usr/share/doc \( -name Makefile -o -name 'custom.*' \) -delete || die
+}
diff --git a/dev-lang/inform/metadata.xml b/dev-lang/inform/metadata.xml
index 2396a6450fa3..20f18c5cfb1b 100644
--- a/dev-lang/inform/metadata.xml
+++ b/dev-lang/inform/metadata.xml
@@ -1,44 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>games@gentoo.org</email>
-  <name>Gentoo Games Project</name>
- </maintainer>
- <longdescription>
-A Design System for Interactive Fiction
-
-Just as film might be called a form of literature which needs technology to be 
-read (a cinema projector or a television set) and to be written (a camera), 
-interactive fiction is read with the aid of a computer. On this analogy, Inform 
-is a piece of software enabling any modern computer to be used as the camera, or 
-the film studio, to create works of interactive fiction. To read the resulting 
-works, you and your audience need only a simpler piece of software called an 
-interpreter.
-
-In this genre of fiction, the computer describes a world and the player types 
-instructions like touch the mirror for the protagonist character to follow; the 
-computer responds by describing the result, and so on until a story is told.
-
-Interactive fiction emerged from the old-style "adventure game" (c.1975) and 
-tends to be a playful genre, which must sometimes be teased out as though it were 
-a cryptic crossword puzzle. But this doesn't prevent it from being an artistic 
-medium, which has attracted (for instance) the former U.S. Poet Laureate, Robert 
-Pinsky, and the novelists Thomas M. Disch and Michael Crichton. An interactive 
-fiction is not a child's puzzle-book, with a maze on one page and a rebus on the 
-next, but nor is it a novel. Neither pure interaction nor pure fiction, it lies 
-in a strange and still largely unexplored land in between.
-
-Since its invention (by Graham Nelson in 1993), Inform has been used to design 
-some hundreds of works of interactive fiction, in eight languages, reviewed in 
-periodicals ranging in specialisation from XYZZYnews to The New York Times. It 
-accounts for around ten thousand postings per year to Internet newsgroups. 
-Commercially, Inform has been used as a multimedia games prototyping tool. 
-Academically, it has turned up in syllabuses and seminars from computer science 
-to theoretical architecture, and appears in books such as Cybertext: Perspectives 
-on Ergodic Literature (E. J. Aarseth, Johns Hopkins Press, 1997). Having started 
-as a revival of the then-disused Infocom adventure game format, the Z-Machine, 
-Inform came full circle when it produced Infocom's only text game of the 1990s: 
-Zork: The Undiscovered Underground, by Mike Berlyn and Marc Blank.
- </longdescription>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Install blorbtools for manipulating Blorb files</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">DavidGriffith/inform6unix</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index e78488c37c6d..2f7898204a6e 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -158,9 +158,42 @@ DIST rust-1.56.0-x86_64-unknown-linux-gnu.tar.xz 147894784 BLAKE2B 6cbdb8a82aba4
 DIST rust-1.56.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e0ed39db46b40631f69fa379a04ec37ba314587a4f081aa1f3251e01b7221ee8732b668cfcc4c24c1a3950f3f8dcfd542a1a73c603cea545b812d5d3a9527055 SHA512 3e9d0b159684a496e29c9e40af11f16f5ef5cadd8bc4852018a953310e77a4e29db6c14ffcc86198908aa4998550c83cfd3f2cc42e007122d56167d664776c44
 DIST rust-1.56.0-x86_64-unknown-linux-musl.tar.xz 255010720 BLAKE2B 286e91cbf001de6f888bd82139e6711b32f03d45c599f26b01f60222d98c3521a1933b3b9b7f8c46fa79d481780dc8dc47e5e24985b721a6998d620b446c38b4 SHA512 fb5a914a25ef3cb39393207a75c40f1313740167062feb4cda4084e738f4e93a51624a8a9591acc18553cfd6e2e232984c8c84acc3dfd77fbe38b17085850881
 DIST rust-1.56.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B bb7cfc775c1c44569276e687028e9a7ffac31577310052d9c354179a541ee13b0ca00a025e994e03ab17086d0abe6dda6845ed1cb10879425439c7651bdc9269 SHA512 cb23d98cfb1b59fcccaec575145b6f38846f3f49b16a3be199b06d6198b1db13720157ca65a01f6ef76abf742507bba39776d130f0fd03aa228acf5917457f7d
+DIST rust-1.56.1-aarch64-unknown-linux-gnu.tar.xz 223440940 BLAKE2B 9b4256943c4f5c8be83a81bbeb5f61d80b97c9925a2a2a47d8952530253f0e3e85363357a3cef9c425217a8b9572d4f55df3839640a24bf5b1e3c1dc8323f2b0 SHA512 1e612617206f0cb49ddc24352b8c8d344ac4613a71c59532e8df78189fd2ff13d71e4b1fa433e06e4af9b50292558b00f2118ffb8efff31359c28ac2fd5f5044
+DIST rust-1.56.1-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 008a4eebe92b3403f863ab7bbb023292d267c6084513104ed1d6f401a806abbe3c97a4346d2b01c2c78ea0efd44292fe563f5a7cde959e23b309f492d388d04f SHA512 09180d201ed196105651d7fbe009df96a333ef2326309428db0b10b2c7e0a8fd3e013a63b287e27e7a04441f70cd5ff8abb8a32ac109495d9c4aa4f80ba777f3
+DIST rust-1.56.1-aarch64-unknown-linux-musl.tar.xz 220094692 BLAKE2B b70936cfe4af636cee40bac700f043b1839bdd6f547eb3e9c781b51fb6ab426dded80ecd0c347a9c13d6930041a674f6b53a335a1be538d801eeebee0d98b3fd SHA512 ad9e0725bf570e04f5f439b231480b26a1cbd75eb770397ce2872895ff5705a5025eca06bfe6a60247b7071b0bc810bebe30f2ff99a68a252452e058c72d535e
+DIST rust-1.56.1-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 8cf6a20edb6f4f53f6169f63031b259d02491a494c3110aecc791d80bc90aa9a7d90987e789946680b7ecac1bcf7f0a29c6208af5e29ac971c55a017252d99e2 SHA512 d4d4b04ea3c0f2c435186098b7889da008fbcf6205aff8e10d3b1c64e72aaa49520a9d781e9fc01c064d5bea471bb67af3a64e510ba4406151a52fdaa3640e77
+DIST rust-1.56.1-arm-unknown-linux-gnueabi.tar.xz 202697992 BLAKE2B e4f4e68792699aa5a52e53414529309aef309533c3955a38a1de6a32ba13e8f4742693c7ca9ad0c1609a8e827200a8abc23c706d8dab302e9ce67ba493b81fa5 SHA512 afef90ce4e438e1383025642541bc2cdb383f1716b51484ad8a0ec7df4ce0dd635362b892bd009bb389b537d4d56ff876fbc1544af52c8d26d7e39842ab8b99b
+DIST rust-1.56.1-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 19808e687f5c24f7a4d63441fecfb80a2eed5c7cac448a34b2e049a6bf8656b9a145656066cb381ba0ba163a191c1a6fe99389fa0bb9e6937ef31f1514b8f0ae SHA512 7dc83b332ffe654ea811b4e0a8280cae7cac997592b8011a014ce8c13e33696e4a08fe062dad1e95b6577d41680281394b0d7757376a9fe7c91b6648b27673a5
+DIST rust-1.56.1-arm-unknown-linux-gnueabihf.tar.xz 199832312 BLAKE2B 547f24f17e99b365855d52fc4eeec60d268b1fd039a551266328d553b8a5f4159c7fa466b2eadd340a4e66bd184fecbef5422a9168bbbf51f256c84273f9b6cc SHA512 2c498d84fd6ac68f11e7751c6bf4ed694b53ba1605b7c77a9d25f0d443443268bdbc9f1cb68bf19af0b22c928c4f3e261baa2c7ed360561820cb4926a5e9d88b
+DIST rust-1.56.1-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B ecd6e8641f899f3f3a05d7a9b8cdab820d0cc7f7a03cb37df9302d6f40cd4f1cafa4b78b0341289bfe798c8cb4778c471337563a5248e2e369dfb5cf82d1a57c SHA512 1848a554df193a2ac799fe021fef0f5ccd7288576b7370bb11202595c1706cfad30debccea90bc8678e83ab5050671e99de7b6bae2581935f669718f2dfebb60
+DIST rust-1.56.1-armv7-unknown-linux-gnueabihf.tar.xz 205164704 BLAKE2B fb2b1c21561e35898a70a590dcf917f38eb0771c2902fa8e58d6e2a5c634ade52c893027ea22f00be350c249ab5336135ac462bd3495c9722b17576f0e39b7f9 SHA512 fd890ad58a346896a282b78b5138523c0ac06d177f9ec7c6df5262f24e9226be0e0f7a5d67d93d989e73c9380c0292fb7b3c977627cb5b57f48c8621a9b1444a
+DIST rust-1.56.1-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 810674d02b026ac9a768ed1bae893c62d25311c3316eae6a97e9b885b55a896acc286c1f039af040ebad8de80795eb3c8a2e476fc71e11485340240361b74800 SHA512 e1a0f9b8e22725634e96c42fe8e6f950836baf077ea578f099120c9eb77b8e075f6317df730849f3577d320253ce90b15a4a5803c47b33c340b104533f66aa76
+DIST rust-1.56.1-i686-unknown-linux-gnu.tar.xz 215749044 BLAKE2B 5aa6b03f77ba632ac43d972d70e40c4f81e40607ad691f789829ca307acb167e164978a11aade4e89a7b2a4ebaf76833c9f59de9c2b7f7387a3a726fd62da638 SHA512 56e9fa266c0cb668695c202c80b768aba9443b8e594530a3fbdef9ddaff6a37251eca5de584423b51fbee9f0b7712e5de59f6cd0892da4ed036fef5b9e74f27c
+DIST rust-1.56.1-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 4b16a978a6b8a10fd23a280351f37bee1bba23f437e613d2059a3c735ee472700a82fab973c2570f36eab730d000c27c0356ffd68a1784cc3dacf3366b211916 SHA512 b702a4f8953867b205f872ca8c886ad6e45a0794a955c878f18fe087d6d3d181221fa44e87e6f9913a683139707ade2f084558ade7475438f3c2a25be009a715
+DIST rust-1.56.1-mips-unknown-linux-gnu.tar.xz 160905644 BLAKE2B 28fe08b7b80666d36c9f31f885778b3710a443ba2ca2b42d26ccb8172c6035e75badb49e0947f728648d68f1b10620088178568c5b9c847eb57e60233f3a91a8 SHA512 d805115ca963035bbefa619b20c756159983653746d1e7b6f239a9ea694fcc5fef39dda362c138a2951c739be8e3dc1c982a5317d646c332be9203408f80b43c
+DIST rust-1.56.1-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d9a6aa5a05dd6266007c779a16bdae01c23f34433e3e53e5937f67e0905bd59f67ee9d986a53f22d88e8f1a3eb5cf627314b5f1e504d55163f2bf18f206d8455 SHA512 3e32d3b95fbc95b41eee9bb95946f94336ad6edde58c2eba1a89674beaa544c00fb1de3ccfd7336109bae2b20ae590691062eeba198ed5ff0272db4a073aed55
+DIST rust-1.56.1-mips64-unknown-linux-gnuabi64.tar.xz 165745828 BLAKE2B c79f54e19d2cf8fe06ee796787880ef1946f737174a18e9b0ddd1b5b8770421c6d0339bc18970abc1c0cb18055c3ef78ff2fda51083175d875f38664a2a467c2 SHA512 be7c3d341f0217015ccb4c0221feec6612e10bac826e3b0d35c1a6cb09499ef1fe7ee1b44e131e91ae569a4b6ac02f533b7ee4f3b0a4c048c2a02f95d1f68797
+DIST rust-1.56.1-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B 97ea8d84db8d68d821d2bfec3bac1fff1e30554447bf5e9e5e1e27efce095b26ea5df8dc41087edccfbd2a57a58aa225423a597ee04c15c49fa8f74d59faf022 SHA512 91acab66759833b31d46f757d6d482dff3fc85b305a682aa8bcaecfbd0072df3cb4b0544b32c52ef79a6ed1096997172ecf35bc07e1ae6ff207b60f8ff6933d4
+DIST rust-1.56.1-mipsel-unknown-linux-gnu.tar.xz 165019404 BLAKE2B f452b04048250ad9e4bdd5797b4c0d0c45cc2e8be72b25b1e5b8421d8b6e240ed05e5573569dd0aea450ccc2fae6cb463814e7795af50477cdda86db807a19b1 SHA512 6b4ea1b864ce57d7796c1c268fff23184cf669de47f5b54775bff3062d7862f4a7d98f5ff84387b76b10088c36eda15a4073847687305b5e290c18ed47d2e11f
+DIST rust-1.56.1-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 07c3a01b9daadc6ea952ec3a7110ee1a3c4dfddd69cd9e5339165f76c91902d634908ec0beb0dc0fb5bdfe42406901d0039f28861f6662a18555e289e8aab05d SHA512 b09a18fc1e4e2fe181895e41e62896bfcffc2ce46a03204455f9b7beb19771af4e79000d16ef07f7fa4a06eb018dbaf3d8b8b1385a4dfaa147ad2b693efe1334
+DIST rust-1.56.1-powerpc-unknown-linux-gnu.tar.xz 174988436 BLAKE2B b1adae448adff47283b0761c9923d78dd6cf2aa608e9f53f9e156f41cdf5c29358236222c65e3d6202f98a08c2199e9f3ea7cd5838c259f8ff07b0ea276aa408 SHA512 680e0a4e5b3cda2ea89c4ab35a2fcf6210f2b829f284090ba5c793d9e76cb58f7cf6f60dcfcf1e26eba836690fa48be40b902a4f3599446be7be98b57d8ea20b
+DIST rust-1.56.1-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 10f35bc23dd39a1e3f924e472ad0a0dfff4b30060c5b41868688541a80da7d47c5ea3a16684fe980fb83e8c72b6b6ca7d6f7c349d9c869f8300f042be2cc8e4a SHA512 765f0f9ef47568b8bba751b788ff9baa837c7d5e25da52e18b99ae6cb613ce19a725b7fdd6d6adaada18c24fdb308f73b18ad13b6abeaf34be91748fe78173b6
+DIST rust-1.56.1-powerpc64-unknown-linux-gnu.tar.xz 186458276 BLAKE2B 3510ca7e2356f2101dc8e6a22de2d68fe48d4c1892e26b23eab18d7f0f1218499e41d325be267fb0284369567243c7e2fae9bb1ba62035fea1ad1c8ee1d57cba SHA512 34db35c1543239a4641eba4ee7d5435ac5383863fce843163ce1fa22c7aeb48199a696ccac199719d308eacd9c626922cf50a918869ae88cc2ae63dd0de9f5b5
+DIST rust-1.56.1-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5755d15be9df74576abf0ec4db1ead6a7bf3069d8ce2edcb834da971ad0dadc0a41fecddecbf06b653b4ca71dbb799bd7a02126a00c294c0f0c2b9fb76fc69ab SHA512 27a57ad6aade3ba6453f3e98b8c456bea61ce9ccc6d8682721edad3b7747f2aac8dba87c419db2c5e049e005e3ccc708cc9a5f1d84e6a7daf6d90ec2d39c7bc5
+DIST rust-1.56.1-powerpc64le-unknown-linux-gnu.tar.xz 196128248 BLAKE2B 7e5e5cb32496f2aa5f2dfbca37c53db92741ab7e56ee42c092046a96effead9819c906d22552159ddee9d7fbc4cf98b6e02aa53d39a3e58bc28a145304bb80d5 SHA512 603e9232879e5b9f79f91807f64e088cf657449bd8884c37218585d78c8b6e1919ac8f0aa7b6d38cbe844a89f837170a1bb8e0b4062c8b4aa9cca457eff89bdf
+DIST rust-1.56.1-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7e0822d38d7a6de478441c97d0f0d7506a750cb2bbe8c80f3bd210e74c2b2a0523b417c6b3070ec1f0131e0b9375f7a10a1b97588aaf8a1a73dc4ba110237c2f SHA512 cc5eca73c067b0802081c2469857d85a2853a1dd7a42a604400c150e91df1a0baae0a4a612f9a3e11fdc5de745598ae160f1606787ef251186db9b1f121cac3d
+DIST rust-1.56.1-riscv64gc-unknown-linux-gnu.tar.xz 192592824 BLAKE2B 77d786d652978b7a6c93c290b5be49e69986858eb388e8325e40b7bdf5659b4e8bdaeef1b2654955ca0a4cb66fab83a788db2299fda9938a281ff534dd901191 SHA512 7d2431b173b48f8411a7e10d4c3b8880ded7330b14709d847f50b0b974f2cc261c942d729b663b86f2b4b637dd7c30f6d10976da037d0d4215c798407d418efe
+DIST rust-1.56.1-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 210d69dc7c7cfba3ca4ecc8070e2ab193ce6abfe927779f3a55fe30b6cd6c588a2e4c8c18dcfa2014830c087fe97896fb1907b2a639c953cb6056d49107e34a9 SHA512 774f917e1145db0c9164d97937d486916334ccfb8dcb6bf859cfb49585f82e34185e755a105b7b811e74e6a3d629e3343d7620094b1d6aa43428525508368871
+DIST rust-1.56.1-s390x-unknown-linux-gnu.tar.xz 194367060 BLAKE2B 33820048a10e83754b09bb8c99ac876fd9dd7a36377dfc6802b906b1fab4669a711d1ac4e2b59e8cba3ae0ad3cd96d10fb00cb1324e8cd2ebde5d0805a58861a SHA512 aa0231187d3f096bfb223707e08262ff79f1b6fb9969814fc2385d3a134efc456bb43030723e614163ff27e6d6a779d27b77ad7ed05c80ab24b22fd10f9bc183
+DIST rust-1.56.1-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c3c5e9678c61a1ec80aca4620d13bbe2164bb648895d25c90e61ac4a2b31c059445cb851417fa3477906cb5ea52c2318f6b6974916d59a3ab41444d419edbb64 SHA512 a5372dd48b9b65a9c4aa74dfe6f5294b1fe12149d6fdc15a6b23b132c8b05d634211dd9a4be3a916aecc7bfbc6710ea1116681876d547ecc4c1de6958fd6f26e
+DIST rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz 147853396 BLAKE2B 1d1318c9f076f1488d94eb345f01b511ed956b29511fa64706603aa141a18b1a937459b95f1354507a31ef8dc795ebff06f0006431088792e629a0534b9beabf SHA512 129c619c3a27b6be903b953efa033731b29436cf83c5229ad1137d2d26571379e5d6e2b3a5704e3002547560e47ae1fa7b6c98990bd2ea482299ad94099bb4b0
+DIST rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ff984dfa092ff3c1c5a3d1a5849b8dc5807c5885dff5eca020d0b1c404484197adb8e1ea5802886b15e2b8846d0f3aa4bb161e49dc39adc151ca7d57a988ff24 SHA512 53b57ceaf621248fff020de75434c8fe60657335852c88d14ea399c7935206caaff61ce159cb2f487510336981aa1d839b91153b9764ea21ced1fb6455a16bdd
+DIST rust-1.56.1-x86_64-unknown-linux-musl.tar.xz 255304020 BLAKE2B c379fb419b6fa1c73b9c426a4f6e46328ce2ac1beddffb1ed25922b3387147eaf0217d3904ccc14ce2b97952f1035760264ae5fc7a575f92bea84d9581d8b315 SHA512 b26d4b9f6396be87aadfbb4777d91c80cfe656570e2bf1a0350788ca45caa7178d4b91966e77c8cc4873e017fd99649ae6a82abad64b32a4eb1f5dfb3a20d45e
+DIST rust-1.56.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B aed2703ef8cdcdf076d6538fb968f465c0a884b4c11916470324116e56a5b93fd7118b8b167ab19007ac71201044789f58de3a7ee1b60dffc47c3d123db1b4a5 SHA512 32c042982da7bde6c36bcb33fd3d9ebcb469667c880214b703e7b2cf89467e7e2bf37282cbc128d0207b9e433b7f2bd028e0d2614b657b544a552aa401bc98c8
 EBUILD rust-bin-1.52.1.ebuild 5378 BLAKE2B 88912dbecd970882f4a6acdc66f4058b2eca20541b77bf98f799354dc3c4e6c1606592e57bac4c05eb5aa44901b4bbd14577bcb3ded25db730bdcdf6d4eca5f6 SHA512 4d2f865a1431b13fe40d40eac7b8bdff6e3da4af094d2fa125369bc864bc6d9669cacf94401e33703284ff8b955818283f659157176a1283fa299555f0a30f34
 EBUILD rust-bin-1.53.0.ebuild 5378 BLAKE2B 88912dbecd970882f4a6acdc66f4058b2eca20541b77bf98f799354dc3c4e6c1606592e57bac4c05eb5aa44901b4bbd14577bcb3ded25db730bdcdf6d4eca5f6 SHA512 4d2f865a1431b13fe40d40eac7b8bdff6e3da4af094d2fa125369bc864bc6d9669cacf94401e33703284ff8b955818283f659157176a1283fa299555f0a30f34
 EBUILD rust-bin-1.54.0.ebuild 5383 BLAKE2B 7c271e76a052a77c4bbdb72969f33be124c3f5a028e70e3797ef2895e50f5b5a4725deac92f7c3fad64c8fbf1be1d9a1b61e91db4d25453de69abab6980a3cb7 SHA512 147596f07d55953ed795ab2e6b6162505a3cac65526e0acc08db1f37094df9471519e143a709e5a410790b17288b24e9d16ab916855891b15b8cb24af9edeb0d
 EBUILD rust-bin-1.55.0.ebuild 5383 BLAKE2B 7c271e76a052a77c4bbdb72969f33be124c3f5a028e70e3797ef2895e50f5b5a4725deac92f7c3fad64c8fbf1be1d9a1b61e91db4d25453de69abab6980a3cb7 SHA512 147596f07d55953ed795ab2e6b6162505a3cac65526e0acc08db1f37094df9471519e143a709e5a410790b17288b24e9d16ab916855891b15b8cb24af9edeb0d
 EBUILD rust-bin-1.56.0.ebuild 5383 BLAKE2B 7c271e76a052a77c4bbdb72969f33be124c3f5a028e70e3797ef2895e50f5b5a4725deac92f7c3fad64c8fbf1be1d9a1b61e91db4d25453de69abab6980a3cb7 SHA512 147596f07d55953ed795ab2e6b6162505a3cac65526e0acc08db1f37094df9471519e143a709e5a410790b17288b24e9d16ab916855891b15b8cb24af9edeb0d
+EBUILD rust-bin-1.56.1.ebuild 5383 BLAKE2B 7c271e76a052a77c4bbdb72969f33be124c3f5a028e70e3797ef2895e50f5b5a4725deac92f7c3fad64c8fbf1be1d9a1b61e91db4d25453de69abab6980a3cb7 SHA512 147596f07d55953ed795ab2e6b6162505a3cac65526e0acc08db1f37094df9471519e143a709e5a410790b17288b24e9d16ab916855891b15b8cb24af9edeb0d
 MISC metadata.xml 490 BLAKE2B 91056b5357c6d4a4bb86d867114272211ffd3bc8299e89fd1fe5f83f4809687c9f79dcca87df02d2d4e0d820df8de7457fac7869ba1e12d8a02b54fd0bde8ad4 SHA512 1052d99d16e2bcd4dc37c94966cee016e11ab020137dd4d73839b305ce58b158ee1df5e4315ee9657c530d2ef8f5a1c44ecccee49e4968cb69a1216da6203178
diff --git a/dev-lang/rust-bin/rust-bin-1.56.1.ebuild b/dev-lang/rust-bin/rust-bin-1.56.1.ebuild
new file mode 100644
index 000000000000..64f7fa3d9544
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.56.1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rustfmt"
+
+DEPEND=""
+RDEPEND=">=app-eselect/eselect-rust-20190311"
+BDEPEND="
+	prefix? ( dev-util/patchelf )
+	verify-sig? ( app-crypt/openpgp-keys-rust )
+"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+	opt/${P}/bin/.*
+	opt/${P}/lib/.*.so
+	opt/${P}/libexec/.*
+	opt/${P}/lib/rustlib/.*/bin/.*
+	opt/${P}/lib/rustlib/.*/lib/.*
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	verify-sig_src_unpack
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+patchelf_for_bin() {
+	local filetype=$(file -b ${1})
+	if [[ ${filetype} == *ELF*interpreter* ]]; then
+		einfo "${1}'s interpreter changed"
+		patchelf ${1} --set-interpreter ${2} || die
+	elif [[ ${filetype} == *script* ]]; then
+		hprefixify ${1}
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+
+	# start native abi install
+	pushd "${S}" >/dev/null || die
+	local analysis std
+	analysis="$(grep 'analysis' ./components)"
+	std="$(grep 'std' ./components)"
+	local components="rustc,cargo,${std}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rls && components="${components},rls-preview,${analysis}"
+	use rustfmt && components="${components},rustfmt-preview"
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	if use prefix; then
+		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
+		find "${ED}/opt/${P}/bin" -type f -print0 | \
+			while IFS=  read -r -d '' filename; do
+				patchelf_for_bin ${filename} ${interpreter} \; || die
+			done
+		eend $?
+	fi
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+
+	einfo "installing eselect-rust symlinks and paths"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
+		local ver_i="${i}-bin-${PV}"
+		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}"
+		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
+	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
+	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
+	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
+
+	# musl logic can be improved a bit, but fine as is for now
+	cat <<-_EOF_ > "${T}/50${P}"
+	LDPATH="${EPREFIX}/usr/lib/rust/lib"
+	MANPATH="${EPREFIX}/usr/lib/rust/man"
+	$(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	$(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	_EOF_
+	doenvd "${T}/50${P}"
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+	/usr/bin/cargo
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	/usr/lib/rustlib
+	/usr/lib/rust/lib
+	/usr/lib/rust/man
+	/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+	popd >/dev/null || die
+	#end native abi install
+
+	else
+		local rust_target
+		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
+		dodir "/opt/${P}/lib/rustlib"
+		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
+			"${ED}/opt/${P}/lib/rustlib" || die
+	fi
+
+	# BUG: installs x86_64 binary on other arches
+	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index e516e0159e03..293eefb30a0b 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -175,9 +175,12 @@ DIST rustc-1.55.0-src.tar.xz 117197580 BLAKE2B 8d9739ce7571146aee0e07c6287de9a8c
 DIST rustc-1.55.0-src.tar.xz.asc 801 BLAKE2B 5b4ba951ed7ed56c7bd9c71df89cc1e966485d77411016ad71a811ad8e21b88295deec08f24f65afdb163e69ee0fe19288bcc64d18fe272bea51319caddb66b2 SHA512 9bc858ce26cc069cafaefe6165cb15a07e144ad6d6312bcbe115a0a51fec6e281d3e8a7977e958d7fa10e77139548d57396b1552a2802ec74b7bc6ac641e7ae4
 DIST rustc-1.56.0-src.tar.xz 121802340 BLAKE2B aa471fd0785d6ceb75d4b661d466a450c960f6df19018a74732f2bab6ec176ea95e247e7cd44d550345bfa723bfc1b6088f0436287bed3752558654198856003 SHA512 2daa365524b47dcc48e49a0e9c8c45988af44c0845e2695dc5053f18e768e49acf3dbdd77f808dbf260546ef608eb47c593544012dd05675cb7e6b6223900315
 DIST rustc-1.56.0-src.tar.xz.asc 801 BLAKE2B 75bd829e457b6cefb2fcdfd04ef835487c295420d9d9c8fd7af800b405fe1113c14be01ad3540fea7ed7c743397e337ce1d3b0e757c73292d7f342f352e89791 SHA512 e81cf3d8b1c97803138d4487c32c1463526d53513112b4fa170a81ba947280613fb3260b43d0629a45c859519ea094e467ce0cc0def722577febc3cc34ce5ed8
+DIST rustc-1.56.1-src.tar.xz 121798264 BLAKE2B 09677b0332022f28a0d80949a6735929dbf64276f7eb57195d8c33e6c80f13c903432ff77d8834093ab551677618fb1d385f2300e2b1b4c064f9c245c696be32 SHA512 193468e211cde9ebc5f6e30b8e3733b79bd8710fe6dd45c7ed8d4392f91010d30466787afd4d0b2041cd7dd994924fee8ad111048824e248bd994959e55bf15f
+DIST rustc-1.56.1-src.tar.xz.asc 801 BLAKE2B 70ed1c26971e864aa6cc9b05eb52c4a140d0d0cccb3ff66d4a13e1b1dbac958c5369f76524c4702311566ed26aff635f5e3d35d9da71d96e070f5f0e978dc2ba SHA512 f997e7962ef8b283c19c97d8b898f3642f1a58c89a9cc5470cf88682263a42e2054d670c12bf93c41e81edf8324a5b51453f402a74bccb7744c7f463cf689aa8
 EBUILD rust-1.52.1.ebuild 20520 BLAKE2B ae12faa245d6043afb9dd9b62db207d89eae1655940369a9663d7ac9388f2390b854c32a459256f843b35b8eccdf4d7ee78170c14d6565b2c2ad28d72cdf4202 SHA512 e4bb2c8ab8bec76d6881b8aec1008e7a5f1a49ce16175137b4eaf4e3052a01ddb77304d44a30e344e90953ace280df1dd13172317d662b989c5cce6f27aa1375
 EBUILD rust-1.53.0.ebuild 20802 BLAKE2B 97c59e812e197158a9a0b9bdcf8a41417298bf80afee1642526ed396b087da6d990d3559efcb3d50898374a0bd06ebd0764a9325c3268c6a40926ae33b015894 SHA512 a5bab41380d0d122fa2b81012af04cc9e4cb1b1299e20c14d05cf989a437f63b9a7939e7a80cb910328ce0ae1543efc3765252c9a837b9bec5ef5b149aea1a26
 EBUILD rust-1.54.0.ebuild 20806 BLAKE2B cde615998a6281dd6e823d55549c56ee3b23c5e26b92358516cd20665d406317a3f1333271ebcdb000660fd84e540574109b398a12882c0ba655ca978c3a8579 SHA512 1fe3d61af31ce9ef9e6c97ea694965115b41982f1d95285483838e861762115bf9abc863b2466c6eb927b56a2ed22aff6784a0af0983f56ffd76da83c40b0335
 EBUILD rust-1.55.0.ebuild 20713 BLAKE2B e43e75effdb0de4f007cbd4be21931d14cc08aad92226cf13e076c653dd2144f35ddd90beca0b2f078f446585eb805484e3e1f7c9b583d9d03846e1bda33b042 SHA512 97866c0bb0e3f31796b67cfaa246ec769e307eeb46474207ad02850157a05d5a643086ec3020d351a0b067be7862a9b39384718da91cdb3b6e3e499cd01583ae
 EBUILD rust-1.56.0-r1.ebuild 20625 BLAKE2B 7e669a0e7d6988fcf5fd7635e3da348b4883f8e8426951a01ceaa34869349ff294fa9579c593f72c8eb17ab2b5535e3a5786633b0ec58d0635c512080efa03f2 SHA512 cb3086d79a852790f635232baa1fa6059920f1fa2a98088cda5b3e0c0775ee55e9e4f5b29b2724b8e6642a82359c1e9b8b3e327fb0938e05f3dbb94e233866d4
+EBUILD rust-1.56.1.ebuild 20621 BLAKE2B 77fdf6280e455694bff9d164fbc209005ff7c816d73119c92bda66b4c33fb881098cd950782a2394129125d5f358d58190a262cf7b5fd17ff55f0d16f9fd9a5b SHA512 69231aa1c4819fa11d439437af7ef9b9a5123bf9f19990b1a20aec579921f934a92f616b384a2e2265ad53dfe1435d8b4cedd362ee71fdac44a003ce3236bd52
 MISC metadata.xml 1123 BLAKE2B 3a4e817eda9e998275741d9b3e313369bfb3d4ee8ba3b701f2a26ea3fd8b5564e8ee5dca29574693e0361d56d1b91aa1b8791fc46a3533b5e5a98bbd6991cb01 SHA512 dbd9646a10e11b9ee8a87e4785f06530758dd611e58da3b16fde927dd0e7f858710e246a0401e09e7500ff5c301c84f5606f4fce85c21f0f8a5579f0bb4ea8ab
diff --git a/dev-lang/rust/rust-1.56.1.ebuild b/dev-lang/rust/rust-1.56.1.ebuild
new file mode 100644
index 000000000000..59c50dac02da
--- /dev/null
+++ b/dev-lang/rust/rust-1.56.1.ebuild
@@ -0,0 +1,683 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \
+	multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
+else
+	ABI_VER="$(ver_cut 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="
+	https://static.rust-lang.org/dist/${SRC}
+	verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc )
+	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
+"
+
+# keep in sync with llvm ebuild of the same version as bundled one.
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling more than one slot
+# simultaneously.
+
+# How to use it:
+# List all the working slots in LLVM_VALID_SLOTS, newest first.
+LLVM_VALID_SLOTS=( 13 )
+LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}"
+
+# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
+# (-) usedep needed because we may build with older llvm without that target
+LLVM_DEPEND="|| ( "
+for _s in ${LLVM_VALID_SLOTS[@]}; do
+	LLVM_DEPEND+=" ( "
+	for _x in ${ALL_LLVM_TARGETS[@]}; do
+		LLVM_DEPEND+="
+			${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )"
+	done
+	LLVM_DEPEND+=" )"
+done
+unset _s _x
+LLVM_DEPEND+=" )
+	<sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):=
+	wasm? ( sys-devel/lld )
+"
+
+# to bootstrap we need at least exactly previous version, or same.
+# most of the time previous versions fail to bootstrap with newer
+# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
+# but it fails to bootstrap with 1.48.x
+# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.txt
+RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
+RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
+BOOTSTRAP_DEPEND="||
+	(
+		=dev-lang/rust-"${RUST_DEP_PREV}"
+		=dev-lang/rust-bin-"${RUST_DEP_PREV}"
+		=dev-lang/rust-"${RUST_DEP_CURR}"
+		=dev-lang/rust-bin-"${RUST_DEP_CURR}"
+	)
+"
+
+BDEPEND="${PYTHON_DEPS}
+	app-eselect/eselect-rust
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
+	!system-llvm? (
+		>=dev-util/cmake-3.13.4
+		dev-util/ninja
+	)
+	test? ( sys-devel/gdb )
+	verify-sig? ( app-crypt/openpgp-keys-rust )
+"
+
+DEPEND="
+	>=app-arch/xz-utils-5.2
+	net-misc/curl:=[http2,ssl]
+	sys-libs/zlib:=
+	dev-libs/openssl:0=
+	elibc_musl? ( sys-libs/libunwind:= )
+	system-llvm? ( ${LLVM_DEPEND} )
+"
+
+# we need to block older versions due to layout changes.
+RDEPEND="${DEPEND}
+	app-eselect/eselect-rust
+	!<dev-lang/rust-1.47.0-r1
+	!<dev-lang/rust-bin-1.47.0-r1
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+	miri? ( nightly )
+	parallel-compiler? ( nightly )
+	test? ( ${ALL_LLVM_TARGETS[*]} )
+	wasm? ( llvm_targets_WebAssembly )
+	x86? ( cpu_flags_x86_sse2 )
+"
+
+# we don't use cmake.eclass, but can get a warnings
+CMAKE_WARN_UNUSED_CLI=no
+
+QA_FLAGS_IGNORED="
+	usr/lib/${PN}/${PV}/bin/.*
+	usr/lib/${PN}/${PV}/libexec/.*
+	usr/lib/${PN}/${PV}/lib/lib.*.so
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_SONAME="
+	usr/lib/${PN}/${PV}/lib/lib.*.so.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_WX_LOAD="usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/.*rmeta"
+QA_EXECSTACK="${QA_WX_LOAD}"
+
+# causes double bootstrap
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
+
+PATCHES=(
+	"${FILESDIR}"/1.55.0-ignore-broken-and-non-applicable-tests.patch
+	"${FILESDIR}"/1.49.0-gentoo-musl-target-specs.patch
+)
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "${1}" true false
+}
+
+bootstrap_rust_version_check() {
+	# never call from pkg_pretend. eselect-rust may be not installed yet.
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
+	local rustc_toonew="$(ver_cut 1).$(($(ver_cut 2) + 1))"
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
+		eerror "Rust >=${rustc_wanted} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too old"
+	elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then
+		eerror "Rust <${rustc_toonew} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too new"
+	else
+		einfo "Using rust ${rustc_version} to build"
+	fi
+}
+
+pre_build_checks() {
+	local M=4096
+	# multiply requirements by 1.5 if we are doing x86-multilib
+	if use amd64; then
+		M=$(( $(usex abi_x86_32 15 10) * ${M} / 10 ))
+	fi
+	M=$(( $(usex clippy 128 0) + ${M} ))
+	M=$(( $(usex miri 128 0) + ${M} ))
+	M=$(( $(usex rls 512 0) + ${M} ))
+	M=$(( $(usex rustfmt 256 0) + ${M} ))
+	# add 2G if we compile llvm and 256M per llvm_target
+	if ! use system-llvm; then
+		M=$(( 2048 + ${M} ))
+		local ltarget
+		for ltarget in ${ALL_LLVM_TARGETS[@]}; do
+			M=$(( $(usex ${ltarget} 256 0) + ${M} ))
+		done
+	fi
+	M=$(( $(usex wasm 256 0) + ${M} ))
+	M=$(( $(usex debug 2 1) * ${M} ))
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		M=$(( 15 * ${M} / 10 ))
+	fi
+	eshopts_pop
+	M=$(( $(usex system-bootstrap 0 1024) + ${M} ))
+	M=$(( $(usex doc 256 0) + ${M} ))
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+llvm_check_deps() {
+	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+	python-any-r1_pkg_setup
+
+	export LIBGIT2_NO_PKG_CONFIG=1 #749381
+
+	use system-bootstrap && bootstrap_rust_version_check
+
+	if use system-llvm; then
+		llvm_pkg_setup
+
+		local llvm_config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+		export LLVM_LINK_SHARED=1
+		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+	fi
+}
+
+src_prepare() {
+	if ! use system-bootstrap; then
+		local rust_stage0_root="${WORKDIR}"/rust-stage0
+		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
+
+		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
+			--without=rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local rust_target="" rust_targets="" arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
+	done
+	if use wasm; then
+		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+		if use system-llvm; then
+			# un-hardcode rust-lld linker for this target
+			# https://bugs.gentoo.org/715348
+			sed -i '/linker:/ s/rust-lld/wasm-ld/' compiler/rustc_target/src/spec/wasm_base.rs || die
+		fi
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local tools="\"cargo\","
+	if use clippy; then
+		tools="\"clippy\",$tools"
+	fi
+	if use miri; then
+		tools="\"miri\",$tools"
+	fi
+	if use rls; then
+		tools="\"rls\",\"analysis\",\"src\",$tools"
+	fi
+	if use rustfmt; then
+		tools="\"rustfmt\",$tools"
+	fi
+
+	local rust_stage0_root
+	if use system-bootstrap; then
+		local printsysroot
+		printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
+		rust_stage0_root="${printsysroot}"
+	else
+		rust_stage0_root="${WORKDIR}"/rust-stage0
+	fi
+	# in case of prefix it will be already prefixed, as --print sysroot returns full path
+	[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
+
+	rust_target="$(rust_abi)"
+
+	cat <<- _EOF_ > "${S}"/config.toml
+		changelog-seen = 2
+		[llvm]
+		download-ci-llvm = false
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		ninja = true
+		targets = "${LLVM_TARGETS// /;}"
+		experimental-targets = ""
+		link-shared = $(toml_usex system-llvm)
+		[build]
+		build-stage = 2
+		test-stage = 2
+		doc-stage = 2
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		rustfmt = "${rust_stage0_root}/bin/rustfmt"
+		docs = $(toml_usex doc)
+		compiler-docs = false
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		tools = [${tools}]
+		verbose = 2
+		sanitizers = false
+		profiler = false
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debug-assertions-std = $(toml_usex debug)
+		debuginfo-level = $(usex debug 2 0)
+		debuginfo-level-rustc = $(usex debug 2 0)
+		debuginfo-level-std = $(usex debug 2 0)
+		debuginfo-level-tools = $(usex debug 2 0)
+		debuginfo-level-tests = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		parallel-compiler = $(toml_usex parallel-compiler)
+		channel = "$(usex nightly nightly stable)"
+		description = "gentoo"
+		rpath = false
+		verbose-tests = true
+		optimize-tests = $(toml_usex !debug)
+		codegen-tests = true
+		dist-src = false
+		remap-debuginfo = true
+		lld = $(usex system-llvm false $(toml_usex wasm))
+		# only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it
+		# https://github.com/rust-lang/rust/issues/74976
+		# https://github.com/rust-lang/rust/issues/76526
+		deny-warnings = $(usex wasm $(usex doc false true) true)
+		backtrace-on-ice = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+		compression-formats = ["gz"]
+	_EOF_
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		cat <<- _EOF_ >> "${S}"/config.env
+			CFLAGS_${rust_target}=${arch_cflags}
+		_EOF_
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${rust_target}]
+			cc = "$(tc-getBUILD_CC)"
+			cxx = "$(tc-getBUILD_CXX)"
+			linker = "$(tc-getCC)"
+			ar = "$(tc-getAR)"
+		_EOF_
+		# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+		if use elibc_musl; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				crt-static = false
+			_EOF_
+		fi
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+	done
+	if use wasm; then
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "$(usex system-llvm lld rust-lld)"
+		_EOF_
+	fi
+
+	if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then # whitespace intentionally shifted below
+	# experimental cross support
+	# discussion: https://bugs.gentoo.org/679878
+	# TODO: c*flags, clang, system-llvm, cargo.eclass target support
+	# it would be much better if we could split out stdlib
+	# complilation to separate ebuild and abuse CATEGORY to
+	# just install to /usr/lib/rustlib/<target>
+
+	# extra targets defined as a bash array
+	# spec format:  <LLVM target>:<rust-target>:<CTARGET>
+	# best place would be /etc/portage/env/dev-lang/rust
+	# Example:
+	# RUST_CROSS_TARGETS=(
+	#	"AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
+	# )
+	# no extra hand holding is done, no target transformations, all
+	# values are passed as-is with just basic checks, so it's up to user to supply correct values
+	# valid rust targets can be obtained with
+	# 	rustc --print target-list
+	# matching cross toolchain has to be installed
+	# matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
+	# only gcc toolchains installed with crossdev are checked for now.
+
+	# BUG: we can't pass host flags to cross compiler, so just filter for now
+	# BUG: this should be more fine-grained.
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+
+	local cross_target_spec
+	for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
+		# extracts first element form <LLVM target>:<rust-target>:<CTARGET>
+		local cross_llvm_target="${cross_target_spec%%:*}"
+		# extracts toolchain triples, <rust-target>:<CTARGET>
+		local cross_triples="${cross_target_spec#*:}"
+		# extracts first element after before : separator
+		local cross_rust_target="${cross_triples%%:*}"
+		# extracts last element after : separator
+		local cross_toolchain="${cross_triples##*:}"
+		use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
+		command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${cross_rust_target}]
+			cc = "${cross_toolchain}-gcc"
+			cxx = "${cross_toolchain}-g++"
+			linker = "${cross_toolchain}-gcc"
+			ar = "${cross_toolchain}-ar"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+		if [[ "${cross_toolchain}" == *-musl* ]]; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				musl-root = "$(${cross_toolchain}-gcc -print-sysroot)/usr"
+			_EOF_
+		fi
+
+		# append cross target to "normal" target list
+		# example 'target = ["powerpc64le-unknown-linux-gnu"]'
+		# becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
+
+		rust_targets="${rust_targets},\"${cross_rust_target}\""
+		sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" config.toml || die
+
+		ewarn
+		ewarn "Enabled ${cross_rust_target} rust target"
+		ewarn "Using ${cross_toolchain} cross toolchain"
+		ewarn
+		if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
+			ewarn "'sys-devel/binutils[multitarget]' is not installed"
+			ewarn "'strip' will be unable to strip cross libraries"
+			ewarn "cross targets will be installed with full debug information"
+			ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
+			ewarn
+			ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
+			ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
+			ewarn
+		fi
+	done
+	fi # I_KNOW_WHAT_I_AM_DOING_CROSS
+
+	einfo "Rust configured with the following flags:"
+	echo
+	echo RUSTFLAGS="${RUSTFLAGS:-}"
+	echo RUSTFLAGS_BOOTSTRAP="${RUSTFLAGS_BOOTSTRAP:-}"
+	echo RUSTFLAGS_NOT_BOOTSTRAP="${RUSTFLAGS_NOT_BOOTSTRAP:-}"
+	env | grep "CARGO_TARGET_.*_RUSTFLAGS="
+	cat "${S}"/config.env || die
+	echo
+	einfo "config.toml contents:"
+	cat "${S}"/config.toml || die
+	echo
+}
+
+src_compile() {
+	# we need \n IFS to have config.env with spaces loaded properly. #734018
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) RUST_BACKTRACE=1\
+		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+	)
+}
+
+src_test() {
+	# https://rustc-dev-guide.rust-lang.org/tests/intro.html
+
+	# those are basic and codegen tests.
+	local tests=(
+		codegen
+		codegen-units
+		compile-fail
+		incremental
+		mir-opt
+		pretty
+		run-make
+	)
+
+	# fails if llvm is not built with ALL targets.
+	# and known to fail with system llvm sometimes.
+	use system-llvm || tests+=( assembly )
+
+	# fragile/expensive/less important tests
+	# or tests that require extra builds
+	# TODO: instead of skipping, just make some nonfatal.
+	if [[ ${ERUST_RUN_EXTRA_TESTS:-no} != no ]]; then
+		tests+=(
+			rustdoc
+			rustdoc-js
+			rustdoc-js-std
+			rustdoc-ui
+			run-make-fulldeps
+			ui
+			ui-fulldeps
+		)
+	fi
+
+	local i failed=()
+	einfo "rust_src_test: enabled tests ${tests[@]/#/src/test/}"
+	for i in "${tests[@]}"; do
+		local t="src/test/${i}"
+		einfo "rust_src_test: running ${t}"
+		if ! (
+				IFS=$'\n'
+				env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \
+				"${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
+				-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
+			)
+		then
+				failed+=( "${t}" )
+				eerror "rust_src_test: ${t} failed"
+		fi
+	done
+
+	if [[ ${#failed[@]} -ne 0 ]]; then
+		eerror "rust_src_test: failure summary: ${failed[@]}"
+		die "aborting due to test failures"
+	fi
+}
+
+src_install() {
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) DESTDIR="${D}" \
+		"${EPYTHON}" ./x.py install	-vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+	)
+
+	# bug #689562, #689160
+	rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die
+	rmdir -v "${ED}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die
+	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use miri && symlinks+=( miri cargo-miri )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+
+	einfo "installing eselect-rust symlinks and paths: ${symlinks[@]}"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
+		# need to fix eselect-rust to remove this hack.
+		local ver_i="${i}-${PV}"
+		if [[ -f "${ED}/usr/lib/${PN}/${PV}/bin/${i}" ]]; then
+			einfo "Installing ${i} symlink"
+			ln -v "${ED}/usr/lib/${PN}/${PV}/bin/${i}" "${ED}/usr/lib/${PN}/${PV}/bin/${ver_i}" || die
+		else
+			ewarn "${i} symlink requested, but source file not found"
+			ewarn "please report this"
+		fi
+		dosym "../lib/${PN}/${PV}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "${PV}/lib" "/usr/lib/${PN}/lib-${PV}"
+	dosym "${PV}/libexec" "/usr/lib/${PN}/libexec-${PV}"
+	dosym "${PV}/share/man" "/usr/lib/${PN}/man-${PV}"
+	dosym "rust/${PV}/lib/rustlib" "/usr/lib/rustlib-${PV}"
+	dosym "../../lib/${PN}/${PV}/share/doc/rust" "/usr/share/doc/${P}"
+
+	newenvd - "50${P}" <<-_EOF_
+		LDPATH="${EPREFIX}/usr/lib/rust/lib"
+		MANPATH="${EPREFIX}/usr/lib/rust/man"
+		$(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+		$(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	_EOF_
+
+	rm -rf "${ED}/usr/lib/${PN}/${PV}"/*.old || die
+	rm -rf "${ED}/usr/lib/${PN}/${PV}/doc"/*.old || die
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+		/usr/bin/cargo
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-gdbgui
+		/usr/bin/rust-lldb
+		/usr/lib/rustlib
+		/usr/lib/rust/lib
+		/usr/lib/rust/libexec
+		/usr/lib/rust/man
+		/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use miri; then
+		echo /usr/bin/miri >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	if has_version sys-devel/gdb || has_version dev-util/lldb; then
+		elog "Rust installs a helper script for calling GDB and LLDB,"
+		elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+	fi
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0a8b0d6cd7e6..d32cb138be2d 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 2baa4a0bc7f8..16700fbcfefa 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,4 +1,4 @@
 AUX libarcus-4.8.0-deprecated-protobuf-calls.patch 1395 BLAKE2B 6488f7da07b78df1f18826a62f47cc2a7835ad66f7c5f999a4926caff9bffa8125b39f44cbb4e5849b3283c95898120c2cdc0947c9008869af91db08f0036e55 SHA512 f98cdd0d15d03752cd04466211cdaf2fb0ebb4f9a5aa887c4f9a1df5c32ced18559952f89c4549ea93376d95ec0b1bc51289ce87256804d2fc453686d48b55e5
 DIST libarcus-4.9.1.tar.gz 31967 BLAKE2B 2ee827c3f1f592ac1efa7557a2cbfa9cf9fd2d43a7be7fd803f94f7b51c9a03be1078d3df319e1bbe2bc37b6ec3a1c6f16996c4e3b6251dd06f6031dd32ad2a9 SHA512 5124b80647cb0715ad94c5eaaeac797a867319de9a8064b689783fdb28598903a69e3a61393db90f5e0b3d10ee30aed844170cab63dc4b7c70509d5129a17cdd
-EBUILD libarcus-4.9.1.ebuild 1357 BLAKE2B 9c7cf901543a6e13c8e1cf6861a028c81cc98048dd725b5981c1dc0a1c023d5482fde9d4188d971057454e175b60b8619158bcf387900e6eba7e0a7f113e1a79 SHA512 b165f573c87c6daa209b225686d0a12081a0f69b2feac846ea3d00017529f8164f00855b7476ad031ad425954f6636f4e542966046e02ed35c503d604e67a977
+EBUILD libarcus-4.9.1.ebuild 1359 BLAKE2B 103675b40d9849aaa5c9b1a077a3ca0efd2f2c539f6e7caf53115411996f8a36c4a58ef5b512076cc9c95b9c57e2ab60aca458f4f804b67c9e9de93e5ff48856 SHA512 19789acb5e8e7bd6b7db4354432372a4feffb588f48845e2ddfcef64d642570bf3396b6292ca454fb6bbb90754a29b26190fd76e0cc231fc56365c91c9101756
 MISC metadata.xml 1286 BLAKE2B 149e6008ee050d64c46009c12f18dd2e18234e4f19c1093fd0c557cc3d9369b547b07f7397975ab74b58d96ce39210f6a213b2f750ac2f844da579ff9f4ba8e3 SHA512 d6efb7fab1d6072cf8ad1ce5d2a33956eb9a8ac78992a434201d89de444b29382223e91f3c25475128a07fc81cfd4382bd396f9f16044f33b5ec4cdac8612b0c
diff --git a/dev-libs/libarcus/libarcus-4.9.1.ebuild b/dev-libs/libarcus/libarcus-4.9.1.ebuild
index 8a82c33b9bb0..ce9da7cb6141 100644
--- a/dev-libs/libarcus/libarcus-4.9.1.ebuild
+++ b/dev-libs/libarcus/libarcus-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 6932df310425..dca14f5cd553 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -4,5 +4,5 @@ DIST libcec-4.0.7.tar.gz 355249 BLAKE2B 5f742364804d0d10cfcd71635645d33c3dfde200
 DIST libcec-6.0.2.tar.gz 355807 BLAKE2B 007530d839493355f283992a4390550d6ddd432977d7489c17087f7e5bb6f503c35e967ed6a620d55e2e7c25ce10814f360d146a28b860cdcdd108fae152f896 SHA512 c16ac268e67b01d4e35fad644e5927e1d9fc7bcaeff698ac5f0eadd31ec63a0bef2a2b2bc37860d1571e1e0cdc55911c2de468c661c7c7ae1d492f80188035cb
 EBUILD libcec-4.0.4-r1.ebuild 2018 BLAKE2B 36e7fd1cac2551febd35fa3d0533bf9e06d8d5c8981283c6948acb78c1fb2ca405a80113afd3b31fecc315f271442a4c589d02ad300c0461a4615a0e456205df SHA512 619a8dec29e7aaf7daee20f79ccf8d330a4cf199054568f4be98e9d23f09d20a0aca4c389d0b41036acc1d53f0bfe749d70148cf22efd9aa6502d27f57a6ed0b
 EBUILD libcec-4.0.7.ebuild 3271 BLAKE2B cec8de0c00a3976c3eff2e8631846f5a175ea00129b32eefc37dbe9d3000c594aa653e4cd6f5f673bc2eb0db6de1bb18a3ee16f258871c826afa43cd1ff9869a SHA512 79ffd559dd8a0ae22622571ceeb73616574fa0fcf1b0db876ec0bf92fb9d22ad5460e5119abde10bb977e51027609fca6989f372173e7e3aa72960b503218a58
-EBUILD libcec-6.0.2.ebuild 3268 BLAKE2B eae8545464fa0f273c00b69a1e44e5a8fec9def4d29595da76524f50ef62c37d6fc078bc73cf69b506d5414cb4d5753fd3c702d4a94444d5f78d745b4a9f32a5 SHA512 0f28d398a4e87f7d412f399600522a963e31e0ab9bec01b525a82e336c859231c3b737516321d3955ae49728b6db3f5780fa3d41af34734d38f6960166329716
+EBUILD libcec-6.0.2.ebuild 3268 BLAKE2B c6e86830fa1c49906627f5f532fb62a477da03f6608eea81cd65c038c8d9270abb4d354c4743292b99589ef25e35f15b3745d16f32bf5de2a8bf9db54d4c2bf3 SHA512 9b32a427bff242ae2012f3d993a1c4baa822e95b354d39f72301b695cd6fefbe5ff612dad8c8c6dded814903dee6439cb793dfeac47462ea02192db0603c575c
 MISC metadata.xml 828 BLAKE2B 55df5b9af327507fdb9f415c8616affc437d82ac5a7e57b53f21f7917285b10f70e58b3fdbebf6899aa8c10dbe73186f84643842b04953da74f94b6c4112b3d6 SHA512 25e981d2c88ce87c9c41f6816dfadeb00bf3e0d5dfebc8b135ceba09552c40c29501bede0e3a73a63dcacb0741167f6180a674d82cf2b66dfb649a4aa968387a
diff --git a/dev-libs/libcec/libcec-6.0.2.ebuild b/dev-libs/libcec/libcec-6.0.2.ebuild
index c118e5234689..80507a293bfb 100644
--- a/dev-libs/libcec/libcec-6.0.2.ebuild
+++ b/dev-libs/libcec/libcec-6.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index b0d9704dc206..c0f4e0ae65e5 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,3 +1,3 @@
 DIST libcharon-4.9.1.tar.gz 151243 BLAKE2B 8557efe4667a83297a4bcfc8307e2322a379e52d50ad1648d873a923e182b3be1651a13c7402ac041fd134036a75a42e825adf2cc27271af218db44af7e48473 SHA512 41d611f8d3bf0f762a38a00c159104df04b73cd5c4f7e9ebcfe3ac9cdd0c8e31e505c4fd4ef8f8a6f1c02bf882bb3e14ea4e92c8b15169a91cbd1815e36310fa
-EBUILD libcharon-4.9.1-r1.ebuild 1746 BLAKE2B 46a4e224043798f5f327d6b0d6b3033145a210cc5f3b80e4387d7e39cee3e8a9bcf8ff707c0fe76c6b1b20a00318eb4153002d7a89417572a8a117f4d5163447 SHA512 fe4d49ecb8b11c9e814755711628eaa3d52d5be73c24bf0c88b909d4c11d868831b360309c7072a4a6b4e746fd8526338a0287da640fa277cc6d2fc5e8fc7ab1
+EBUILD libcharon-4.9.1-r1.ebuild 1747 BLAKE2B 8a8989c27be14e430a912d220e83e12e7584010a82838ff7453c9f58b7a6e3bb045885a6f222ef49a17fbd77dbbfe7d8343bbeba387008a6f50299d2dc6b4021 SHA512 422fe986046dbb84f3cef7e1e7872a484a8a71dcd49e0dd5d096aa89a60f8c2bba1a2d2ecc5648c88668b3cdfc4a94e0448b9f24c539840244d10a409cac419d
 MISC metadata.xml 1140 BLAKE2B 356713d6a644186b8fda5d9fd9587a74a605aaa638217c62dd9f0657859322c66015d25a5b5335dbe02fcf2492ca7dec0d5e7decd5a2d4602b8b8ec8338f7821 SHA512 8aa76c3b4dc2246e0cc6c508149ff9913ef3310a3477d7596b9101f183d0e858cc3c11ebfd138cf1eb65e79c2800ad63cfaca63201aa1a63e36e5ef63bd664aa
diff --git a/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild b/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
index 8bb7404534a2..6ba209c25452 100644
--- a/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
+++ b/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index 0e9a8d7de0f4..603530285251 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,7 +1,6 @@
 AUX libmowgli-2.1.3-cacheline-Ensure-sysconf-var-is-defined-before-use.patch 831 BLAKE2B 552140cae8b31f796826487319286fc5d59972e2036bb33a8a2c6febcf0fc8fc8bea502a0d5aa3d00e0028534c1891e19ba92ee0c4071ba3fd8b8fd9bea5158d SHA512 8f572b47fa62918be88dc11028a916897aeda46691b5b4975f87227aad2141fe472fdcff3431d61c42cdeb8322aab1e065d8ac155f2f367f4c28a6ae97799271
 AUX libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch 531 BLAKE2B 13627cf2420f8a9f1c90010e9b40fd4234a6c6603857f463de7d469a1e2e148bdf1ac5dc620ddfc622b2fe6da64f52f9756b2e980e529a78d519bcdd9ef36cf6 SHA512 b4e35ea2cb241a48ce698f7fe094a9a55b0c901f3a9f613a308898714496c4b3b531380d81ab34651b6f24dd877341eeb1c694120d420096854daad03240bd01
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
-EBUILD libmowgli-2.1.3-r2.ebuild 1036 BLAKE2B 87b25ec5f80417e482fa14e7c3c26881eef72cdfeccfe01dcc182ee5bc2aff727ab6a8314cbb7194a88fe3ea84463d3ffd6f4575f7131623180e13bb060a644d SHA512 d4e660c81986de1b8a53b93a17276012db7e1db85ccf53438dfb0c6414c4036abf246392038158bef1b1df8b45a66f264a5b005de4af186a37d9723117f4bf0a
 EBUILD libmowgli-2.1.3-r3.ebuild 995 BLAKE2B 609d1ed9e3944f844b995c4b73d47507e40ec1093a2d6c36d851f19e7556532ba57e44d9e5e01ffad1ecb5e0c04d665d77610e58a4035991e75d55039180e793 SHA512 4c490656991842bc7defbc70e2f09e35645cd167833114acb6ecb7b9df71295aca2e466b878f6bd0ed14e085da796e54388d966201fadf8346d1a1ff7b1a16ee
 EBUILD libmowgli-9999.ebuild 544 BLAKE2B 28587dc8b9503a3826127bd7eb71e6d31d98d3a3f0be5e5113f7bcd4cafff467f1251ed096edd15baefc50f31419366bd97386b2db9ce77bd710b183e9582cff SHA512 29fe335d9aa56893845413a55838e85a9d699571dad0d4d9ecd3eb06cf6a3f7cbcb0cfa67cddd361ed6574805d33d011ea92e322a661cfac597366b02beebf16
 MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
deleted file mode 100644
index e7b02c8ea2b2..000000000000
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
-HOMEPAGE="https://github.com/atheme/libmowgli-2"
-SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ssl"
-
-RDEPEND="ssl? (
-		dev-libs/openssl:0=
-	)
-	!~dev-libs/libmowgli-2.1.0" # Bug 629644
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
-PATCHES=(
-	"${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch
-	"${FILESDIR}"/${P}-use-host-tools-for-ar-and-ranlib.patch
-)
-
-S="${WORKDIR}/${PN}-2-${PV}"
-
-src_prepare() {
-	default
-
-	# $(MAKE) invocation will handle passing down flags.
-	sed -i -e 's/${MFLAGS}//' buildsys.mk.in || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ssl openssl)
-}
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 3923fa60a10e..8b0129239dde 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,4 +1,4 @@
 DIST libsass-3.6.5.tar.gz 342426 BLAKE2B 8c6bb37da3f832dd462408a7ef4f80384e468295fc420b3d915899e65fb89a9d0b4c1cf0653b7288fedbf6a66daa2943c2911ad2c310f77a06deb84bec1d3abf SHA512 98cc7e12fdf74cd9e92d8d4a62b821956d3ad186fcee9a8d77b677a621342aa161b73d9adad4c1849678a3bac890443120cc8febe1b7429aab374321d635b8f7
-EBUILD libsass-3.6.5.ebuild 1132 BLAKE2B 230a36406333941434e7bf172570a80e8afaa101c5196c6420d2977a6f1a494f2f96d594943cdcc83873d8b396c8ec35e339b80585088fffd4403a083baf7322 SHA512 5b1c0d8af82085d3d729029d2d6fb07d1bd00c03380b4cfbe2d32c33297406d4bc44fc48b2a5a4804519ea8ec7c4fb4632b4e4513959ab71ca2391de82baf65e
+EBUILD libsass-3.6.5.ebuild 1138 BLAKE2B 98b741a1ad419fcd47c1617390807feb1a2c7cd101077dc4076c0c67b352a521fdbe9315b3065cb6c553f2f292e2a8dae4e576ff4473aae8429e31c641954359 SHA512 fc19a86e75832483538160db58adb193d85281cd2f0178c9de013a057fbe68107e230e59e27ab727aaf91c0aa36521af6947f2e97a8e315e9b34bdd173b38d6b
 EBUILD libsass-9999.ebuild 1129 BLAKE2B 74ce5b5d25d821a1d6dead5db25a4d5f834dd30b2f9da2e2ee8526a3842b2934b6ec5b8c5b5abdbbf4d97b846eee6aa513588f597011025ea77357667c91f2d8 SHA512 620076a106661dfcd9d332c628732eb9bafbd1db59b7619a0edc312cf7aa9f91417b6def62c12934e1f7201c8527ec52df4549b5c9c873682653df40f8483250
 MISC metadata.xml 647 BLAKE2B 2043328e18efbefdfaded61e1fd2269d8b83910a2440cfba2c692fd343889087bd861ad70b2f8f96651b9e0af28cae3bb0668177478203b2ebabab3f8764c8ec SHA512 98de3665f1c27ae03a73212a3ee947597dde27846a2f44db6ef19d362566887d999d42daf505e8a938352005e5d7a3b77f0d661e4f2170f2ec225c43442a47ff
diff --git a/dev-libs/libsass/libsass-3.6.5.ebuild b/dev-libs/libsass/libsass-3.6.5.ebuild
index 16a7fb2752de..d1807595adcc 100644
--- a/dev-libs/libsass/libsass-3.6.5.ebuild
+++ b/dev-libs/libsass/libsass-3.6.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 49d84ffeca64..cf03f7fc161f 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,4 +1,4 @@
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
 DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44
-EBUILD libsavitar-4.9.1.ebuild 1750 BLAKE2B 10d57551bd2703e242b1c8b3a3baac10de4975d9983f3d7f4acd83e29f89134d280385699a3bc95faf8ec289c2d7d068f8938af6f2ea863ae301482f98202086 SHA512 6df6f66f81c11a6d8c5b70a175dfb2070ed1d29aa64ecac11077fbbe37a86e8a706162f431b0473324d87e86d07306736c74aacd978345b28956d559330fbe76
+EBUILD libsavitar-4.9.1.ebuild 1751 BLAKE2B 40e8748df6934c20fc4843a8194461e49242fe6b344fa40a1b31dfd64ab84263612bc669039fdc926e48c7f6150916b803a5c9f783531b71f9d794d0209f6e18 SHA512 11fe811ee9165ed118957ed7576b7af8b2c7a070e0587327f110d00657d6a88680fc357059e7078a57494fefdcc066f43c5ccd243a9899bb53aa4471f65bb36d
 MISC metadata.xml 975 BLAKE2B 0d0faa17d5fad674babdfcbb4da1366f0a25eb8e28dfd091c006da263b5915b1909d2843cf9eb2cd8ae6205c56bd9b7fd3ac0d39f7594217c69f9b3cb727bc66 SHA512 91548b2cd344eb43f8b9e2e7596d86b9eec8c856c60dd5b41710d53da1e224d7c2c83283fe04031f7e0ede2be92bed1ebb46b3e897289d7b5a5de5fe93a6f1b8
diff --git a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
index c2659976510a..263cdd5d1947 100644
--- a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index 248f94d9a5a0..e4789fa106a0 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -1,4 +1,3 @@
-AUX libstemmer_c-shared-library.patch 850 BLAKE2B 864f1f7f34a35b04a57899f0ac3dd743121c4f6270ad1f5cd127789d79e2f70fedab1cbff72d492b7e0f7a048609650e2315b8cebef013fb711f812deeddf32e SHA512 36f96bf9661a71d7aa77619202d7c4d48cc494da6287ecf5a24ffa9963aefadf9f825ec52058534aca908e6c2641af71bfc1bf14ab880d9ba480add7a8cac12b
 AUX snowball-stemmer-2.1.0-shared-library.patch 2140 BLAKE2B 43a66ad25bf5bdbc2d908ca91d12da496faf831fce96cc8945d0b56f5b34c3522185f71cc0e73648fd97ad5b2f161750b4376201994c3545fb458f81f313cdee SHA512 bb80701187e29f43fe23075b9598716bd0f2a97903d4905ca0570766235e79b31b68a0aa4c2335ccabec3bcba3b68e75db18fc9bf0f6c928e90f23bc7a12dabc
 DIST snowball-data-887fb7a3e006f32b4979e0d55f2543abe78a42f1.tar.gz 33063750 BLAKE2B bffc7e9f8fadbaecf9a7d1a2b8ee7a9db0b1dc1d5a6304a9c8d60b6c24a0947307b8780a99d2349b19e5fbcdfe819cc400ffb0b8b1df9748bb401ae1dec7b9aa SHA512 b68567d3e59aaa870251f682988b52a89d82767e954adea6b7f6247a6d432c29c8373c95a5e49df07110d4cb396aafa64ee6c71af2c0680d383ffe22491e50dd
 DIST snowball-stemmer-2.1.0.tar.gz 220324 BLAKE2B 3d92a2f5b4bd633932d681f2555cf1cc1a2c1a1c71fd0272f09bee17628d034a20649450dd90242c155ab7b262e685913d5ad4034bce6e7a41d76f0dfc724137 SHA512 1efd7d8ab58852987e83247048244882c517e32237c8cb3c0558b66ecfb075733ce8805ebb76041e6e7d6664c236054effe66838e7c524ee529ce869aa8134f0
diff --git a/dev-libs/snowball-stemmer/files/libstemmer_c-shared-library.patch b/dev-libs/snowball-stemmer/files/libstemmer_c-shared-library.patch
deleted file mode 100644
index ca27fc517705..000000000000
--- a/dev-libs/snowball-stemmer/files/libstemmer_c-shared-library.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- /home/graaff/Desktop/Makefile	2009-11-06 01:57:50.000000000 +0100
-+++ Makefile	2013-07-18 10:57:32.482149252 +0200
-@@ -1,9 +1,13 @@
- include mkinc.mak
--CFLAGS=-Iinclude
--all: libstemmer.o stemwords
--libstemmer.o: $(snowball_sources:.c=.o)
--	$(AR) -cru $@ $^
--stemwords: examples/stemwords.o libstemmer.o
--	$(CC) -o $@ $^
-+CFLAGS+=-Iinclude -fPIC
-+all: libstemmer.so libstemmer.a stemwords
-+libstemmer.so: $(snowball_sources:.c=.o)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.0d -o $@.0d.0.0 $^
-+	ln -s $@.0d.0.0 $@.0d
-+	ln -s $@.0d.0.0 $@
-+libstemmer.a: $(snowball_sources:.c=.o)
-+	$(AR) -crs $@ $^
-+stemwords: examples/stemwords.o libstemmer.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- clean:
--	rm -f stemwords *.o src_c/*.o runtime/*.o libstemmer/*.o
-+	rm -f stemwords libstemmer.so* libstemmer.a *.o src_c/*.o runtime/*.o libstemmer/*.o
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 5d4fd747d90f..7c02eece67ae 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index d8341d3ec032..05796d71c89a 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -4,5 +4,5 @@ DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e9480
 DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44
 EBUILD ppx_sexp_conv-0.14.1.ebuild 722 BLAKE2B 56e8596dd6063a6ff69d82c8ca862357d25034add0beb42c4d5e044b0cc95de73c5cc93ceb4c8999df1a1eb3e0f8c11f434f4d1f1cbce157a476fc4c5491bc7d SHA512 569f6c2990f5197e1298ec369aab259143be88b267a0136b3702497fb36d00bebe761f0c443a528981dfd5b2239332d066d86945c1e29307b65be83466e9087b
 EBUILD ppx_sexp_conv-0.14.2-r1.ebuild 705 BLAKE2B 882974b6e2bdf2d7cb30f9d2a4bf4caa327a6ee160b8a84eccdf504e0c5e25117158853a0a5d0f10369636d34b7688f9b9ec6b20abaa2090d5718e66a54f6866 SHA512 9b32b1725bc3eefc70ca169cc46b6d3b9acf1365370b5a75c287e7c83b9b81acc9a886465d2483c595a28fb401688d93911f07a1d4931e6c17619c23cb903023
-EBUILD ppx_sexp_conv-0.14.3.ebuild 684 BLAKE2B 78b47f8f3c746eb69b424d1ae1a144ec8c18589cfc2773cfc409c4bbbe3287ede3a7d99c804f953f7d7d3accf25fda3186a3f33aa00386aa9635b07610f8b002 SHA512 cd86bf999fc678b9359301e6fa6245688f53a620a2fe2590553b5f856c2ab47940a58c3033f29450344f2b950e8cade4ff9fc2cad3d761d12c7095194652f394
+EBUILD ppx_sexp_conv-0.14.3.ebuild 682 BLAKE2B 5c3a391bcc2cd70dfc0e3825d0fa5dd4cdf858b28e878aa5f3f073c14a9e4da82bbf2aea91daf920987af412bab23dfd5a384a33ac4bd865efe890d8d492458a SHA512 ddf515ab60d068a6b5f19e4aef2e9f718b154ceef4fded78da8090c978398caa6eeeca8f52573f6b79afef0ab0bcac9a93a4600dbd48b5707a066677ffb9aa79
 MISC metadata.xml 427 BLAKE2B 40cf563b5bf060e3d241038655ac6f7fa0d96e0d3aafd8bbe27cf77e5a997129dcecfb9cc907734a5fdadd720f848807aa60ae4bdf6a924cbce3b7277d605882 SHA512 e29de52e463fa9c21b92a52a6454f2cadc9bd6677d549c86ee43383a88af9ee43134ecca2379088a40f0e89aa7d98b552480e8dc2cd8042f9a8e5453e8ab1d6d
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
index e757ef8332b3..070c960efe14 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index 71dbbd46248f..7ec5e4957444 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f1b1403e4e9f9b5fafa6c4b09f4c76f6ac645e2ccab53cba7371b5b004edba38d24198334d10b295d90c8ba5814a602a23 SHA512 6e32f6c2cf6c370fcb8d3b341dbd797c3b7c2557c8604253d744b266c9a3f4984e62ffe6ec5717044378f81e5b78e7f206a7f0f4b43c0dda97a4e7ece745d26d
 DIST ppx_typerep_conv-0.14.2.tar.gz 9474 BLAKE2B 7a7ff6669d9af2ced905e5b104058d26ffe06e3784af366a1a4ce753337eeb87c9bfe02d1a6fddaac6c387105d2583194cbd06b915eb35d16e06b1d4ab977e2f SHA512 9372f13cb3f62b3732af4f8ddc00314dd71869bab5599ae0a112d32669de300346781b7fcd2bd649ccedfde54fcd86fb6186812eeb528858048bcd9d5ad443dd
 EBUILD ppx_typerep_conv-0.14.1-r1.ebuild 653 BLAKE2B f47242e7d5b9f18641a6a8748ec7ec12e0f716260ec4f61f7ffd841863194f554f796923b6a51e5dce674247487a764aef9f782c8132cc54c93db409d0786712 SHA512 46d2b4010e1d346c6450ee79ff49e5c9898d811909637a8b12666603622267c6b34719410216caa25356ec460377bc9547b762da60391c135b5e95936a44b9b1
-EBUILD ppx_typerep_conv-0.14.2.ebuild 632 BLAKE2B 209be5c997580b564c24db6541d4812f5c72e645dcf5cf5b10117d468dbfff899816652d66e44fc5c9111ce1623094db0e90902cb13d6c1e0bce3a4f4b6a5e77 SHA512 47f05f5127ecd667d63617a6f09e430e6902f57b1332ac6069d4e95ada3b2bb27c8f5f6d20390f7746d3a91f876cd7420df94aec0528b8d25124691224dad476
+EBUILD ppx_typerep_conv-0.14.2.ebuild 630 BLAKE2B 2e8c6a8e072dddf40379f2a19be50c31b46a382326168cc654dc29842010a03ef355032ecf49a646ac6e1af3fa2916d9f88c0318c6d55709689c427a3d03c053 SHA512 75784c9362cfcf25f524a3104c43bad36e0be44c1b6aa79728b31899aed9ba2816bfeedeb20022fe35deb877c34bd781a376c3e9d556a286395805f6ee9d9075
 MISC metadata.xml 430 BLAKE2B 1f8c9b9c75af8dde9e6180ce99665d6504abf4d86eda54e7104ba92c69bfd32d95ba21aa8292aa038d6827c5f73fc4e2cd6b3294ba6984b5931f5e1d29e3d2c7 SHA512 0f0f1ae7a2cecd2eb6544a8219bfd19d8e5ac638d68753ab64b34f8759e1a71d51ee9a74dc7e28b37d8ff749a131c5f701aa7ec18644aa65d99df5a3cac73d3f
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
index 33347b97f969..defa761b96e6 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index 277e448b1cea..0c20f250f661 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -9,6 +9,6 @@ EBUILD ppxlib-0.18.0.ebuild 926 BLAKE2B f8affb8c0961a039d9e560db8ef47c435c0aec44
 EBUILD ppxlib-0.20.0-r1.ebuild 902 BLAKE2B 168d53ba94211b5436c5b880b58031e3f3efb50ba29f0772b1c3d6f340649b2a3e0d7551ed47340fe8a2232d0743f8b15b2fcb7b265bfa0223c8936d88f86c1b SHA512 1a8a91b842fbd7dfaed8962b7f052126a5fd8c56fa23347c6f6f6c30edc89345a88e9fe7828737c643f69bbafe89bc1bdf58574019651e355eeb33d4d15dcee7
 EBUILD ppxlib-0.21.0-r3.ebuild 1113 BLAKE2B 864aab6473c4a64d8728216359aaeef62a992bcb018554b67c0d4b3533d7944b25747b9c5b9fc0acaa01b94e9eda886fe086284026068f5762ba60b7afff8704 SHA512 af7c307191efe5f632439867159caabfa3639450cdb7e7861d1bead2d3c6d14278b28118e47e8332a4d56cb78a0839969aa8f68c05d976e1ac164797e29fa017
 EBUILD ppxlib-0.22.0-r3.ebuild 1144 BLAKE2B 8bb514b1d67bf4e2275c398829643eb39b7acfef826920250b0b315fe3b2faef582a8b200e97bffedd5250791d013db002b3400ee25a12f14308e271b1c8fa42 SHA512 ffba32287c1b504d3b556a4c88be356e3371f7bed11b2ba5eca7667f3d8cad22229e2226d791de0422db974411520f7e75cfc4682b831359b91b1b402e63026b
-EBUILD ppxlib-0.22.2-r2.ebuild 1140 BLAKE2B 711fd263a8c50535c12b43df4b7d336a7f0156da7ff2c84900066331e3a0cac216a224e492b3510ffb34e5ea4cb829a0a657f661f5b22bc23d0daffd15ca6283 SHA512 7a82ee30f6af372ac46d48951b04dac50c8af297742d1f24797ccbf1a5d1f324e95c54596eccafaff9a6b34617d385323b07bbd35bf387d13777cc6654eb1e3e
+EBUILD ppxlib-0.22.2-r2.ebuild 1138 BLAKE2B b399fa35a8087991fb73a518f7e5738e4f31bcc4c590e2ab6d8f41878ee643ef814b123814378f78d8bc4f40a2ec2ff1199d13292e4ecbb4e13953de97404dc3 SHA512 cda5f8ddb5e345e790fe04829e2fbd8026898a71ea3a4ba618a0bcbc4ee6558435970801278d9863975798234b8a094e59969c703573adaf9af5b318fe320d95
 EBUILD ppxlib-0.23.0-r1.ebuild 1011 BLAKE2B 3bfcb9e6ce7f21b2e6dc784dcbcfc297f372232c40c8513460d29306d6976243eebd797a710452ef6c33be71d707b23891126e4275430d26787a8f726a8b1884 SHA512 cc2e0ac82fd5c545f550c1b515ca4a040bf964637d98ee64fae22b405683080e60d9890f193ee8799fea0a9a5098c0ed0671aeb7a31df4c77b65abac84770dd2
 MISC metadata.xml 419 BLAKE2B 97371846a88fb0008519bfb72fff654aa18401b2066073c09099b1987efbb9ad49012c0ab7624218894130a2cda3d5fba6056522eacd30712d08b7784801d9cf SHA512 8dc94b1dd499f7caa3696de963e69063193892dc939609c581fec3b2d93eca4f266e9360cb5144978ba36864d9143b6fb0a1eb0e0ac5061e04b84a68e787a8f7
diff --git a/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild b/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
index 9ff10478520d..003412304ee9 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ocaml-ppx/ppxlib/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="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBI-Shell/Manifest b/dev-perl/DBI-Shell/Manifest
index 9df193841014..ddc2d1f8b90d 100644
--- a/dev-perl/DBI-Shell/Manifest
+++ b/dev-perl/DBI-Shell/Manifest
@@ -1,7 +1,3 @@
-AUX DBI-Shell-11.950.0-local-scalar.patch 690 BLAKE2B 9c335d431c36c290a8de8b2dae1b8cf042f9500ad1604350b065964df838f2a695af1112dcaaec5b408bc126c5bc70a4cbd92e3d63179925f37281863997f1d9 SHA512 cea9657bcdf674cb1a30aaa28d4f7bea173bedbb07dd14b60866cd423f403f3946323d2831eeac6c9dc7387f15a4ce0b49e43d20b855ca177a172f5f44494057
-AUX DBI-Shell-11.950.0-nochrdir.patch 684 BLAKE2B 5172afa840872076088ac9ce367ea5cc5aaf8c0169e9948e0645a58dceeabf8b79c7957155cd99d0670fc53d5314e0ca98ad80f2e65a386a9c765d6deb59937b SHA512 95092f59cec232be5e8bab7973cd99040e25eaf77212f1673cf67f93458417b4b11f596d113f0a53385608e920d0e007a580e62733b65e72ea3a28677fb4eed8
-AUX DBI-Shell-11.950.0-perl526.patch 1291 BLAKE2B 34a23fa7e9bc4071a07ae227cfacc60fa6c332c9fd3e9d04c2888d8f8a8b501087b3c9cd11fbea268562e029d11e984ac47c09783eb2cc89f64e6f46f30bd251 SHA512 aa8bd8a9a149052da8aef526cf8b992bdfa5ca150028d68387de8a83cb1648da9a9e32f78fa136c66f32c3cd460bd0164b2cbcb3b60b6faa5d9b87c5784b789b
-AUX DBI-Shell-11.950.0-sprintf-warn.patch 732 BLAKE2B 4866aa33b1cc810201ad88ffe3f04a120ebe31e08076ace85f81418f5c2720e97a70ca6b1140d3ca8f343ddbe313ffbf3989614a475aae43568d3e9a85976083 SHA512 2808715da12581e22fceb71057fa5080188af8e5a6b1c4375b0a050973477d66f2a91f1ff473d7f3b5da19f73d06e02bd5221aa908d7d2e948ca6ca1cb1d21a2
 DIST DBI-Shell-11.97.tar.gz 57123 BLAKE2B 0c4d459dda185b6fb2ea292912da4624e1a4ed33aa4487eabf5c6c5be6571c1e8d32b29b703749fe562ebbd60aa389f62d5e3461863c5777490345451bf8cad8 SHA512 74bf7244691b8dee967bae4076b59b912d66ac08f48f8468531d003db6d85d43d836116f8314961602a002b58fc9f6d3bea88076e1d7e2783d430137dec68f4b
 EBUILD DBI-Shell-11.970.0.ebuild 823 BLAKE2B 3044528d43019ce7ae43c9e911817b2ae20366587bd5be11ff53399fe0a14c34988b4f6f1373f19b363980fc6f070589c7bde4011f3f6ff0c28db95cf69551f4 SHA512 cf80a94a1568cf484fe30513cc1fddb98d433c6e89d321c0da18de1e6af41043e488a485f2fdfaa751f75bb32f2d8e4a3ffeb0921bcd32d8eda3d44c5a8ef1d8
 MISC metadata.xml 1567 BLAKE2B 73490e98e228004b9ec03b3a8d6749d4d2c73c9dd2a1dcfa507940a24e73b461b22f76818117af06e420538257912873392a60d85858a4360c0cadda1f20737b SHA512 1e1c25d23c0e24a36df92197bc395f5c32d8952c95d5a659895e97cf01fb58c1c88c761c0897e855d02d53497c526c3b3d8bbcf06a8db658a91a36dfb80a53d2
diff --git a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-local-scalar.patch b/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-local-scalar.patch
deleted file mode 100644
index 1d305f542d9e..000000000000
--- a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-local-scalar.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ef8efc5b80c9395c01f23e5acd28bb3ee7810b54 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sun, 8 Oct 2017 13:08:20 +1300
-Subject: Fix useless localization of scalar assignment
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=73873
----
- lib/DBI/Format.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/DBI/Format.pm b/lib/DBI/Format.pm
-index 49cd7dd..bc985f9 100755
---- a/lib/DBI/Format.pm
-+++ b/lib/DBI/Format.pm
-@@ -374,7 +374,7 @@ sub header {
- 
- sub row {
-     my($self, $rowref) = @_;
--		local( $^W = 0 );
-+		local ($^W) = 0;
-     my @row = @$rowref;
- 	my $fh = $self->{'fh'};
- 	print $fh (join($self->{sep}, @row), "\n");
--- 
-2.14.1
-
diff --git a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-nochrdir.patch b/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-nochrdir.patch
deleted file mode 100644
index b79649da4f5c..000000000000
--- a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-nochrdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9fb29d16514530245965b932040bb4fc37ffa9bf Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sun, 8 Oct 2017 13:11:29 +1300
-Subject: Fix no_chrdir warning
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=123215
----
- lib/DBI/Shell/FindSqlFile.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/DBI/Shell/FindSqlFile.pm b/lib/DBI/Shell/FindSqlFile.pm
-index e604290..2b56ccc 100644
---- a/lib/DBI/Shell/FindSqlFile.pm
-+++ b/lib/DBI/Shell/FindSqlFile.pm
-@@ -62,7 +62,7 @@ sub look_for_file {
- 	File::Find::find(
- 		{
- 			  wanted 	=> \&wanted
--			, no_chrdir 	=> 1
-+			, no_chdir 	=> 1
- 			, bydepth	=> 0
- 		}, 
- 		@search_path);
--- 
-2.14.1
-
diff --git a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-perl526.patch b/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-perl526.patch
deleted file mode 100644
index cd8258480d70..000000000000
--- a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-perl526.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 792cf15cb387e58cec1ef3c6d538689d02ab44c3 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sun, 8 Oct 2017 12:46:17 +1300
-Subject: Fix '.' removal from @INC in Perl 5.26
-
-Configuration files were always assumed to be explicit paths given
-by outsiders, not random entries in @INC
-
-Bug: https://bugs.gentoo.org/615592
-Bug: https://rt.cpan.org/Ticket/Display.html?id=121136
----
- lib/DBI/Shell.pm | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/DBI/Shell.pm b/lib/DBI/Shell.pm
-index 03dd958..7869f0f 100755
---- a/lib/DBI/Shell.pm
-+++ b/lib/DBI/Shell.pm
-@@ -133,6 +133,7 @@ use Text::Abbrev ();
- use Term::ReadLine;
- use Getopt::Long 2.17;	# upgrade from CPAN if needed: http://www.perl.com/CPAN
- use IO::File;
-+use File::Spec ();
- 
- use DBI 1.00 qw(:sql_types :utils);
- use DBI::Format;
-@@ -544,7 +545,8 @@ sub configuration {
-     $sh->{config_file} = $ENV{DBISH_CONFIG} || "$homedir/.dbish_config";
- 	my $config;
-     if ($sh->{config_file} && -f $sh->{config_file}) {
--		$config = require $sh->{config_file};
-+		my $full = File::Spec->rel2abs( $sh->{config_file} );
-+		$config = require $full;
- 		# allow for custom configuration options.
- 		if (exists $config->{'options'} ) {
- 			$sh->install_options( $config->{'options'} );
--- 
-2.14.1
-
diff --git a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-sprintf-warn.patch b/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-sprintf-warn.patch
deleted file mode 100644
index 46943c1266ba..000000000000
--- a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-sprintf-warn.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f44b8ba9d8cf954c76a967cbfb5d4182f109f8cf Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sun, 8 Oct 2017 13:30:36 +1300
-Subject: Silence warnings about reduntant sprintf args
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=123216
----
- lib/DBI/Format/SQLMinus.pm | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/DBI/Format/SQLMinus.pm b/lib/DBI/Format/SQLMinus.pm
-index c3a9ba2..7b240c9 100755
---- a/lib/DBI/Format/SQLMinus.pm
-+++ b/lib/DBI/Format/SQLMinus.pm
-@@ -155,6 +155,7 @@ sub header {
- 
- 				if ( exists $cf->{format} and defined $cf->{format} ) {
- 					$format_names = $cf->{format};
-+					no warnings 'redundant';
- 					$width = length sprintf( $format_names, " " );
- 				}
- 
--- 
-2.14.1
-
diff --git a/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/Manifest b/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/Manifest
index bd49602ebf8e..083ddee14966 100644
--- a/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/Manifest
@@ -1,4 +1,3 @@
-AUX Dist-Zilla-Plugin-NextVersion-Semantic-0.2.5-no-V-in-test.patch 1218 BLAKE2B 2a3033fb1fe091724a30cbe8d148eff774e3aa12efd09f91cf2cffca0aef0e67f330e6fa391ec3042cddf173c13063331df757ed7cc17ece8e0990a81f23ffb4 SHA512 f8bc8cef1dd685596cf8f8a149eaf872e604cf2159f433de490c5c764a406883fd40705511a9f2b5403e72abad6b37509ed6c24c0763d4f04a3adce69c75bb60
 DIST Dist-Zilla-Plugin-NextVersion-Semantic-0.2.6.tar.gz 25247 BLAKE2B 37d0a2a859149af94b44b5bc18c2d611e4c3497fa81064f36118cafe62a17ee7346b3b61f0d4810025eb83c3323e652929c8cfbb8797afed049327d6c78513f4 SHA512 59bcd4154e6ca4f9800d5fb1805d4bf5014f9055dd89ae85443abc2ef042a6a833c90f8c985b004ec77124100bba9be5c8929e8496444ee77405c384fd1ab913
 EBUILD Dist-Zilla-Plugin-NextVersion-Semantic-0.2.6.ebuild 602 BLAKE2B c4fe0701bbc2fb2c5ac4e4ceacd0b6a91f4ed46fee945370fe6f28c07e3e95cdcc2e6e0b73117b9c14bb38115d8ff21f93cd81632005b8826bdd48685cac8212 SHA512 f23c32f032ccd2f107ed888904d772dee7d32730f41d129792b46aa637f1171af7eb448e54bf6db7f984e107b0ccf5df9574bbff5a62c2134b4d753fc7ff4940
 MISC metadata.xml 745 BLAKE2B f37842432286eefa70c5288e49f870f202f9240321a77a67f9a4ceaad7b07965f4612dbd6e789b7a1f3c489a834fc5fc79e328baba3fd7cbc2bb9f8cebc932ca SHA512 68aa262a3894342c954bfaf53c2e3eb3c29ace63a5fead49d5606120bb97cd625e50a3f5654f6915619306952ee16c48ad650c2dfb6b3215354b317b04f6b4d0
diff --git a/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/files/Dist-Zilla-Plugin-NextVersion-Semantic-0.2.5-no-V-in-test.patch b/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/files/Dist-Zilla-Plugin-NextVersion-Semantic-0.2.5-no-V-in-test.patch
deleted file mode 100644
index ab09936f2832..000000000000
--- a/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/files/Dist-Zilla-Plugin-NextVersion-Semantic-0.2.5-no-V-in-test.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e38c5bfa847361ab251ce533fdd6e8993afbd2f3 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sat, 19 Sep 2020 22:13:21 +1200
-Subject: t/basic.t: Don't become broken when MAKEOPTS includes V=1
-
-Some people set MAKEOPTS to include V=1, in order to coax autotools
-based makefiles into being more verbose.
-
-But when that ENV var is used to direct perl ebuilds for Dzil things,
-well, it unintentionally uses "1" as the *next version*, and so breaks
-all code that isn't expecting that to happen.
-
-Given its not the job of tests to tell people their system is weird, it
-just makes the scope "normal" ( that is, defaulting V to be unset
-internally )
-
-Bug: https://bugs.gentoo.org/737308
-Bug: https://github.com/yanick/Dist-Zilla-Plugin-NextVersion-Semantic/pull/6
----
- t/basic.t | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/t/basic.t b/t/basic.t
-index 22d04fe..b2942c8 100644
---- a/t/basic.t
-+++ b/t/basic.t
-@@ -6,6 +6,10 @@ use Test::Exception;
- 
- use Test::DZil;
- 
-+# V=1 is common in MAKEOPTS for gnu autotools
-+# to set "verbose mode"
-+delete $ENV{V} if exists $ENV{V};
-+
- my $changes = make_changes(<<'END_CHANGES');
-     - got included in an awesome test suite
- END_CHANGES
--- 
-2.28.0
-
diff --git a/dev-perl/ExtUtils-CppGuess/Manifest b/dev-perl/ExtUtils-CppGuess/Manifest
index fd58292c8de3..05347bc8a0ff 100644
--- a/dev-perl/ExtUtils-CppGuess/Manifest
+++ b/dev-perl/ExtUtils-CppGuess/Manifest
@@ -1,4 +1,3 @@
-AUX ExtUtils-CppGuess-0.110.0-no-dot-inc.patch 1311 BLAKE2B b440f31822cff738807914df48aa74fdc3775d5eaaea1dcbde4a94217d4d98b2402b44914f463f733bd37460b07c8b1bb99f4d3d06a951d8e57517cbc4d67e4f SHA512 b75865b0f95137389d86ac2b277ae843d8f65075784df73a2de4408ccb9614809b9055798a3ead088fcb17884b1306f4238f817f13b012ea7a913a26e6b8e191
 DIST ExtUtils-CppGuess-0.21.tar.gz 14067 BLAKE2B 35dab476a73c532f2635ebee871dfd4cba593c1e09ed4f9fc18826edb9208208fdcc26a884d3c6ec95db18ceafc83fb8bca1c5c8f6a8caf337795ddde80be6d2 SHA512 e48e4815ac9db4e8bb91de101f1d22aed95c770cf6fa2ea5e38094643fe96bc9fe69b0e5a76ba8aa53a653753f93526edab8b1604d864bb2b3a50223617f84d9
 DIST ExtUtils-CppGuess-0.23.tar.gz 15311 BLAKE2B 6e0db2d1c419893cc68050a047e957d42b57780fbf0d26ec05831990e3af45decb4693b68ce426ac9eaa578077e9c9c951a01adea197386c9be70faeb9d22977 SHA512 f984f653cffd6288851af3e353532f369d229a8b903f8e0ba7c1a5e9d8bd1b63c3415403b45bf1e8c32dc5c330ed26d1351e37929bd22af271ac295adce737f9
 EBUILD ExtUtils-CppGuess-0.210.0.ebuild 1001 BLAKE2B 85de3afe94ece1e558c02b75ff35be17639a17a67ec82351697b4ab65f8126731ae1599a7e03493c809fcf458c6107278653caf15ef1a38b2b90cacb2993dfc5 SHA512 2659f8f9c70c080fc9cb317be133320ade1bcbfeab26acb937aba4b63a52c4ec9fed8356559fa4445857871d76e1df1c6161dd7c08c14f0f66aecd94a286a346
diff --git a/dev-perl/ExtUtils-CppGuess/files/ExtUtils-CppGuess-0.110.0-no-dot-inc.patch b/dev-perl/ExtUtils-CppGuess/files/ExtUtils-CppGuess-0.110.0-no-dot-inc.patch
deleted file mode 100644
index 0bca84c1aad7..000000000000
--- a/dev-perl/ExtUtils-CppGuess/files/ExtUtils-CppGuess-0.110.0-no-dot-inc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2c89bb54f233776fb8760a264286f9e0932f62c6 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sat, 21 Oct 2017 13:15:43 +1300
-Subject: Fix tests on 5.26 without '.' in @INC
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=120848
-Bug: https://bugs.gentoo.org/615842
-Bug: https://github.com/tsee/extutils-cppguess/pull/15
----
- t/010_module_build.t | 3 ++-
- t/011_makemaker.t    | 3 ++-
- t/lib/TestUtils.pm   | 3 ++-
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/t/010_module_build.t b/t/010_module_build.t
-index 93b5f44..ef004d3 100644
---- a/t/010_module_build.t
-+++ b/t/010_module_build.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use Test::More tests => 1;
--use t::lib::TestUtils;
-+use lib 't/lib';
-+use TestUtils;
- 
- my $separator = ( '=' x 40 . "\n" );
- 
-diff --git a/t/011_makemaker.t b/t/011_makemaker.t
-index 237636a..5986395 100644
---- a/t/011_makemaker.t
-+++ b/t/011_makemaker.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use Test::More tests => 1;
--use t::lib::TestUtils;
-+use lib 't/lib';
-+use TestUtils;
- 
- my $separator = ( '=' x 40 . "\n" );
- 
-diff --git a/t/lib/TestUtils.pm b/t/lib/TestUtils.pm
-index c71572b..b3480c4 100644
---- a/t/lib/TestUtils.pm
-+++ b/t/lib/TestUtils.pm
-@@ -1,4 +1,5 @@
--package t::lib::TestUtils;
-+package # hide
-+  TestUtils;
- 
- use strict;
- 
--- 
-2.14.2
-
diff --git a/dev-perl/File-NFSLock/Manifest b/dev-perl/File-NFSLock/Manifest
index bfa9a2ad37b4..2407f74896d7 100644
--- a/dev-perl/File-NFSLock/Manifest
+++ b/dev-perl/File-NFSLock/Manifest
@@ -1,4 +1,3 @@
-AUX File-NFSLock-1.27-no-dot-inc.patch 915 BLAKE2B d9457492dbbb7f96467b62c2269876a9df2de224afebcb886df8c6c0bd51239070b401ab7132597f53f0901e9c165357134282f3b9bfafebd537b849fc6f1934 SHA512 430296f1616706e1cb3b2e996a10080c95d76672ec3a7a9826c59cefc6624de2cde83a42fdcea9ec3f5ae84af380708282d35e3cabc1715a3b4a6c9f240a8e78
 DIST File-NFSLock-1.29.tar.gz 21743 BLAKE2B aece987567f95de22c6454c3a05d2dd2deaf1a6958eebdf7f2ba908b7c26a5894137635e4cfbd6d3b488ca5c37bfa55f50a0a66a9ef84d922d5a8a3ce8d01c36 SHA512 23ca8d6bff0b988eb7369a89c0ac2eb9fca4cc8472b996a93cd71241e76017c5a9db34e648038ec223cf0a3c843af26fc92740890e69e4db371c747c90835cc2
 EBUILD File-NFSLock-1.290.0.ebuild 324 BLAKE2B 9f226e40d8ca6019282c13d966b7cd856bb86fddfc9a992567f660eeb7a60cac956cc9953007b6103c6d964f1697a6ac3d36b5f3d3d2a12fdfcab0f5b2bbb977 SHA512 cf2211919dfbe5685a17041b24f42f7ca191cd5eb484b94774a01bf2f8996665f0cf45618863425b7d5cb407bac3a2e29260a8c63120d7e90ee57e44d39ae05b
 MISC metadata.xml 397 BLAKE2B a2c77afb83b124d62453d6affde57841860170eaea94e0e423ba96d5ded80b8b70b6c7841fb97a28e4a25511e478dcc625c04cbc23b941cf55e2b200477d1d59 SHA512 8075a163996f5411f1cb9716a402f96394631435f8e4579dfc1e21ec0b7f047fa093356381e877e28d864e79aa80c6e5f827183818457bee6226c51a2e0261af
diff --git a/dev-perl/File-NFSLock/files/File-NFSLock-1.27-no-dot-inc.patch b/dev-perl/File-NFSLock/files/File-NFSLock-1.27-no-dot-inc.patch
deleted file mode 100644
index 9b67d24d10d6..000000000000
--- a/dev-perl/File-NFSLock/files/File-NFSLock-1.27-no-dot-inc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 08deb6590eecd9d92a38edf1b22d615175e1d8d3 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Mon, 26 Jun 2017 19:43:14 +1200
-Subject: [PATCH] Fix for '.' removal from Perl 5.26 @INC
-
----
- File-NFSLock.spec.PL | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/File-NFSLock.spec.PL b/File-NFSLock.spec.PL
-index fdf9fdf..f5586c1 100644
---- a/File-NFSLock.spec.PL
-+++ b/File-NFSLock.spec.PL
-@@ -18,7 +18,7 @@ sub WriteMakefile {
-   } elsif (my $version_from = $props{VERSION_FROM}) {
-     $@ = "";
-     $version = eval qq{
--      do "$version_from";
-+      do "./$version_from";
-       \$$name\::VERSION || die "$version_from: Missing VERSION";
-     };
-     die $@ if $@;
-@@ -29,7 +29,7 @@ sub WriteMakefile {
-     die "Makefile.PL: Could not determine version!";
-   }
- }
--do "Makefile.PL";
-+do "./Makefile.PL";
- if ($name) {
-   $name =~ s/::/-/g;
- } else {
--- 
-2.13.1
-
diff --git a/dev-perl/GnuPG-Interface/Manifest b/dev-perl/GnuPG-Interface/Manifest
index 8c9aea69e259..cbb6b48a0774 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -1,24 +1,3 @@
-AUX GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch 1104 BLAKE2B 6275517463eec5caa865338109c151cc8c351200cfe8666a9652e7733855a29d668c22a800820caad79dc6ef9d1c6ac0569ec8cec6826f77f60029d30360d14c SHA512 154fe07541bdfa36be9ce72fee8ce1edb8fbfce73d3006b888ec141a3e5efb9eacc3cb91956606ef56b67a5fde8c19da5d92f38d02acb77d7681e1219d6c513c
-AUX GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch 4552 BLAKE2B 89ec43b57ed6ecdcd4b78f7b84cbbded575e8cce0785d86960bb8b1f092c53ab54cc533e757dc47501de8fa8c2db73ae42a9f705e3821b57ff1110ad6ef1f34f SHA512 8310f8b4a7e1092273fb0444e65871d5aed2eb87107fcb416f7e5c82146379c3d77ff511209ae01efeb475d62cc2e8682ece15b4a826d15a0e450871fdff50b8
-AUX GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch 1217 BLAKE2B 5d96a0fb84d7d12ef58caf8e6b3a5363f96ed71300d37ebed5ad057f46b705456da3922f96eb58efe79864cfa0ef5b560e53a7f71c29d36b4602071f0b5bfcb9 SHA512 7cddb8e065e3380a5bf9aeb82af620bdf9c4062a9e315afb871574af6140369ce9c1e9b0ac0c8463c6158694ad78d65e328acce62a3336bce8705f3ffc393cb6
-AUX GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch 1438 BLAKE2B 44ff3ea149993b7c296a91fe801e9fdc2a8f19617a7c11f2ab83c7de71e37bc26d5ed434a54c1301c74b59bfd66ea19e50ea1880b93d9b74bb2afa6bd48b2c2b SHA512 dcb3f587834d3d22ab745a6796cbb924efbc5d9985947e3884f8f4fdb47a911385d400b4a2b72ef83daed3ba572fbf3d6d4944cf63c308ae4bc64cf369191111
-AUX GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch 1522 BLAKE2B 883cbe443329b48ca91f3af2765024b22d889b9e3e49817bc9d4e883594743073314dde2145bfd6de3e234130f9c230b533c62a00897e398e4c73c93f15a41a2 SHA512 170d5231f98234614c5e8c1afb09b2fc4ff26bb8e5b280a8b91a0b886e4199c6c993af41b63db7041cc6f8b2fc676461720e64289818966f3980bcf4af75625c
-AUX GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch 5276 BLAKE2B 07621e4fc1f12da4dbed3b537412215ba5121a8ea4b2f5f85ddbb6869228db7744c5fcd884ece126be2d56547983413ee4dd63c81149c4882514bd9d8e400dd8 SHA512 7c1a588028378e2691e951a5572465c877b6ef4fb86b27aa4e3aef3aa75a49e1e53b52c78ba88b00cfb243aa10bf75aef88784d22deb7925d0cdc98687ee8804
-AUX GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch 3286 BLAKE2B f1452611f761f6fd06b91e49a47016820633284d8cdddccbabb3d19f4e91e8b9264bd879d1177e64cca7755b9faa6550ac24908dcdaf2b54335e7f7fb22bf08f SHA512 eb6d4efd476d1d7582c66b90fdef21badc8d0eecd24ce642cac7f5d0e3e491c78cbc0ee49bf886ce571f2718c2aa725d6c07a7ca0cd6e5483624df6984cf8f27
-AUX GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch 1125 BLAKE2B 12144ec6aca0407c3cd5f07ef8f4f8a2837157a9c2af082331af3f7b9f6fe18b3be461b5fd75577b3c5e1d54ef5a31301ebe56f09dc79b3899fbbcd0efc04d6c SHA512 e4f5b69a1ac61a7d39d97cb716f07cef5b612b01b64005b6f0f0974fb19b386a6e817c66fb49762c99b66917e551ab96e34a48cf25bb59b8f06844773adcd44b
-AUX GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch 3683 BLAKE2B c433dc5c563ee0472ab6d3c1c00db3326345a06aa244df5afa8be7d4e732bd8de624c8fb0b3db4b1a11d53cdd86f28b02ad970323ec743189fd015b107be6154 SHA512 f911f3d830e30d6e3e684abb7c3e90c801715a68bc2ccd02fc75a15f4c9ec9095260a56a021645cc82bc7f6381fee1f0b5e404cdd6c7be93d1cf293adaaabfbf
-AUX GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch 1094 BLAKE2B 5588031372f4d8d932527a96fce63cdd3a563ca937794c44b9eb124ecf3f64d64490adf2030a5ceb035cba9a2ab8f0a3576ef6890a6a6c39372234a66f490497 SHA512 5ecadeb592b73843756a7fb7e8d002e0931832f1120399072decf7586ebec6ec39c6eb33811de58849d7a986a0e87dd0a5b3c6bb0eb9328365d75e6a8eaf02be
-AUX GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch 670 BLAKE2B 3ec3023e125c2c71ec94eec02b6a103bd7f5bcd64c77d6a7b23b6a81b01e99f776b3d970e2d43806eb53fc3e63de2594703e7602acc4ac77306e9ab3f7beca2f SHA512 cd9af9b1df71f4bbbee8e97de41933c93e908626cb766c88636f9df5a4307360b302eeabe1d999da10b81237f38da673fbd9dd34417df27b3fc4a9e1fd98e73f
-AUX GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch 9909 BLAKE2B 3b416e430a693f8160b75bcb9b11d807fa9a658ef3737a177392cf9e8819131758d2e6c0b6adde4e75ee7e2205ca6cf74df1e953e6fe00274ec613b1a3417c12 SHA512 8a1dc1d4df2f1ab575256845439be416323cc4448812c28c9a3209404cfc1fbabecdf65701e9fdf9c9530c964114d8f91eae42200a4b7dae8ecb78b77c22611f
-AUX GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch 1247 BLAKE2B 756fd2b7a3a07838975e6401e637e080c7cf1197197de7c76c256bc899c061f19fc7f139d9190065f50672c6e23bf601aa91c0a98ef2c8b8a226623a97009c31 SHA512 8d4a890788ce13923b0bb74c1262c8e41c2d7b4143153e3434df06640afaa7380e39b57f0ea5607e79b57cb28fb7ac8c432da7d712f3e17cb64501a58d92240f
-AUX GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch 2165 BLAKE2B d7d62bbb66c629c327606b9b3b138f45a04de31e81cc2373f384315cb60832598d90e37428e00e2ed659173c0a463d3a4016d085120d8ce17042cd98b808231f SHA512 57f685199115f3d2bafe6c8b088f526fcce60e838891d4f7ba74b648653f4e4f3f730c5b6e9f9143a6bf3812e2f4eb9c2871c60bce9f1db9c872831341b0a401
-AUX GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch 5950 BLAKE2B 407c7b0dc9f74a657429eb877d9731c75e5fdc7aed0b291530ef63e357cd0d07e3ee6060bc8b96908c0ff46feb14f15547100f3a1c333c45930b1e2b67e8f42a SHA512 675bfea548b7f0dcff6f6b371e9e673e9c6cf8eb3cd29483519473d7b0519358416cb3946cb14958317f1ff661248a019c3e1b51abf3f2b85b6c645e45b045b5
-AUX GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch 11278 BLAKE2B 581b7addc6c2aebff575d66db69bf827df749f73f98be6e14863dcfec6800eb53fd857d29c7794516f5fb905f0439d920b7352d6f54eb29ebf413949b70d5f45 SHA512 ce27eee7d1b89a8c005c34f81862f3516866aeea23fb254288917d93da4ceec46a7eabc65b2f4c05f3e33e816301934ad83e3e51a8b742e1ac781fd5fe81b609
-AUX GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch 1535 BLAKE2B ac7e1f395a5ce8afe1611156f65aa305ddb1f1ecb26cfc7176c81c411d92c6a71b6a3781f950c4c54b422c6205cef94fce2f45f8bc6545ddeece34af774b5ef7 SHA512 d1f5e3258543fad32cc317bd5b34ffda279fec39d533b0390ed941fee1f780b37dda767670e7ae8f6c68bcf206c089122cf46fc5f8c24e889b032132a1f85eb1
-AUX GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch 4096 BLAKE2B 12d9bcd4931c9d8d5c3608beadbfb08bf144794cc13ac724bc2b21ab654facdec98e6293c42bf5c12e5867abd9af77b9c665ef903c91739484a40495bf069fcd SHA512 98d6b4d976013741c614265c8b9d35458461fb4407cbe10f8600c55522128a68a2976157e3165ca99aed733d2c5dee6164fa048a7671bdb9d37612a438327242
-AUX GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch 2237 BLAKE2B f152aa512f9fbc240d1862d5439928276fb4fdc73d716fcb4941504d7bc9fcf3facde6c06d2d52a7ca0628d3aa72e65248a1bb0237afe1e6c0585608f3c44b12 SHA512 a59ac575d410b5feb14a8a2165f526a1a7fbdf4575bc7e0d8d690a4d952fb312defb1390ae0186ec65b52737643ff560d5d48e8920bfe1cdcd1702016755035e
-AUX GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch 1897 BLAKE2B eca30b9a8485f7cb960ff343d1b575f324fcf6895c0fd723d14ebcccba14c69dd775ae315130af94a3246e3f8ddedb4ea9ba9c4c894f5e63b05fa8197e82f584 SHA512 5826dbc85925ac810dce695ea747ab2a4d361811295ce4f83925416c8c5842f8486e4275a3e610069157fa37e377413a39f1684ce94f618a99c46e7f6884264c
-AUX GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch 1511 BLAKE2B 3eee783efd64848bc0e86a0e0768c8dc77f8e28819fdc466913ac029cef7fcf42ff67edf89762b4b023d58df7c740b7d3d6a56ea2598699637edf5fb12840464 SHA512 7f8597d4a25e1492475810e47fb7988d74411cbe6ad537889c65bf37119572d1ae0c24e2f5c99d77d12edee3c46dd0e635125ee7a7dde99abeddd19d43fe7aa9
 DIST GnuPG-Interface-1.02.tar.gz 75523 BLAKE2B 4b1311bbd930ae6719db9d7d25e247804c1f71f29da52b1896086ff4905cfdf09792d85fa9e90da462e974279cc673bacdcd2b6a32171eca1be861df5f712a98 SHA512 ff4365aa75fbcd2dc77c915ec36c0b578219ae1a2148e936b4769221f91c78a3bc3d371159b5130e7bee36ecf0e169b6a16e3a160d2598811d6f70850119f6e4
 EBUILD GnuPG-Interface-1.20.0.ebuild 1022 BLAKE2B 3d7acfd349b0a6b725b2f85023ab1b0586aea6859730b0992bab48addb4de670c833730042e5737b125eb53a98eb174a7ddc4121bd5e6263bc8cc705c53e0a26 SHA512 a9552b01a73de345b2d659e827e50386692c77d29d0b405d1cd985a5ffef20aaae898fcbd9fd9857bd5d563a06a293f6ad26ae4136a7cc6cacd5d9e9d06a14af
 MISC metadata.xml 1210 BLAKE2B f51743b57e5bb8b7f5335e9da2b92e0e0aab4a7ebde4a99d1c03a2c2e3de5105284d126ab128682bfdeeb284ec32fa9753599eacff1bc40146f2304d188d612a SHA512 faed617bfbb64f58bf4c9c0d4b032b39427fed287f02ebfff5e7bc249d440fa48fd4729a2e6334d87c99c2922897b87bcb7ed6bcbb4bf1d0bbf359773b50c5fd
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch
deleted file mode 100644
index fcec61009070..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 07:26:00 +0200
-Subject: fix spelling error ("settting" should be "setting")
-
----
- README                 | 2 +-
- lib/GnuPG/Interface.pm | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/README b/README
-index fcb982a..f457577 100644
---- a/README
-+++ b/README
-@@ -6,7 +6,7 @@ SYNOPSIS
-       use IO::Handle;
-       use GnuPG::Interface;
-   
--      # settting up the situation
-+      # setting up the situation
-       my $gnupg = GnuPG::Interface->new();
-       $gnupg->options->hash_init( armor   => 1,
-                                   homedir => '/home/foobar' );
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index f952f3e..83a4b1a 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -834,7 +834,7 @@ GnuPG::Interface - Perl interface to GnuPG
-   use IO::Handle;
-   use GnuPG::Interface;
-   
--  # settting up the situation
-+  # setting up the situation
-   my $gnupg = GnuPG::Interface->new();
-   $gnupg->options->hash_init( armor   => 1,
- 			      homedir => '/home/foobar' );
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch
deleted file mode 100644
index d0d3e6ccdf9d..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 10:38:12 -0400
-Subject: Generalize the test suite
-
-The test suite currently assumes it knows something about the internal
-state of GnuPG's homedir.
-
-It's safer and less brittle to rely explicitly on the public interface
-that GnuPG has committed to, such as --import-keys and --list-keys,
-rather than assuming that certain files are in certain places in the
-GnuPG homedir.
-
-It's also better to create a fresh homedir and allow GnuPG to populate
-it during the test suite, cleaning it up at the end, rather than hope
-that GnuPG will leave a pre-existing homedir untouched.
-
-With this change, many more of the tests pass when /usr/bin/gpg is
-provided by GnuPG 2.1.
----
- t/000_setup.t              | 28 ++++++++++++++++++++++++++++
- t/MyTestSpecific.pm        |  2 +-
- t/zzz_cleanup.t            | 17 +++++++++++++++++
- test/fake-pinentry.pl      | 28 ++++++++++++++++++++++++++++
- test/{options => gpg.conf} |  0
- test/secret-keys/1.0.test  |  4 ++--
- 6 files changed, 76 insertions(+), 3 deletions(-)
- create mode 100644 t/000_setup.t
- create mode 100644 t/zzz_cleanup.t
- create mode 100755 test/fake-pinentry.pl
- rename test/{options => gpg.conf} (100%)
-
-diff --git a/t/000_setup.t b/t/000_setup.t
-new file mode 100644
-index 0000000..7f7f7b0
---- /dev/null
-+++ b/t/000_setup.t
-@@ -0,0 +1,28 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use English qw( -no_match_vars );
-+
-+use lib './t';
-+use MyTest;
-+use MyTestSpecific;
-+use Cwd;
-+use File::Path qw (make_path);
-+use File::Copy;
-+
-+TEST
-+{
-+    make_path('test/gnupghome', { mode => 0700 });
-+    my $agentconf = IO::File->new( "> test/gnupghome/gpg-agent.conf" );
-+    $agentconf->write("pinentry-program " . getcwd() . "/test/fake-pinentry.pl\n");
-+    $agentconf->close();
-+    copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
-+    reset_handles();
-+
-+    my $pid = $gnupg->import_keys(command_args => [ 'test/pubring.gpg', 'test/secring.gpg' ],
-+                                  options => [ 'batch'],
-+                                  handles => $handles);
-+    waitpid $pid, 0;
-+
-+    return $CHILD_ERROR == 0;
-+};
-diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
-index 053b749..1af98ae 100644
---- a/t/MyTestSpecific.pm
-+++ b/t/MyTestSpecific.pm
-@@ -40,7 +40,7 @@ use vars qw( @ISA           @EXPORT
- 
- $gnupg = GnuPG::Interface->new( passphrase => 'test' );
- 
--$gnupg->options->hash_init( homedir              => 'test',
-+$gnupg->options->hash_init( homedir              => 'test/gnupghome',
-                             armor                => 1,
-                             meta_interactive     => 0,
-                             meta_signing_key_id  => '0xF950DA9C',
-diff --git a/t/zzz_cleanup.t b/t/zzz_cleanup.t
-new file mode 100644
-index 0000000..5c03a72
---- /dev/null
-+++ b/t/zzz_cleanup.t
-@@ -0,0 +1,17 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use English qw( -no_match_vars );
-+
-+use lib './t';
-+use MyTest;
-+use MyTestSpecific;
-+use File::Path qw (remove_tree);
-+
-+# this is actually no test, just cleanup.
-+TEST
-+{
-+    my $err = [];
-+    remove_tree('test/gnupghome', {error => \$err});
-+    return ! @$err;
-+};
-diff --git a/test/fake-pinentry.pl b/test/fake-pinentry.pl
-new file mode 100755
-index 0000000..12d3611
---- /dev/null
-+++ b/test/fake-pinentry.pl
-@@ -0,0 +1,28 @@
-+#!/usr/bin/perl -w
-+# Use this for your test suites when a perl interpreter is available.
-+#
-+# The encrypted keys in your test suite that you expect to work must
-+# be locked with a passphrase of "test"
-+#
-+# Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-+#
-+# License: This trivial work is hereby explicitly placed into the
-+# public domain.  Anyone may reuse it, modify it, redistribute it for
-+# any purpose.
-+
-+use strict;
-+use warnings;
-+
-+# turn off buffering
-+$| = 1;
-+
-+print "OK This is only for test suites, and should never be used in production\n";
-+while (<STDIN>) {
-+  chomp;
-+  next if (/^$/);
-+  next if (/^#/);
-+  print ("D test\n") if (/^getpin/i);
-+  print "OK\n";
-+  exit if (/^bye/i);
-+}
-+1;
-diff --git a/test/options b/test/gpg.conf
-similarity index 100%
-rename from test/options
-rename to test/gpg.conf
-diff --git a/test/secret-keys/1.0.test b/test/secret-keys/1.0.test
-index 5999484..129d472 100644
---- a/test/secret-keys/1.0.test
-+++ b/test/secret-keys/1.0.test
-@@ -1,5 +1,5 @@
--test/secring.gpg
------------------
-+test/gnupghome/secring.gpg
-+--------------------------
- sec   1024D/F950DA9C 2000-02-06
- uid                  GnuPG test key (for testing purposes only)
- uid                  Foo Bar (1)
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch
deleted file mode 100644
index 23fbf97fee2c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 11:35:31 -0400
-Subject: subkey validity of an key when we have established no trust anchors
-
-This apparently isn't tested by deep comparisons, though, so it was
-never caught.
----
- t/get_public_keys.t | 2 +-
- t/get_secret_keys.t | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/get_public_keys.t b/t/get_public_keys.t
-index 53db021..73e320b 100644
---- a/t/get_public_keys.t
-+++ b/t/get_public_keys.t
-@@ -175,7 +175,7 @@ TEST
-     ];
- 
-     my $subkey = GnuPG::SubKey->new
--      ( validity                 => 'u',
-+      ( validity                 => '-',
-         length                   => 768,
-         algo_num                 => 16,
-         hex_id                   => 'ADB99D9C2E854A6B',
-diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
-index 3a1d99f..7bba083 100644
---- a/t/get_secret_keys.t
-+++ b/t/get_secret_keys.t
-@@ -48,7 +48,7 @@ TEST
- 
- 
-     my $subkey = GnuPG::SubKey->new
--      ( validity                 => 'u',
-+      ( validity                 => '-',
-         length                   => 768,
-         algo_num                 => 16,
-         hex_id                   => 'ADB99D9C2E854A6B',
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch
deleted file mode 100644
index 1743b7d9177c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 11:39:04 -0400
-Subject: ensure that test covers all signatures
-
-The earlier test wasn't reporting on one of the known self-sigs for
-the test key for some reason.
-
-This change ensures that all known signatures are present.
----
- t/get_public_keys.t | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/t/get_public_keys.t b/t/get_public_keys.t
-index 73e320b..9e96f7d 100644
---- a/t/get_public_keys.t
-+++ b/t/get_public_keys.t
-@@ -83,7 +83,17 @@ TEST
-                             date_string => '2000-02-06',
-                             hex_id => '53AE596EF950DA9C',
-                             sig_class => 0x13,
--                            validity => '!'));
-+                            validity => '!'),
-+      GnuPG::Signature->new(
-+                            date => 1177086329,
-+                            algo_num => 17,
-+                            is_exportable => 1,
-+                            user_id_string => 'GnuPG test key (for testing purposes only)',
-+                            date_string => '2007-04-20',
-+                            hex_id => '53AE596EF950DA9C',
-+                            sig_class => 0x13,
-+                            validity => '!'),
-+                          );
- 
-     my $uid1 = GnuPG::UserId->new( as_string =>  'Foo Bar (1)',
-                                    validity => '-');
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch
deleted file mode 100644
index 0016fa755c0c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 14:31:38 -0400
-Subject: add $gpg_is_modern to test suite
-
-MyTestSpecific.pm now produces a new variable indicating whether it
-the version of GnuPG we run against is from the "Modern" line of GnuPG
-development (2.1 or later).  This will be useful when comparing output
-that we can't expect from earlier versions.
----
- t/MyTestSpecific.pm | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
-index 1af98ae..a309698 100644
---- a/t/MyTestSpecific.pm
-+++ b/t/MyTestSpecific.pm
-@@ -29,17 +29,20 @@ use GnuPG::Handles;
- use vars qw( @ISA           @EXPORT
-              $stdin         $stdout           $stderr
-              $gpg_program   $handles          $gnupg
--             %texts
-+             %texts         $gpg_is_modern
-            );
- 
- @ISA    = qw( Exporter );
- @EXPORT = qw( stdin                  stdout          stderr
-               gnupg_program handles  reset_handles
--              texts                  file_match
-+              texts                  file_match      gpg_is_modern
-             );
- 
- $gnupg = GnuPG::Interface->new( passphrase => 'test' );
- 
-+my @version = split('\.', $gnupg->version());
-+$gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1));
-+
- $gnupg->options->hash_init( homedir              => 'test/gnupghome',
-                             armor                => 1,
-                             meta_interactive     => 0,
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch
deleted file mode 100644
index bea8bfc68dfa..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 14:12:40 -0400
-Subject: Modern GnuPG (2.1) reports more detail about secret keys
-
-the GnuPG "modern" suite (version 2.1 or later) reports more detail
-about secret keys than previous versions did.  In particular, it
-reports stored ownertrust, public key data, and designated revokers
-for secret keys.  Older versions only reported those attributes for
-public keys.
-
-This patch adjusts the test suite to ensure that our handmade key
-matches the produced key when /usr/bin/gpg is supplied by the modern
-suite.
----
- t/get_secret_keys.t | 66 +++++++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 54 insertions(+), 12 deletions(-)
-
-diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
-index 7bba083..c798cce 100644
---- a/t/get_secret_keys.t
-+++ b/t/get_secret_keys.t
-@@ -23,16 +23,34 @@ TEST
-     return 0 unless @returned_keys == 1;
- 
-     $given_key = shift @returned_keys;
--
--    $handmade_key = GnuPG::PrimaryKey->new
--      ( length                 => 1024,
-+    my $pubkey_data = [
-+     Math::BigInt->from_hex('0x'.
-+      '88FCAAA5BCDCD52084D46143F44ED1715A339794641158DE03AA2092AFD3174E3DCA2CB7DF2DDC6FEDF7C3620F5A8BDAD06713E6153F8748DD76CB97305F30CBA8F8801DB47FAC11EED725F55672CB9BDAD629178A677CBB089B3E8AE0D9A9AD7741697A35F2868C62D25670994A92D810480173DC24263EEA0F103A43C0B64B'),
-+     Math::BigInt->from_hex('0x'.
-+      '8F2A3842C70FF17660CBB78C78FC93F534AB9A17'),
-+     Math::BigInt->from_hex('0x'.
-+      '83E348C2AA65F56DE84E8FDCE6DA7B0991B1C75EC8CA446FA85869A43350907BFF36BE512385E8E7E095578BB2138C04E318495873218286DE2B8C86F36EA670135434967AC798EBA28581F709F0C6B696EB512D3E561E381A06E4B5239BCC655015F9A926C74E4B859B26EAD604F208A556511A76A40EDCD9C38E6BD82CCCB4'),
-+     Math::BigInt->from_hex('0x'.
-+      '80DE04C85E30C9D62C13F90CFF927A84A5A59D0900B3533D4D6193FEF8C5DAEF9FF8A7D5F76B244FBC17644F50D524E0B19CD3A4B5FC2D78DAECA3FE58FA1C1A64E6C7B96C4EE618173543163A72EF954DFD593E84342699096E9CA76578AC1DE3D893BCCD0BF470CEF625FAF816A0F503EF75C18C6173E35C8675AF919E5704')
-+    ];
-+
-+
-+    my $args = {
-+        length                 => 1024,
-         algo_num               => 17,
-         hex_id                 => '53AE596EF950DA9C',
-         creation_date          => 949813093,
-         creation_date_string   => '2000-02-06',
--        owner_trust            => '', # secret keys do not report ownertrust?
-+        owner_trust            => '-',
-         usage_flags            => 'scaESCA',
--      );
-+        pubkey_data            => $pubkey_data,
-+    };
-+    if (!$gpg_is_modern) {
-+      # older versions don't report ownertrust or pubkey_data for secret keys:
-+      delete $args->{pubkey_data};
-+      $args->{owner_trust} = '';
-+    }
-+    $handmade_key = GnuPG::PrimaryKey->new($args);
- 
-     $handmade_key->fingerprint
-       ( GnuPG::Fingerprint->new( as_hex_string =>
-@@ -42,20 +60,42 @@ TEST
- 
-     $handmade_key->push_user_ids(
-       GnuPG::UserId->new( as_string => 'GnuPG test key (for testing purposes only)',
--                          validity => ''), # secret keys do not report uid validity?
-+                          validity => $args->{owner_trust}),
-       GnuPG::UserId->new( as_string => 'Foo Bar (1)',
--                          validity => '')); # secret keys do not report uid validity?
--
--
--    my $subkey = GnuPG::SubKey->new
--      ( validity                 => '-',
-+                          validity => $args->{owner_trust}));
-+
-+    my $revoker = GnuPG::Revoker->new
-+      ( algo_num       => 17,
-+        class          => 0x80,
-+        fingerprint    => GnuPG::Fingerprint->new( as_hex_string =>
-+                                                   '4F863BBBA8166F0A340F600356FFD10A260C4FA3'),
-+        );
-+
-+    my $subkey_pub_data = [
-+     Math::BigInt->from_hex('0x'.
-+      '8831982DADC4C5D05CBB01D9EAF612131DDC9C24CEA7246557679423FB0BA42F74D10D8E7F5564F6A4FB8837F8DC4A46571C19B122E6DF4B443D15197A6A22688863D0685FADB6E402316DAA9B560D1F915475364580A67E6DF0A727778A5CF3'),
-+     Math::BigInt->from_hex('0x'.
-+      '6'),
-+     Math::BigInt->from_hex('0x'.
-+      '2F3850FF130C6AC9AA0962720E86539626FAA9B67B33A74DFC0DE843FF3E90E43E2F379EE0182D914FA539CCCF5C83A20DB3A7C45E365B8A2A092E799A3DFF4AD8274EB977BAAF5B1AFB2ACB8D6F92454F01682F555565E73E56793C46EF7C3E')
-+    ];
-+
-+    my $sub_args = {
-+        validity                 => '-',
-         length                   => 768,
-         algo_num                 => 16,
-         hex_id                   => 'ADB99D9C2E854A6B',
-         creation_date            => 949813119,
-         creation_date_string     => '2000-02-06',
-         usage_flags              => 'e',
--      );
-+        pubkey_data              => $subkey_pub_data,
-+      };
-+
-+    if (!$gpg_is_modern) {
-+      # older versions do not report pubkey data for secret keys
-+      delete $sub_args->{pubkey_data};
-+    }
-+    my $subkey = GnuPG::SubKey->new($sub_args);
- 
-     $subkey->fingerprint
-       ( GnuPG::Fingerprint->new( as_hex_string =>
-@@ -64,6 +104,8 @@ TEST
-       );
- 
-     $handmade_key->push_subkeys( $subkey );
-+    # older versions do not report designated revokers for secret keys
-+    $handmade_key->push_revokers( $revoker ) if ($gpg_is_modern);
- 
-     $handmade_key->compare( $given_key );
- };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch
deleted file mode 100644
index 85c1a46adae5..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 14:46:13 -0400
-Subject: test suite: match plaintext output across versions of GnuPG
-
-The human-readable version of --list-keys is *not* expected to be
-static over time or as the user's environment changes (e.g. LANG or
-LC_MESSAGES), so expecting it to be machine-parseable is probably a
-mistake.
-
-That said, some users might want to pull textual information about
-specific keys to display directly to the user, so it's not a terrible
-idea to have it in the test suite.
-
-Modern GnuPG (2.1 or later) changes the default structure of the
-human-readable output in a few significant ways:
-
- * it writes the path to the keyring as an absolute path, even if
-   $GNUPGHOME is set to a non-absolute path.
-
- * it shows the calculated user id validity by default (see
-   show-uid-validity in gpg's --list-options).  (note that this is a
-   translated string, so that "unknown" (in the default C locale)
-   becomes "inconnue" when LANG or LC_MESSAGES is set to fr_CH.UTF-8,
-   for example.
-
- * it writes the key algorithm names differently (e.g. rsa2048 instead
-   of 2048R)
-
- * it does not display the key ID at all by default
-
- * it displays the full fingerprint in compact form by default
-
-This changeset fixes the test suite so that it can do a rough
-verification of the human-readable text output by list_secret_keys in
-the C locale in modern versions of GnuPG, while leaving it working for
-older GnuPG suites.
----
- t/list_secret_keys.t           | 15 +++++++++++++--
- test/secret-keys/1.modern.test |  8 ++++++++
- 2 files changed, 21 insertions(+), 2 deletions(-)
- create mode 100644 test/secret-keys/1.modern.test
-
-diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
-index 1fe9b7e..51e3651 100644
---- a/t/list_secret_keys.t
-+++ b/t/list_secret_keys.t
-@@ -16,13 +16,22 @@ TEST
- {
-     reset_handles();
- 
-+    $ENV{LC_MESSAGES} = 'C';
-     my $pid = $gnupg->list_secret_keys( handles => $handles );
-     close $stdin;
- 
-     $outfile = 'test/secret-keys/1.out';
-     my $out = IO::File->new( "> $outfile" )
-       or die "cannot open $outfile for writing: $ERRNO";
--    $out->print( <$stdout> );
-+    while (<$stdout>) {
-+      if ($gpg_is_modern && /^\/.*\/test\/gnupghome\/pubring.kbx$/) {
-+        $out->print("test/gnupghome/pubring.kbx\n");
-+      } elsif ($gpg_is_modern && /^--*$/) {
-+        $out->print("--------------------------\n");
-+      } else {
-+        $out->print( $_ );
-+      }
-+    }
-     close $stdout;
-     $out->close();
-     waitpid $pid, 0;
-@@ -33,7 +42,9 @@ TEST
- 
- TEST
- {
--    my @files_to_test = ( 'test/secret-keys/1.0.test' );
-+    my $suffix = '0';
-+    $suffix = 'modern' if ($gpg_is_modern);
-+    my @files_to_test = ( 'test/secret-keys/1.'.$suffix.'.test' );
- 
-     return file_match( $outfile, @files_to_test );
- };
-diff --git a/test/secret-keys/1.modern.test b/test/secret-keys/1.modern.test
-new file mode 100644
-index 0000000..3e46407
---- /dev/null
-+++ b/test/secret-keys/1.modern.test
-@@ -0,0 +1,8 @@
-+test/gnupghome/pubring.kbx
-+--------------------------
-+sec   dsa1024 2000-02-06 [SCA]
-+      93AFC4B1B0288A104996B44253AE596EF950DA9C
-+uid           [ unknown] GnuPG test key (for testing purposes only)
-+uid           [ unknown] Foo Bar (1)
-+ssb   elg768 2000-02-06 [E]
-+
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch
deleted file mode 100644
index 5ae938325ff1..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 15:22:27 -0400
-Subject: fix test_default_key_passphrase when passphrase comes from agent
-
-In the modern GnuPG suite, where the passphrase is always managed by
-the agent, gpg itself doesn't emit the GOOD_PASSPHRASE status.
-Instead, if signing is successful it emits plain old SIG_CREATED.
-
-There are probably even better ways to test whether a given key is
-unlocked in this case, but this is a straightforward baseline fix that
-should get this part of the test suite to pass with all available
-versions of GnuPG.
----
- lib/GnuPG/Interface.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 83a4b1a..1f1e6d5 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -808,7 +808,7 @@ sub test_default_key_passphrase() {
- 
-     # all we realy want to check is the status fh
-     while (<$status>) {
--        if (/^\[GNUPG:\]\s*GOOD_PASSPHRASE/) {
-+        if (/^\[GNUPG:\]\s*(GOOD_PASSPHRASE|SIG_CREATED)/) {
-             waitpid $pid, 0;
-             return 1;
-         }
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch
deleted file mode 100644
index f408c6568b0f..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 19:52:13 -0400
-Subject: clean up trailing whitespace
-
----
- lib/GnuPG/Fingerprint.pm |  2 +-
- lib/GnuPG/Handles.pm     |  2 +-
- lib/GnuPG/Interface.pm   | 16 ++++++++--------
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/lib/GnuPG/Fingerprint.pm b/lib/GnuPG/Fingerprint.pm
-index fcb1028..81c38a7 100644
---- a/lib/GnuPG/Fingerprint.pm
-+++ b/lib/GnuPG/Fingerprint.pm
-@@ -20,7 +20,7 @@ with qw(GnuPG::HashInit);
- 
- has as_hex_string => (
-     isa => 'Any',
--    is  => 'rw',        
-+    is  => 'rw',
- );
- 
- sub compare {
-diff --git a/lib/GnuPG/Handles.pm b/lib/GnuPG/Handles.pm
-index b30ca57..3eee0e3 100644
---- a/lib/GnuPG/Handles.pm
-+++ b/lib/GnuPG/Handles.pm
-@@ -73,7 +73,7 @@ GnuPG::Handles - GnuPG handles bundle
-     = ( IO::Handle->new(), IO::Handle->new(), IO::Handle->new(),
-         IO::Handle->new(), IO::Handle->new(), IO::Handle->new(),
-       );
-- 
-+
-   my $handles = GnuPG::Handles->new
-     ( stdin      => $stdin,
-       stdout     => $stdout,
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 1f1e6d5..19e8070 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -833,7 +833,7 @@ GnuPG::Interface - Perl interface to GnuPG
-   # A simple example
-   use IO::Handle;
-   use GnuPG::Interface;
--  
-+
-   # setting up the situation
-   my $gnupg = GnuPG::Interface->new();
-   $gnupg->options->hash_init( armor   => 1,
-@@ -852,7 +852,7 @@ GnuPG::Interface - Perl interface to GnuPG
-   # Now we'll go about encrypting with the options already set
-   my @plaintext = ( 'foobar' );
-   my $pid = $gnupg->encrypt( handles => $handles );
--  
-+
-   # Now we write to the input of GnuPG
-   print $input @plaintext;
-   close $input;
-@@ -1144,7 +1144,7 @@ The following setup can be done before any of the following examples:
- 
-   my $handles = GnuPG::Handles->new( stdin    => $input,
-                                      stdout   => $output );
--   
-+
-   # this sets up the communication
-   # Note that the recipients were specified earlier
-   # in the 'options' data member of the $gnupg object.
-@@ -1220,7 +1220,7 @@ The following setup can be done before any of the following examples:
-   # a file written to disk
-   # Make sure you "use IO::File" if you use this module!
-   my $cipher_file = IO::File->new( 'encrypted.gpg' );
--   
-+
-   # this sets up the communication
-   my $pid = $gnupg->decrypt( handles => $handles );
- 
-@@ -1252,7 +1252,7 @@ The following setup can be done before any of the following examples:
-   # This time we'll just let GnuPG print to our own output
-   # and read from our input, because no input is needed!
-   my $handles = GnuPG::Handles->new();
--  
-+
-   my @ids = ( 'ftobin', '0xABCD1234' );
- 
-   # this time we need to specify something for
-@@ -1260,7 +1260,7 @@ The following setup can be done before any of the following examples:
-   # search ids as arguments
-   my $pid = $gnupg->list_public_keys( handles      => $handles,
-                                       command_args => [ @ids ] );
--  
-+
-    waitpid $pid, 0;
- 
- =head2 Creating GnuPG::PublicKey Objects
-@@ -1280,7 +1280,7 @@ The following setup can be done before any of the following examples:
-       command_args => [ qw( test/key.1.asc ) ],
-       handles      => $handles,
-     );
--    
-+
-     my @out = <$handles->stdout()>;
-     waitpid $pid, 0;
- 
-@@ -1357,7 +1357,7 @@ under the same terms as Perl itself.
- 
- =head1 AUTHOR
- 
--GnuPg::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.  
-+GnuPg::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.
- 
- Frank J. Tobin, ftobin@cpan.org was the original author of the package.
- 
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch
deleted file mode 100644
index f55d4b15942c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 19:52:58 -0400
-Subject: fix capitalization of GnuPG
-
----
- README                 | 2 +-
- lib/GnuPG/Interface.pm | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/README b/README
-index f457577..aa7c984 100644
---- a/README
-+++ b/README
-@@ -427,7 +427,7 @@ LICENSE
-     under the same terms as Perl itself.
- 
- AUTHOR
--    GnuPg::Interface is currently maintained by Jesse Vincent
-+    GnuPG::Interface is currently maintained by Jesse Vincent
-     <jesse@cpan.org>.
- 
-     Frank J. Tobin, ftobin@cpan.org was the original author of the package.
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 19e8070..cf7138f 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -1357,7 +1357,7 @@ under the same terms as Perl itself.
- 
- =head1 AUTHOR
- 
--GnuPg::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.
-+GnuPG::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.
- 
- Frank J. Tobin, ftobin@cpan.org was the original author of the package.
- 
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch
deleted file mode 100644
index a9ab737aa04a..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 19:57:10 -0400
-Subject: ommand_args should be command_args
-
----
- t/list_public_keys.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/list_public_keys.t b/t/list_public_keys.t
-index 7e563c1..a36a78b 100644
---- a/t/list_public_keys.t
-+++ b/t/list_public_keys.t
-@@ -38,7 +38,7 @@ TEST
-     reset_handles();
- 
-     my $pid = $gnupg->list_public_keys( handles     => $handles,
--                                        ommand_args => '0xF950DA9C'
-+                                        command_args => '0xF950DA9C'
-                                       );
-     close $stdin;
- 
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch
deleted file mode 100644
index 9694e0854ce8..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 20:05:16 -0400
-Subject: use fingerprints as inputs during tests to demonstrate explicit usage
-
----
- README                 | 6 +++---
- lib/GnuPG/Interface.pm | 6 +++---
- lib/GnuPG/Options.pm   | 2 +-
- t/MyTestSpecific.pm    | 2 +-
- t/encrypt.t            | 6 +++---
- t/export_keys.t        | 4 ++--
- t/get_public_keys.t    | 2 +-
- t/get_secret_keys.t    | 2 +-
- t/list_public_keys.t   | 4 ++--
- t/list_secret_keys.t   | 4 ++--
- t/list_sigs.t          | 4 ++--
- t/sign_and_encrypt.t   | 2 +-
- 12 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/README b/README
-index aa7c984..ed94ede 100644
---- a/README
-+++ b/README
-@@ -228,7 +228,7 @@ EXAMPLES
- 
-       $gnupg->options->hash_init( armor    => 1,
-                                   recipients => [ 'ftobin@uiuc.edu',
--                                                  '0xABCD1234' ],
-+                                                  '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ],
-                                   meta_interactive => 0 ,
-                                 );
- 
-@@ -347,7 +347,7 @@ EXAMPLES
-       # and read from our input, because no input is needed!
-       my $handles = GnuPG::Handles->new();
-   
--      my @ids = ( 'ftobin', '0xABCD1234' );
-+      my @ids = ( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
- 
-       # this time we need to specify something for
-       # command_args because --list-public-keys takes
-@@ -358,7 +358,7 @@ EXAMPLES
-        waitpid $pid, 0;
- 
-   Creating GnuPG::PublicKey Objects
--      my @ids = [ 'ftobin', '0xABCD1234' ];
-+      my @ids = [ 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ];
- 
-       my @keys = $gnupg->get_public_keys( @ids );
- 
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index cf7138f..6eaef7d 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -1130,7 +1130,7 @@ The following setup can be done before any of the following examples:
- 
-   $gnupg->options->hash_init( armor    => 1,
-                               recipients => [ 'ftobin@uiuc.edu',
--                                              '0xABCD1234' ],
-+                                              '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ],
-                               meta_interactive => 0 ,
-                             );
- 
-@@ -1253,7 +1253,7 @@ The following setup can be done before any of the following examples:
-   # and read from our input, because no input is needed!
-   my $handles = GnuPG::Handles->new();
- 
--  my @ids = ( 'ftobin', '0xABCD1234' );
-+  my @ids = ( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
- 
-   # this time we need to specify something for
-   # command_args because --list-public-keys takes
-@@ -1265,7 +1265,7 @@ The following setup can be done before any of the following examples:
- 
- =head2 Creating GnuPG::PublicKey Objects
- 
--  my @ids = [ 'ftobin', '0xABCD1234' ];
-+  my @ids = [ 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ];
- 
-   my @keys = $gnupg->get_public_keys( @ids );
- 
-diff --git a/lib/GnuPG/Options.pm b/lib/GnuPG/Options.pm
-index 86261a0..7788662 100644
---- a/lib/GnuPG/Options.pm
-+++ b/lib/GnuPG/Options.pm
-@@ -198,7 +198,7 @@ GnuPG::Options - GnuPG options embodiment
- 
-   # assuming $gnupg is a GnuPG::Interface object
-   $gnupg->options->armor( 1 );
--  $gnupg->options->push_recipients( 'ftobin', '0xABCD1234' );
-+  $gnupg->options->push_recipients( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
- 
- =head1 DESCRIPTION
- 
-diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
-index a309698..c8764cc 100644
---- a/t/MyTestSpecific.pm
-+++ b/t/MyTestSpecific.pm
-@@ -46,7 +46,7 @@ $gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1));
- $gnupg->options->hash_init( homedir              => 'test/gnupghome',
-                             armor                => 1,
-                             meta_interactive     => 0,
--                            meta_signing_key_id  => '0xF950DA9C',
-+                            meta_signing_key_id  => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
-                             always_trust         => 1,
-                           );
- 
-diff --git a/t/encrypt.t b/t/encrypt.t
-index 3183ac4..e6bdc08 100644
---- a/t/encrypt.t
-+++ b/t/encrypt.t
-@@ -27,7 +27,7 @@ TEST
- 
-     $gnupg->options->clear_recipients();
-     $gnupg->options->clear_meta_recipients_keys();
--    $gnupg->options->push_recipients( '0x2E854A6B' );
-+    $gnupg->options->push_recipients( '0x7466B7E98C4CCB64C2CE738BADB99D9C2E854A6B' );
- 
-     my $pid = $gnupg->encrypt( handles => $handles );
- 
-@@ -43,7 +43,7 @@ TEST
- {
-     reset_handles();
- 
--    my @keys = $gnupg->get_public_keys( '0xF950DA9C' );
-+    my @keys = $gnupg->get_public_keys( '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
-     $gnupg->options->clear_recipients();
-     $gnupg->options->clear_meta_recipients_keys();
-     $gnupg->options->push_meta_recipients_keys( @keys );
-@@ -64,7 +64,7 @@ TEST
- 
-     $gnupg->options->clear_recipients();
-     $gnupg->options->clear_meta_recipients_keys();
--    $gnupg->options->push_recipients( '0x2E854A6B' );
-+    $gnupg->options->push_recipients( '0x7466B7E98C4CCB64C2CE738BADB99D9C2E854A6B' );
- 
-     $handles->stdin( $texts{plain}->fh() );
-     $handles->options( 'stdin' )->{direct} = 1;
-diff --git a/t/export_keys.t b/t/export_keys.t
-index cf5c82b..5add064 100644
---- a/t/export_keys.t
-+++ b/t/export_keys.t
-@@ -15,7 +15,7 @@ TEST
-     reset_handles();
- 
-     my $pid = $gnupg->export_keys( handles      => $handles,
--                                   command_args => '0xF950DA9C' );
-+                                   command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
-     close $stdin;
-     waitpid $pid, 0;
- 
-@@ -31,7 +31,7 @@ TEST
-     $handles->options( 'stdout' )->{direct} = 1;
- 
-     my $pid = $gnupg->export_keys( handles            => $handles,
--                                   command_args => '0xF950DA9C' );
-+                                   command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
-     waitpid $pid, 0;
-     return $CHILD_ERROR == 0;
- };
-diff --git a/t/get_public_keys.t b/t/get_public_keys.t
-index 9e96f7d..7893625 100644
---- a/t/get_public_keys.t
-+++ b/t/get_public_keys.t
-@@ -19,7 +19,7 @@ TEST
- {
-     reset_handles();
- 
--    my @returned_keys = $gnupg->get_public_keys_with_sigs( '0xF950DA9C' );
-+    my @returned_keys = $gnupg->get_public_keys_with_sigs( '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
- 
-     return 0 unless @returned_keys == 1;
- 
-diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
-index c798cce..a7f1348 100644
---- a/t/get_secret_keys.t
-+++ b/t/get_secret_keys.t
-@@ -18,7 +18,7 @@ TEST
- {
-     reset_handles();
- 
--    my @returned_keys = $gnupg->get_secret_keys( '0xF950DA9C' );
-+    my @returned_keys = $gnupg->get_secret_keys( '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
- 
-     return 0 unless @returned_keys == 1;
- 
-diff --git a/t/list_public_keys.t b/t/list_public_keys.t
-index a36a78b..622b092 100644
---- a/t/list_public_keys.t
-+++ b/t/list_public_keys.t
-@@ -38,7 +38,7 @@ TEST
-     reset_handles();
- 
-     my $pid = $gnupg->list_public_keys( handles     => $handles,
--                                        command_args => '0xF950DA9C'
-+                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C'
-                                       );
-     close $stdin;
- 
-@@ -64,7 +64,7 @@ TEST
-     $handles->options( 'stdout' )->{direct} = 1;
- 
-     my $pid = $gnupg->list_public_keys( handles      => $handles,
--                                        command_args => '0xF950DA9C',
-+                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
-                                       );
- 
-     waitpid $pid, 0;
-diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
-index 51e3651..7040c38 100644
---- a/t/list_secret_keys.t
-+++ b/t/list_secret_keys.t
-@@ -55,7 +55,7 @@ TEST
-     reset_handles();
- 
-     my $pid = $gnupg->list_secret_keys( handles      => $handles,
--                                        command_args => '0xF950DA9C' );
-+                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
-     close $stdin;
- 
-     $outfile = 'test/secret-keys/2.out';
-@@ -80,7 +80,7 @@ TEST
-     $handles->options( 'stdout' )->{direct} = 1;
- 
-     my $pid = $gnupg->list_secret_keys( handles      => $handles,
--                                        command_args => '0xF950DA9C' );
-+                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
- 
-     waitpid $pid, 0;
- 
-diff --git a/t/list_sigs.t b/t/list_sigs.t
-index 16cfa6a..1301fb2 100644
---- a/t/list_sigs.t
-+++ b/t/list_sigs.t
-@@ -36,7 +36,7 @@ TEST
-     reset_handles();
- 
-     my $pid = $gnupg->list_sigs( handles      => $handles,
--                                 command_args => '0xF950DA9C',
-+                                 command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
-                                );
-     close $stdin;
- 
-@@ -60,7 +60,7 @@ TEST
-     $handles->options( 'stdout' )->{direct} = 1;
- 
-     my $pid = $gnupg->list_sigs( handles      => $handles,
--                                 command_args => '0xF950DA9C',
-+                                 command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
-                                );
- 
-     waitpid $pid, 0;
-diff --git a/t/sign_and_encrypt.t b/t/sign_and_encrypt.t
-index 5dc1c08..df0fc75 100644
---- a/t/sign_and_encrypt.t
-+++ b/t/sign_and_encrypt.t
-@@ -14,7 +14,7 @@ TEST
- {
-     reset_handles();
- 
--    $gnupg->options->push_recipients( '0x2E854A6B' );
-+    $gnupg->options->push_recipients( '0x7466B7E98C4CCB64C2CE738BADB99D9C2E854A6B' );
-     my $pid = $gnupg->sign_and_encrypt( handles => $handles );
- 
-     print $stdin @{ $texts{plain}->data() };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch
deleted file mode 100644
index 489e685b7b8c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 20:17:49 -0400
-Subject: move key files to generic names
-
----
- t/000_setup.t                         |   2 +-
- test/{pubring.gpg => public_keys.pgp} | Bin
- test/{secring.gpg => secret_keys.pgp} | Bin
- 3 files changed, 1 insertion(+), 1 deletion(-)
- rename test/{pubring.gpg => public_keys.pgp} (100%)
- rename test/{secring.gpg => secret_keys.pgp} (100%)
-
-diff --git a/t/000_setup.t b/t/000_setup.t
-index 7f7f7b0..a8e3042 100644
---- a/t/000_setup.t
-+++ b/t/000_setup.t
-@@ -19,7 +19,7 @@ TEST
-     copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
-     reset_handles();
- 
--    my $pid = $gnupg->import_keys(command_args => [ 'test/pubring.gpg', 'test/secring.gpg' ],
-+    my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp' ],
-                                   options => [ 'batch'],
-                                   handles => $handles);
-     waitpid $pid, 0;
-diff --git a/test/pubring.gpg b/test/public_keys.pgp
-similarity index 100%
-rename from test/pubring.gpg
-rename to test/public_keys.pgp
-diff --git a/test/secring.gpg b/test/secret_keys.pgp
-similarity index 100%
-rename from test/secring.gpg
-rename to test/secret_keys.pgp
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch
deleted file mode 100644
index ee809b61d754..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 20:25:48 -0400
-Subject: fix spelling: s/convience/convenience/
-
----
- README                 | 4 ++--
- lib/GnuPG/Interface.pm | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/README b/README
-index ed94ede..a05ef9b 100644
---- a/README
-+++ b/README
-@@ -143,7 +143,7 @@ OBJECT METHODS
-         does not come into play. If the passphrase data member handle of the
-         handles object is not defined, but the the passphrase data member
-         handle of GnuPG::Interface object is, GnuPG::Interface will handle
--        passing this information into GnuPG for the user as a convience.
-+        passing this information into GnuPG for the user as a convenience.
-         Note that this will result in GnuPG::Interface storing the
-         passphrase in memory, instead of having it simply 'pass-through' to
-         GnuPG via a handle.
-@@ -271,7 +271,7 @@ EXAMPLES
-                                        );
- 
-       # indicate our pasphrase through the
--      # convience method
-+      # convenience method
-       $gnupg->passphrase( $passphrase );
- 
-       # this sets up the communication
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 6eaef7d..29205f0 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -1008,7 +1008,7 @@ and so this information is not generated and does not come into play.
- If the B<passphrase> data member handle of the B<handles> object
- is not defined, but the the B<passphrase> data member handle of GnuPG::Interface
- object is, GnuPG::Interface will handle passing this information into GnuPG
--for the user as a convience.  Note that this will result in
-+for the user as a convenience.  Note that this will result in
- GnuPG::Interface storing the passphrase in memory, instead of having
- it simply 'pass-through' to GnuPG via a handle.
- 
-@@ -1175,7 +1175,7 @@ The following setup can be done before any of the following examples:
- 				   );
- 
-   # indicate our pasphrase through the
--  # convience method
-+  # convenience method
-   $gnupg->passphrase( $passphrase );
- 
-   # this sets up the communication
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch
deleted file mode 100644
index fcf20c1b9d1c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 20:59:43 -0400
-Subject: added new secret key with different passphrase
-
-Adding a new secret key with a different passphrase should allow us to
-differentiate between passing the passphrase explicitly and relying on
-the agent + pinentry.
----
- t/000_setup.t                  |  2 +-
- test/new_secret.pgp            | 58 ++++++++++++++++++++++++++++++++++++++++++
- test/secret-keys/1.0.test      |  4 +++
- test/secret-keys/1.modern.test |  5 ++++
- 4 files changed, 68 insertions(+), 1 deletion(-)
- create mode 100644 test/new_secret.pgp
-
-diff --git a/t/000_setup.t b/t/000_setup.t
-index a8e3042..b183241 100644
---- a/t/000_setup.t
-+++ b/t/000_setup.t
-@@ -19,7 +19,7 @@ TEST
-     copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
-     reset_handles();
- 
--    my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp' ],
-+    my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp', 'test/new_secret.pgp' ],
-                                   options => [ 'batch'],
-                                   handles => $handles);
-     waitpid $pid, 0;
-diff --git a/test/new_secret.pgp b/test/new_secret.pgp
-new file mode 100644
-index 0000000..5feb72c
---- /dev/null
-+++ b/test/new_secret.pgp
-@@ -0,0 +1,58 @@
-+-----BEGIN PGP PRIVATE KEY BLOCK-----
-+
-+lQPGBFf9iNIBCACZGF36JFTAggUJK85gweUquqh0kvVQICUtyiHXFXBBPzCK+RWL
-+oc5yeOfILHH7FfOztwPH1oJ7SWQtOgpuoiMHPtF7ne+MYevMf9jTYb/xCT0yZID5
-+/ieoHwUQQPiowxGewOww23RLQ1Cf46nqGBUD+fsWwT2Eq6ojLp/H72h+2lQ1ZCWd
-+Q/9MSQQgDo5tWptokFGmLBKCS59pYMBaLbKSj7lFa/ekPm9zhcdmmLrLHCS9rIUP
-+VKlWAg02MVmMB4fYm9nbtuwYHWvbDFYzpVr2WNlRZlPy0Y46ahxFbFwhtmOJAgT1
-+tgaQtDXo3kXRXngYZstDfe61Hqmc44j1vJ4VABEBAAH+BwMCnvb4v9vnhhzmdZdJ
-+EzK3ikXYQp3PcOMDlRE5qtBmXhOJXH2tdEmXjegjWGA501eeoks0VnpBba2m4B36
-+Z37fjpOEi4QOuTn6emVwijJZgmmTAC7JHNzAW+IsiRvk/2907UZCwa/1UQpC0bik
-+pHTZx+yKp33vGbkbCkKgHFQoHcS9D1by0WOkaLSlcE9CUCKb5LCe2Q1KDwZGrg60
-+4WUvg9eM2eatixAyOJEoRONlXDcQnUhSnG5+TUPNhVVWIaM/tPAgYmBG5oCSJ/N0
-+ls8cXoOVup/itBHo2Bfn+nyh0OAWdgdVmB0rPYUCLJV0FiQx5tB59OHmA3Naokj5
-+rvumyklCg314NnkEXrbPq7kKbX0X8UPoXdzAmalb4++OhgzEwd3NkWxvFSxKkQAt
-+XAU5i9XNHJXLwATAMlEaXMBmfcpjyIx4WpBUSmYMTjh0Nu5ee+kGvMY9fUxOKbet
-+IS9agFSMwVNRsX91+pKtBCQc7Je5tIrLhC8Hbvotn0GA8iFgu6LBqkrUO9Rh30Xs
-+vzz3oXm7WgHbL30m9h+rJ2dmPZOwmW/0zRUec/7alizx0T4sLx7T0qUPUxeEjkeU
-+JWtqfrcXEc3xIR9r5S2xqsUSKx6h1UhHMeMtQaDBgeH/Syq7a2gnkNoY84xxojGj
-+lGkis5PF3xFpYqvjY0thyPFNxQguRlqktN8gNB+V1dShbCpNI9bDzv4pzvogEiM0
-+EM/xvJSCkARCe6nqOugWV8j5f3+9tuyREqcidHq+PR+USoNYdUWQO14kPY6e62wO
-+lC5B4G7TDQtigCfOyEOiPXYC/qnC8sPVR2u5bCYm2YJT7L+rYRLSN+628qz7BwH3
-+9XtpnRtBFWpjI5qjn4uMM42e3k5UVB/r4GyrLXhEuO8D81TVzRQhjiqLweguk73h
-+VDjEd0yachHbtCxHbnVQRzo6SW50ZXJmYWNlIFRlc3Qga2V5IDx0ZXN0QGV4YW1w
-+bGUub3JnPokBNwQTAQgAIQUCV/2I0gIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIX
-+gAAKCRAbkTzptnR93EZkB/9groVsVMBJtGP1GSFMg2Q9loyijXT2P6hCbUTS4YMz
-+O4jQPB8UQ39XIhyWo7hVGsXeA777+7VTto7q0CG9Ph7FTGKK8W2AnzTUKNdXAC6h
-+qIc+ymvlm71GxhkKFR0vDbFg6CLJ/MX/x1Bd0TKh4RZtgOqX6A7Pzw/AI7f2YJcJ
-+BKPT+/q/F/Wp1r+mxZ5pxUvYm643GVzdnbtuoqgBLng/3n1zjIz+oIz6RGBjzHni
-+3TUTKe//ewn1lIdTxPdUZA9G4vTE5dCnM4MHTxQSXA+aUexuONswQhiANtfVCW8c
-+sf9MQpkQ/Vqv9hfeYwH4pJ8IPK1No9F0a0fvnq2JaX4gnQPGBFf9iNIBCADEQ6HK
-+s5tWN2Ph/3A6D0A2nSc6m1Mh/AXhdptka0aPhhVgspCmQ1lJP/Kdf6AnlCi6u1G7
-+QXvGX8OtbKNosLi91nIqvNwckUOvXrLcAk/epkmidopOuHUZhE+1UaLKs7UssBOe
-+TQTtADdl2786E3qbtaNrjDTvbNesU1DEZjNoBWfKYHZYv2wCF170Lwzp7NJhAueO
-+bTwfUO8EusST6d1NYB0zFxbBi60/hJHCfcAuaSn00jFQ+kj8m7jXCgcyB+1+25d2
-+gpPbs19S4pi9f7eQflhglm0wB13C6yl+YgwVZQxU/fU70jgSYhkXNPx5bEN3WGkg
-+4hnP53hrsI4p3se1ABEBAAH+BwMCAppvwSTp9Y/mu317D14a9k6m/zC2LrzPx6dl
-+P3GtDJUCs1CVH/wXsUxLY4hAgS188xPhNLuIWuXwQ7qX7E8kanxgPqeK7NTAPKxH
-+CEqJPevFRBtftHq3zqZZF9CHXulDO3KkWxIHANMclq+zcUotrc4GXIxeYjewXv9p
-+tzKEjlt27Q00VvwRM7JVxBlC3xJvKXf6zyRoUt2/Clq+CFkb2s+dAzCI52o7tlB9
-+El84sTIlJr0+b6+GcwrKonS8HcGUECfYmSiIiNmxlkJ/4OabDlDYlzvmCYv2pMjc
-+Bif70Dowb8TBD/iTFLPY2lkhqBFi3Bcqc51MVecaQk3rRbVyOqhvGaRE084/LmkN
-+gkE6vQKRSbzRmYwyKC/QUKOW5qbl5Jf3lrjVeM5tEnvJeRCfZEokKjIZul4nX4dK
-+zxH+l+sCUA+RnEeGB2y1yhnPkP4dYHEb8iMLINqXQd18FpBFSs9yv9tFWJhdblUK
-+SiS8DXmuoZI2Mk8yMZ0j0bi8mu9eh52dqYgBGD7TgjP5vpYU/zbtpNgMP0Zvne1X
-+gig6NKK1+3VAZaiOvYUUHZERJGp/eggTtF66cD/0EHJjoZ/0pAciEvWYUyXWVBdj
-+eVWBZE/RVOwrTMBVtrxQsPJ3sfeGlLt21IZYKathTZ/dn5PSlU+i4f9VyC/hHd8S
-+xouQU3nB//ihbrR65YH5E53e8+jPaRtFvLbcqmY8YftV0y/5BZwduZoxcOtxD3A0
-+J/2GVpUhs3WngCksdUAEbrEXzKKSOC7b4KDw2sTIT5xHra4CBK5L5N85ny8tG7A6
-+wmTt+6PHo51gx/W/0jiMB3rEiGoTZ86uWLaGv5SgqLP49euCIEXNKK9srFK3o7QE
-+04upH9zOXR8ytvPOLy/K5zT6YH2eyNs19sWfjAfP/bxhnrDYajsZ2WKZiQEfBBgB
-+CAAJBQJX/YjSAhsMAAoJEBuRPOm2dH3c+6kH+wWoEqTlPdPLZcTN8I5a6HHD0Ul8
-+7xt3OtiRFoMD2M+zgLvImaj8AULap4w/0G+J+7PCUER8JhcePSzLbizfpTczbDP2
-+E1LhEM8IBE6GT8yL8VB9AL1xW+hXIi5sWW/f900deOhoh7ikrP7KxT0c8zQjaaqV
-+n6bio93CvZ3yBqMO20apwWDyiSoBpXVjLrW00BdL8i9Rsf6v5UwIIy9o7pfjK5zo
-+mAZM2dKzlp9z4q5P6yE4aXI0bHz+XvG7hdpkHmjG5A+EQCnN2qoDNIA4QiRhH8TQ
-+aTaj4AlCiCAV2hEelPYve5QKccAsfC//qr+FMF+0bhZa05X2afxLYtku0Ms=
-+=ftgB
-+-----END PGP PRIVATE KEY BLOCK-----
-diff --git a/test/secret-keys/1.0.test b/test/secret-keys/1.0.test
-index 129d472..f8239a9 100644
---- a/test/secret-keys/1.0.test
-+++ b/test/secret-keys/1.0.test
-@@ -5,3 +5,7 @@ uid                  GnuPG test key (for testing purposes only)
- uid                  Foo Bar (1)
- ssb    768g/2E854A6B 2000-02-06
- 
-+sec   2048R/B6747DDC 2016-10-12
-+uid                  GnuPG::Interface Test key <test@example.org>
-+ssb   2048R/AE441D0F 2016-10-12
-+
-diff --git a/test/secret-keys/1.modern.test b/test/secret-keys/1.modern.test
-index 3e46407..42b27a1 100644
---- a/test/secret-keys/1.modern.test
-+++ b/test/secret-keys/1.modern.test
-@@ -6,3 +6,8 @@ uid           [ unknown] GnuPG test key (for testing purposes only)
- uid           [ unknown] Foo Bar (1)
- ssb   elg768 2000-02-06 [E]
- 
-+sec   rsa2048 2016-10-12 [SC]
-+      278F850AA702911F1318F0A61B913CE9B6747DDC
-+uid           [ unknown] GnuPG::Interface Test key <test@example.org>
-+ssb   rsa2048 2016-10-12 [E]
-+
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch
deleted file mode 100644
index 21e6294efaed..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 21:29:22 -0400
-Subject: Test use of gpg without explicit passphrase (agent+pinentry)
-
-The modern GnuPG suite encourages the use of gpg-agent to control
-access to secret key material.  In this use case, we avoid setting an
-explicit passphrase in code, and rely on either a correctly-configured
-and primed gpg-agent or a dedicated pinentry program to supply the
-passphrase.
-
-This additional test verifies that the passphrase can be handled by
-the agent.  Note that the passphrase for this additional test key is
-*not* the default passphrase, so this test should fail in the event
-that gpg can't use the agent and the pinentry for this task.
-
-Unfortunately, this all assumes that we're using GnuPG "Modern".  I've
-noted concerns about writing forward- and backward-compatible bindings
-for GnuPG here:
-https://lists.gnupg.org/pipermail/gnupg-devel/2016-October/031800.html
----
- README                 | 41 +++++++++++++++++++++++++++--------------
- lib/GnuPG/Interface.pm | 26 +++++++++++++++++++++++++-
- t/MyTestSpecific.pm    | 10 ++++++++--
- t/decrypt.t            | 27 +++++++++++++++++++++++++++
- test/encrypted.2.gpg   | 12 ++++++++++++
- test/fake-pinentry.pl  |  2 +-
- test/plain.2.txt       |  1 +
- 7 files changed, 101 insertions(+), 18 deletions(-)
- create mode 100644 test/encrypted.2.gpg
- create mode 100644 test/plain.2.txt
-
-diff --git a/README b/README
-index a05ef9b..be06ef3 100644
---- a/README
-+++ b/README
-@@ -5,7 +5,7 @@ SYNOPSIS
-       # A simple example
-       use IO::Handle;
-       use GnuPG::Interface;
--  
-+
-       # setting up the situation
-       my $gnupg = GnuPG::Interface->new();
-       $gnupg->options->hash_init( armor   => 1,
-@@ -24,7 +24,7 @@ SYNOPSIS
-       # Now we'll go about encrypting with the options already set
-       my @plaintext = ( 'foobar' );
-       my $pid = $gnupg->encrypt( handles => $handles );
--  
-+
-       # Now we write to the input of GnuPG
-       print $input @plaintext;
-       close $input;
-@@ -140,13 +140,26 @@ OBJECT METHODS
-         standard error, standard output, or standard error. If the status or
-         logger handle is not defined, this channel of communication is never
-         established with GnuPG, and so this information is not generated and
--        does not come into play. If the passphrase data member handle of the
--        handles object is not defined, but the the passphrase data member
--        handle of GnuPG::Interface object is, GnuPG::Interface will handle
--        passing this information into GnuPG for the user as a convenience.
--        Note that this will result in GnuPG::Interface storing the
--        passphrase in memory, instead of having it simply 'pass-through' to
--        GnuPG via a handle.
-+        does not come into play.
-+
-+        If the passphrase data member handle of the handles object is not
-+        defined, but the the passphrase data member handle of
-+        GnuPG::Interface object is, GnuPG::Interface will handle passing
-+        this information into GnuPG for the user as a convenience. Note that
-+        this will result in GnuPG::Interface storing the passphrase in
-+        memory, instead of having it simply 'pass-through' to GnuPG via a
-+        handle.
-+
-+        If neither the passphrase data member of the GnuPG::Interface nor
-+        the passphrase data member of the handles object is defined, then
-+        GnuPG::Interface assumes that access and control over the secret key
-+        will be handled by the running gpg-agent process. This represents
-+        the simplest mode of operation with the GnuPG "modern" suite
-+        (version 2.1 and later). It is also the preferred mode for tools
-+        intended to be user-facing, since the user will be prompted directly
-+        by gpg-agent for use of the secret key material. Note that for
-+        programmatic use, this mode requires the gpg-agent and pinentry to
-+        already be correctly configured.
- 
-   Other Methods
-     get_public_keys( @search_strings )
-@@ -241,7 +254,7 @@ EXAMPLES
- 
-       my $handles = GnuPG::Handles->new( stdin    => $input,
-                                          stdout   => $output );
--   
-+
-       # this sets up the communication
-       # Note that the recipients were specified earlier
-       # in the 'options' data member of the $gnupg object.
-@@ -315,7 +328,7 @@ EXAMPLES
-       # a file written to disk
-       # Make sure you "use IO::File" if you use this module!
-       my $cipher_file = IO::File->new( 'encrypted.gpg' );
--   
-+
-       # this sets up the communication
-       my $pid = $gnupg->decrypt( handles => $handles );
- 
-@@ -346,7 +359,7 @@ EXAMPLES
-       # This time we'll just let GnuPG print to our own output
-       # and read from our input, because no input is needed!
-       my $handles = GnuPG::Handles->new();
--  
-+
-       my @ids = ( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
- 
-       # this time we need to specify something for
-@@ -354,7 +367,7 @@ EXAMPLES
-       # search ids as arguments
-       my $pid = $gnupg->list_public_keys( handles      => $handles,
-                                           command_args => [ @ids ] );
--  
-+
-        waitpid $pid, 0;
- 
-   Creating GnuPG::PublicKey Objects
-@@ -372,7 +385,7 @@ EXAMPLES
-           command_args => [ qw( test/key.1.asc ) ],
-           handles      => $handles,
-         );
--    
-+
-         my @out = <$handles->stdout()>;
-         waitpid $pid, 0;
- 
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 29205f0..5d8b0ec 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -106,6 +106,14 @@ sub fork_attach_exec( $% ) {
-     my ( $self, %args ) = @_;
- 
-     my $handles = $args{handles} or croak 'no GnuPG::Handles passed';
-+    my $use_loopback_pinentry = 0;
-+
-+    # WARNING: this assumes that we're using the "modern" GnuPG suite
-+    # -- version 2.1.x or later.  It's not clear to me how we can
-+    # safely and efficiently avoid this assumption (see
-+    # https://lists.gnupg.org/pipermail/gnupg-devel/2016-October/031800.html)
-+    $use_loopback_pinentry = 1
-+      if ($handles->passphrase());
- 
-     # deprecation support
-     $args{commands} ||= $args{gnupg_commands};
-@@ -293,8 +301,12 @@ sub fork_attach_exec( $% ) {
-             $self->options->$option($fileno);
-         }
- 
-+        my @args = $self->options->get_args();
-+        push @args, '--pinentry-mode', 'loopback'
-+          if $use_loopback_pinentry;
-+
-         my @command = (
--            $self->call(), $self->options->get_args(),
-+            $self->call(), @args,
-             @commands,     @command_args
-         );
- 
-@@ -1005,6 +1017,7 @@ and standard error will be tied to the running program's standard error,
- standard output, or standard error.  If the B<status> or B<logger> handle
- is not defined, this channel of communication is never established with GnuPG,
- and so this information is not generated and does not come into play.
-+
- If the B<passphrase> data member handle of the B<handles> object
- is not defined, but the the B<passphrase> data member handle of GnuPG::Interface
- object is, GnuPG::Interface will handle passing this information into GnuPG
-@@ -1012,6 +1025,17 @@ for the user as a convenience.  Note that this will result in
- GnuPG::Interface storing the passphrase in memory, instead of having
- it simply 'pass-through' to GnuPG via a handle.
- 
-+If neither the B<passphrase> data member of the GnuPG::Interface nor
-+the B<passphrase> data member of the B<handles> object is defined,
-+then GnuPG::Interface assumes that access and control over the secret
-+key will be handled by the running gpg-agent process.  This represents
-+the simplest mode of operation with the GnuPG "modern" suite (version
-+2.1 and later).  It is also the preferred mode for tools intended to
-+be user-facing, since the user will be prompted directly by gpg-agent
-+for use of the secret key material.  Note that for programmatic use,
-+this mode requires the gpg-agent and pinentry to already be correctly
-+configured.
-+
- =back
- 
- =head2 Other Methods
-diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
-index c8764cc..e513c25 100644
---- a/t/MyTestSpecific.pm
-+++ b/t/MyTestSpecific.pm
-@@ -55,9 +55,15 @@ struct( Text => { fn => "\$", fh => "\$", data => "\$" } );
- $texts{plain} = Text->new();
- $texts{plain}->fn( 'test/plain.1.txt' );
- 
-+$texts{alt_plain} = Text->new();
-+$texts{alt_plain}->fn( 'test/plain.2.txt' );
-+
- $texts{encrypted} = Text->new();
- $texts{encrypted}->fn( 'test/encrypted.1.gpg' );
- 
-+$texts{alt_encrypted} = Text->new();
-+$texts{alt_encrypted}->fn( 'test/encrypted.2.gpg' );
-+
- $texts{signed} = Text->new();
- $texts{signed}->fn( 'test/signed.1.asc' );
- 
-@@ -68,7 +74,7 @@ $texts{temp} = Text->new();
- $texts{temp}->fn( 'test/temp' );
- 
- 
--foreach my $name ( qw( plain encrypted signed key ) )
-+foreach my $name ( qw( plain alt_plain encrypted alt_encrypted signed key ) )
- {
-     my $entry = $texts{$name};
-     my $filename = $entry->fn();
-@@ -90,7 +96,7 @@ sub reset_handles
-         stderr  => $stderr
-       );
- 
--    foreach my $name ( qw( plain encrypted signed key ) )
-+    foreach my $name ( qw( plain alt_plain encrypted alt_encrypted signed key ) )
-     {
-         my $entry = $texts{$name};
-         my $filename = $entry->fn();
-diff --git a/t/decrypt.t b/t/decrypt.t
-index b2639ed..ee41448 100644
---- a/t/decrypt.t
-+++ b/t/decrypt.t
-@@ -58,3 +58,30 @@ TEST
- {
-     return compare( $texts{plain}->fn(), $texts{temp}->fn() ) == 0;
- };
-+
-+
-+# test without default_passphrase (that is, by using the agent)
-+TEST
-+{
-+    reset_handles();
-+
-+    $handles->stdin( $texts{alt_encrypted}->fh() );
-+    $handles->options( 'stdin' )->{direct} = 1;
-+
-+    $handles->stdout( $texts{temp}->fh() );
-+    $handles->options( 'stdout' )->{direct} = 1;
-+
-+    $gnupg->clear_passphrase();
-+
-+    my $pid = $gnupg->decrypt( handles => $handles );
-+
-+    waitpid $pid, 0;
-+
-+    return $CHILD_ERROR == 0;
-+};
-+
-+
-+TEST
-+{
-+    return compare( $texts{alt_plain}->fn(), $texts{temp}->fn() ) == 0;
-+};
-diff --git a/test/encrypted.2.gpg b/test/encrypted.2.gpg
-new file mode 100644
-index 0000000..105cbb3
---- /dev/null
-+++ b/test/encrypted.2.gpg
-@@ -0,0 +1,12 @@
-+-----BEGIN PGP MESSAGE-----
-+
-+hQEMAw3NS2KuRB0PAQgAuCMQO6blPRIJZib+kDa51gac+BYPl8caXYTLqIHtiz2/
-+YRVqePJON4lNAqT6qUksIzQHtejFO6tb1SLqgX9Ti+fKAMLrQw9VGOYaJFoRrTJs
-++X33S4GHVVikRTu0dydAsekbfPSc2nRmTFUlSEV3psgAmg9xy8KA6cZroK9Xfcuh
-+xW7KLE0hLP+2NZ7zNmJMdu6LDGzvlQsnm1UeElXK8XdMGf8kA3R+GgeeOnR/oEQc
-+Uep77k/fLc+UV4fp9Dk1OBeg3Ko/irSaefk4mU7F4HmS8jIERHRvXBTiur1Zx8Nx
-+9U3fcQuc+P9+JC89iS4PJPF1Hr0MlezAghZYJrhOrtJIAe5Uaft5KMGRfy0VQnAs
-+MHqGnGtzzVWK6GK83ibgG4tTfPEHHIgNFsJf3rM4cWklUmCS9TeeDJJZfhnRA6+/
-+X82e6OI7QNbO
-+=DlGE
-+-----END PGP MESSAGE-----
-diff --git a/test/fake-pinentry.pl b/test/fake-pinentry.pl
-index 12d3611..40b8b08 100755
---- a/test/fake-pinentry.pl
-+++ b/test/fake-pinentry.pl
-@@ -21,7 +21,7 @@ while (<STDIN>) {
-   chomp;
-   next if (/^$/);
-   next if (/^#/);
--  print ("D test\n") if (/^getpin/i);
-+  print ("D supercalifragilisticexpialidocious\n") if (/^getpin/i);
-   print "OK\n";
-   exit if (/^bye/i);
- }
-diff --git a/test/plain.2.txt b/test/plain.2.txt
-new file mode 100644
-index 0000000..da5a1d5
---- /dev/null
-+++ b/test/plain.2.txt
-@@ -0,0 +1 @@
-+test message
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
deleted file mode 100644
index 2f20f1455397..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Thu, 25 May 2017 16:07:45 -0400
-Subject: Kill any GnuPG agent before and after the test suite.
-
-This helps to ensure that the test suite daemon is started fresh at
-every test suite run.  And it also avoids leaving a daemon running
-after the test suite, assuming the test suite manages to reach the
-end.
-
-This is considered a reasonable practice by upstream.
----
- t/000_setup.t   | 3 +++
- t/zzz_cleanup.t | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/t/000_setup.t b/t/000_setup.t
-index b183241..4dc4329 100644
---- a/t/000_setup.t
-+++ b/t/000_setup.t
-@@ -17,6 +17,9 @@ TEST
-     $agentconf->write("pinentry-program " . getcwd() . "/test/fake-pinentry.pl\n");
-     $agentconf->close();
-     copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
-+    # reset the state of any long-lived gpg-agent, ignoring errors:
-+    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
-+
-     reset_handles();
- 
-     my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp', 'test/new_secret.pgp' ],
-diff --git a/t/zzz_cleanup.t b/t/zzz_cleanup.t
-index 5c03a72..eea3a48 100644
---- a/t/zzz_cleanup.t
-+++ b/t/zzz_cleanup.t
-@@ -12,6 +12,8 @@ use File::Path qw (remove_tree);
- TEST
- {
-     my $err = [];
-+    # kill off any long-lived gpg-agent, ignoring errors:
-+    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
-     remove_tree('test/gnupghome', {error => \$err});
-     return ! @$err;
- };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
deleted file mode 100644
index 457a5e74d532..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Fri, 26 May 2017 09:51:40 -0400
-Subject: Use a short temporary homedir during the test suite
-
-This avoids problems with the length of the path to the homedir as
-compared to the size limits of sockaddr_un.sun_path, particularly on
-systems where /run/user/$(id -u) is not present or available (such as
-many minimalist build environments).
----
- t/000_setup.t        |  9 +++++----
- t/MyTestSpecific.pm  | 18 +++++++++++++++++-
- t/list_secret_keys.t |  3 ++-
- t/zzz_cleanup.t      |  6 ++++--
- 4 files changed, 28 insertions(+), 8 deletions(-)
-
-diff --git a/t/000_setup.t b/t/000_setup.t
-index 4dc4329..82d7005 100644
---- a/t/000_setup.t
-+++ b/t/000_setup.t
-@@ -12,13 +12,14 @@ use File::Copy;
- 
- TEST
- {
--    make_path('test/gnupghome', { mode => 0700 });
--    my $agentconf = IO::File->new( "> test/gnupghome/gpg-agent.conf" );
-+    my $homedir = $gnupg->options->homedir();
-+    make_path($homedir, { mode => 0700 });
-+    my $agentconf = IO::File->new( "> " . $homedir . "/gpg-agent.conf" );
-     $agentconf->write("pinentry-program " . getcwd() . "/test/fake-pinentry.pl\n");
-     $agentconf->close();
--    copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
-+    copy('test/gpg.conf', $homedir . '/gpg.conf');
-     # reset the state of any long-lived gpg-agent, ignoring errors:
--    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
-+    system('gpgconf', '--homedir', $homedir, '--quiet', '--kill', 'gpg-agent');
- 
-     reset_handles();
- 
-diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
-index e513c25..809d55c 100644
---- a/t/MyTestSpecific.pm
-+++ b/t/MyTestSpecific.pm
-@@ -22,6 +22,7 @@ use IO::Seekable;
- use File::Compare;
- use Exporter;
- use Class::Struct;
-+use File::Temp qw (tempdir);
- 
- use GnuPG::Interface;
- use GnuPG::Handles;
-@@ -40,10 +41,25 @@ use vars qw( @ISA           @EXPORT
- 
- $gnupg = GnuPG::Interface->new( passphrase => 'test' );
- 
-+
-+my $homedir;
-+if (-f "test/gnupghome") {
-+  my $record = IO::File->new( "< test/gnupghome" );
-+  $homedir = <$record>;
-+  $record->close();
-+} else {
-+  $homedir = tempdir( DIR => '/tmp');
-+  my $record = IO::File->new( "> test/gnupghome" );
-+  $record->write($homedir);
-+  $record->close();
-+}
-+
- my @version = split('\.', $gnupg->version());
- $gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1));
- 
--$gnupg->options->hash_init( homedir              => 'test/gnupghome',
-+
-+
-+$gnupg->options->hash_init( homedir              => $homedir,
-                             armor                => 1,
-                             meta_interactive     => 0,
-                             meta_signing_key_id  => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
-diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
-index 7040c38..d1e3f30 100644
---- a/t/list_secret_keys.t
-+++ b/t/list_secret_keys.t
-@@ -23,8 +23,9 @@ TEST
-     $outfile = 'test/secret-keys/1.out';
-     my $out = IO::File->new( "> $outfile" )
-       or die "cannot open $outfile for writing: $ERRNO";
-+    my $modern_pubring_line = $gnupg->options->homedir() . "/pubring.kbx\n";
-     while (<$stdout>) {
--      if ($gpg_is_modern && /^\/.*\/test\/gnupghome\/pubring.kbx$/) {
-+      if ($gpg_is_modern && ($_ eq $modern_pubring_line)) {
-         $out->print("test/gnupghome/pubring.kbx\n");
-       } elsif ($gpg_is_modern && /^--*$/) {
-         $out->print("--------------------------\n");
-diff --git a/t/zzz_cleanup.t b/t/zzz_cleanup.t
-index eea3a48..c3ec16f 100644
---- a/t/zzz_cleanup.t
-+++ b/t/zzz_cleanup.t
-@@ -11,9 +11,11 @@ use File::Path qw (remove_tree);
- # this is actually no test, just cleanup.
- TEST
- {
-+    my $homedir = $gnupg->options->homedir();
-     my $err = [];
-     # kill off any long-lived gpg-agent, ignoring errors:
--    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
--    remove_tree('test/gnupghome', {error => \$err});
-+    system('gpgconf', '--homedir', $homedir, '--quiet', '--kill', 'gpg-agent');
-+    remove_tree($homedir, {error => \$err});
-+    unlink('test/gnupghome');
-     return ! @$err;
- };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
deleted file mode 100644
index ae6143190de3..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Fri, 26 May 2017 18:15:24 -0400
-Subject: Make things work with gpg1 (assuming plain 'gpg' is modern)
-
- * avoid sending --pinentry-mode=loopback if gpg is invoked as gpg1
- * fix up t/list_secret_keys to account for the varied output
- * t/decrypt.t still fails two agent-only tests, but presumably folks
-   who use gpg1 are not expecting to use the agent.
----
- lib/GnuPG/Interface.pm | 5 ++++-
- t/list_secret_keys.t   | 9 +++++----
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 5d8b0ec..f80ead5 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -112,8 +112,11 @@ sub fork_attach_exec( $% ) {
-     # -- version 2.1.x or later.  It's not clear to me how we can
-     # safely and efficiently avoid this assumption (see
-     # https://lists.gnupg.org/pipermail/gnupg-devel/2016-October/031800.html)
-+    #
-+    # as a (brittle and incomplete) cleanup, we will avoid trying to
-+    # send pinentry-loopback if the program is invoked as "gpg1"
-     $use_loopback_pinentry = 1
--      if ($handles->passphrase());
-+      if ($handles->passphrase() && ! ($self->call =~ m/gpg1$/));
- 
-     # deprecation support
-     $args{commands} ||= $args{gnupg_commands};
-diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
-index d1e3f30..8e3c911 100644
---- a/t/list_secret_keys.t
-+++ b/t/list_secret_keys.t
-@@ -23,11 +23,12 @@ TEST
-     $outfile = 'test/secret-keys/1.out';
-     my $out = IO::File->new( "> $outfile" )
-       or die "cannot open $outfile for writing: $ERRNO";
--    my $modern_pubring_line = $gnupg->options->homedir() . "/pubring.kbx\n";
-+    my $seckey_file = $gpg_is_modern ? 'pubring.kbx' : 'secring.gpg';
-+    my $pubring_line = $gnupg->options->homedir() . '/' . $seckey_file . "\n";
-     while (<$stdout>) {
--      if ($gpg_is_modern && ($_ eq $modern_pubring_line)) {
--        $out->print("test/gnupghome/pubring.kbx\n");
--      } elsif ($gpg_is_modern && /^--*$/) {
-+      if ($_ eq $pubring_line) {
-+        $out->print('test/gnupghome/'.$seckey_file."\n");
-+      } elsif (/^--*$/) {
-         $out->print("--------------------------\n");
-       } else {
-         $out->print( $_ );
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch
deleted file mode 100644
index 1268beeb0a21..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7c85ac40660861e7507c43d043323c3f1b83921b Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Wed, 20 Jun 2018 21:57:50 +0300
-Subject: [PATCH] Fix test suite for GnuPG >= 2.2.6 compatibility
-
-GnuPG 2.2.6 (commit 1a5d95e7319e7e6f) started marking signatures
-with an expired key with '?', as seen with for instance
-
- GNUPGHOME=./test/gnupghome/ gpg --list-sigs 0xF950DA9C
-
-Adapt the test suite accordingly.
-
-See https://dev.gnupg.org/rG1a5d95e7319e7e6f0dd11064a26cbbc371b05214
-
-Bug-Debian: https://bugs.debian.org/900051
----
- t/get_public_keys.t | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/t/get_public_keys.t b/t/get_public_keys.t
-index 7893625..ede080a 100644
---- a/t/get_public_keys.t
-+++ b/t/get_public_keys.t
-@@ -13,8 +13,12 @@ use MyTestSpecific;
- use GnuPG::PrimaryKey;
- use GnuPG::SubKey;
- 
-+use version;
-+
- my ( $given_key, $handmade_key );
- 
-+my $gnupg_version = version->parse($gnupg->version);
-+
- TEST
- {
-     reset_handles();
-@@ -74,7 +78,7 @@ TEST
-                             date_string => '2000-03-16',
-                             hex_id => '56FFD10A260C4FA3',
-                             sig_class => 0x10,
--                            validity => '!'),
-+                            validity => $gnupg_version < version->parse('2.2.6') ? '!' : '?'),
-       GnuPG::Signature->new(
-                             date => 949813093,
-                             algo_num => 17,
-@@ -115,7 +119,7 @@ TEST
-                             date_string => '2000-03-16',
-                             hex_id => '56FFD10A260C4FA3',
-                             sig_class => 0x10,
--                            validity => '!'),
-+                            validity => $gnupg_version < version->parse('2.2.6') ? '!' : '?'),
-       GnuPG::Signature->new(
-                             date => 953179891,
-                             algo_num => 17,
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch
deleted file mode 100644
index 6c025007eef5..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b356e7fda15e39e037da1888a24000a96fc85c90 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Sun, 24 Jun 2018 16:19:25 +0300
-Subject: [PATCH] Fix test suite for GnuPG >= 2.2.8 compatibility
-
-GnuPG 2.2.8 onwards issues a hard failure when decrypting
-messages not using the MDC mode.
-
-Bug-Debian: https://bugs.debian.org/900051
----
- t/decrypt.t | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/t/decrypt.t b/t/decrypt.t
-index ee41448..2d6740c 100644
---- a/t/decrypt.t
-+++ b/t/decrypt.t
-@@ -6,6 +6,7 @@
- use strict;
- use English qw( -no_match_vars );
- use File::Compare;
-+use version;
- 
- use lib './t';
- use MyTest;
-@@ -13,6 +14,8 @@ use MyTestSpecific;
- 
- my $compare;
- 
-+my $gnupg_version = version->parse($gnupg->version);
-+
- TEST
- {
-     reset_handles();
-@@ -26,7 +29,13 @@ TEST
-     close $stdout;
-     waitpid $pid, 0;
- 
--    return $CHILD_ERROR == 0;;
-+    if ($gnupg_version < version->parse('2.2.8')) {
-+        return $CHILD_ERROR == 0;;
-+    } else {
-+        local $/ = undef;
-+        my $errstr = <$stderr>;
-+        return (($CHILD_ERROR >> 8 == 2) and ($errstr =~ /ignore-mdc-error/));
-+    }
- };
- 
- 
-@@ -50,7 +59,13 @@ TEST
- 
-     waitpid $pid, 0;
- 
--    return $CHILD_ERROR == 0;
-+    if ($gnupg_version < version->parse('2.2.8')) {
-+        return $CHILD_ERROR == 0;
-+    } else {
-+        local $/ = undef;
-+        my $errstr = <$stderr>;
-+        return (($CHILD_ERROR >> 8 == 2) and ($errstr =~ /ignore-mdc-error/));
-+    }
- };
- 
- 
diff --git a/dev-perl/Google-Ads-AdWords-Client/Manifest b/dev-perl/Google-Ads-AdWords-Client/Manifest
index 4fd1d4004da2..ecd95ef5e523 100644
--- a/dev-perl/Google-Ads-AdWords-Client/Manifest
+++ b/dev-perl/Google-Ads-AdWords-Client/Manifest
@@ -1,5 +1,3 @@
-AUX 4.14.0-no-dot-in-inc.patch 2576 BLAKE2B 599a34aabdea3b3995704712e26ffa0a88c545185fe205f37b3c618fd7063e0ede55895a9797aa1de1490cd0ba634653aca235892f17410b257b199ed16ce612 SHA512 1fb62aee9081303c1d1186a1fd388e698f519ea5856fdf86e65af2044945b85952c2dcd96b0a0a5ec4234fe82361b2e076143918193218f54934c93120b54ccf
-AUX 4.14.0-unescaped-lbracket.patch 1656 BLAKE2B 96bc78ecbc3a2ed7408a509184f88a9ee2c9ac2b2d0b4ad8c8567dcf57646d823bc92938097a7984678c18569b9d8ceb1c9f27ae76afef6ca906c4f5997f85b6 SHA512 8ba173dff927bf5dd7193d88fe110bdaf71b44b54e3e5a3a0d8ff161ce492a36324c5e69dfca268577ecbbf81d3b99247f7fe305bd4bd2f172e59ea52b9146c1
 DIST Google-Ads-AdWords-Client-5.8.2.tar.gz 3194633 BLAKE2B b2e05294dbc60f8725d2f764defe1108db8a93f5f5e10da9ff8b7dcfe1aaf0877f92bde4ae3937310bed6ec5c73225f5edd243c5864beeb8f070ae1235087437 SHA512 d38689358872511613e0d596ee0233070848f7ea5368cbabd0b13e91bb8fa9259af83ec7cd3d852e9aed1eac0769d7c4a097adda3da730eb49aaec127cff54f6
 EBUILD Google-Ads-AdWords-Client-5.8.2.ebuild 1195 BLAKE2B 78f8a36f7834cb2654e46345442aa7f007603c6fab7f23c4adec5cdb7b021ae8ab8fcf834148847cab10474cc30119b617e82bd9f96a1342ce4b9aaa3a1261bb SHA512 52c0dccbe39ae2b5fc04194521d395cf5b1bb50c3532f0849b6071324f7a7afb5d398a03c1654b9f3209405974fd691890ff5522d9a880200004d20767b4cbcb
 MISC metadata.xml 4425 BLAKE2B e622ea7310457ef089a65d52746b929c403d93f0e740669c2a5b8af70d582a542c561998f315117a8dd08c72359443ab2ae36523456290867ef5d00580a923c4 SHA512 03af5a73b54159a9e25e4f1fa3d8804dc6aa97232a3bb7e9fbd6b1458ef04deeb2f79baf630c7151d9fc73943b83b7ad7849799e31a5a308bf01f3b23ffafc9f
diff --git a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch b/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch
deleted file mode 100644
index 218cb69b1483..000000000000
--- a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From a67324b5622088422b0b0c1a403c594312452d16 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 4 Jun 2017 07:35:25 +1200
-Subject: [PATCH 1/3] t/001_require.t: Force a relative path load for require
- test
-
-require_ok("Foo") is implemented in terms of  require "Foo"
-
-This means:
-
-require "Foo.pm"
-
-Only loads "Foo.pm" from "." if:
-
-- '.' is in @INC ( Not true by default in Perl >5.25.11 )
-- Foo.pm is not installed in Perl5lib ( dangerous assumption )
-
-This forces require to side-step @INC traversal by using an explicit
-prefix of "./", which is special-cased in require.
-
-This fixes RT#120674
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=120674
----
- t/001_require.t | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/001_require.t b/t/001_require.t
-index fe0d205..d70b2d2 100755
---- a/t/001_require.t
-+++ b/t/001_require.t
-@@ -24,7 +24,7 @@ use File::Spec;
- use Test::More qw(no_plan);
- 
- # Set up @INC at runtime with an absolute path.
--my $lib_path = File::Spec->catdir(dirname($0), "..", "lib");
-+my $lib_path = File::Spec->rel2abs(File::Spec->catdir(dirname($0), "..", "lib"));
- push(@INC, $lib_path);
- 
- require_ok 'Google::Ads::AdWords::Client';
-@@ -38,6 +38,6 @@ sub test_require {
-     local $SIG{__WARN__} = sub {
-       warn @_ unless $_[0] =~ /redefine/;
-     };
--    require_ok($file_name);
-+    require_ok("./$file_name");
-   }
- }
--- 
-2.12.2
-
-From 76f5a421585b8c85b7e39b91adb0b257d1d83665 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 4 Jun 2017 07:40:01 +1200
-Subject: [PATCH 2/3] t/020_GenerateOfflineCredentials.t: Force relative path
- for script
-
-require "some/path.pl" previously fell into worknig due to '.' being
-in @INC, as this still invokes @INC traversal
-
-This change simply forces a "./" so that Perl uses direct access via
-a special-cased path instead of relying on @INC traversal, which becomes
-unsafe to depend on since Perl 5.25.11
----
- t/020_GenerateOfflineCredentials.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/020_GenerateOfflineCredentials.t b/t/020_GenerateOfflineCredentials.t
-index 0dcde9d..dfa8b50 100755
---- a/t/020_GenerateOfflineCredentials.t
-+++ b/t/020_GenerateOfflineCredentials.t
-@@ -51,7 +51,7 @@ my $stdout;
- open(STDOUT, ">", \$stdout);
- 
- # Calling the offline credentials code
--require qw(examples/oauth/generate_offline_credentials.pl);
-+require qw(./examples/oauth/generate_offline_credentials.pl);
- ok(generate_offline_credentials($client));
- 
- # Checking the auth mock was correctly called
--- 
-2.12.2
-
diff --git a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch b/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch
deleted file mode 100644
index 4e7a4546f9cd..000000000000
--- a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a7e92591ac0415fbb7119e4ad7572f910e4fdb8f Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 4 Jun 2017 07:43:59 +1200
-Subject: [PATCH 3/3] Fix unescaped "{" error in tests t/022* and t/024*
-
-Perl 5.26 makes use of literal unescaped { in a regex illegal,
-and this leads to test failures.
-
-This change simply quotes the offending characters to make tests pass.
-
-This closes RT#118509
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=118509
----
- t/022_ReportUtils.t     | 2 +-
- t/024_BatchJobHandler.t | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/022_ReportUtils.t b/t/022_ReportUtils.t
-index 4f5f326..d0e2000 100755
---- a/t/022_ReportUtils.t
-+++ b/t/022_ReportUtils.t
-@@ -57,7 +57,7 @@ my $report_as_string = $report_handler->get_as_string();
- ok(!$report_as_string, "report as string");
- ok($report_as_string->isa("Google::Ads::Common::ReportDownloadError"),
-   "check report handler->report_as_string return type");
--ok($report_as_string =~ /ReportDownloadError\s{[^}]+}/,
-+ok($report_as_string =~ /ReportDownloadError\s\{[^}]+}/,
-   "check ReportDownloadError STRINGIFY");
- 
- my ($fh, $filename) = tempfile();
-diff --git a/t/024_BatchJobHandler.t b/t/024_BatchJobHandler.t
-index 15983ae..4b86703 100755
---- a/t/024_BatchJobHandler.t
-+++ b/t/024_BatchJobHandler.t
-@@ -133,6 +133,6 @@ my $batch_job_handler_error =
-     description => "test"
-   });
- ok(!$batch_job_handler_error, "BOOLIFY on error false");
--ok($batch_job_handler_error =~ /BatchJobHandlerError\s{[^}]+}/,
-+ok($batch_job_handler_error =~ /BatchJobHandlerError\s\{[^}]+}/,
-   "check BatchJobHandlerError STRINGIFY");
- 
--- 
-2.12.2
-
diff --git a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild
index b9b1a3df6014..59131c332d43 100644
--- a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild
+++ b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module virtualx
 DESCRIPTION="Image viewer widget for Gtk3"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-perl/Cairo
diff --git a/dev-perl/Gtk3-ImageView/Manifest b/dev-perl/Gtk3-ImageView/Manifest
index 4e60a9dda474..c607fda06a26 100644
--- a/dev-perl/Gtk3-ImageView/Manifest
+++ b/dev-perl/Gtk3-ImageView/Manifest
@@ -1,5 +1,5 @@
 DIST Gtk3-ImageView-10.tar.gz 28165 BLAKE2B 429490c02e34bbe669b209459fd90937a4148e643b6b4e26bd643cd930f728a400b4d179c7e072a72fced7b06fc9a7f16deb87d33b42b296f07f5dce14abdfb1 SHA512 2548c33c49c27bb4a69d5512c7dfaca096a39ef6d08fa1deb83a045e6c5b7ad075eb8b23b33fb794024c9b9e7fd979a5c31bff075a7ed5412a4a5a4f53824f5a
 DIST Gtk3-ImageView-9.tar.gz 16083 BLAKE2B f64723d2ee468c7ab423292bba8d995a62554877567fdfdd272e527920e037147783fcb9cea99ba1688f09303ee321abaee0e334a67db46bda6b0ed7e1ff9415 SHA512 1a52c53a03b6f9dd6abc69dbb03a8dd80df77e266eb972cb2438bd25d49765b203a70e2dfee1ae3cfdd27b4d987f9573eef3e47968c80550771dd3edbcf831cc
-EBUILD Gtk3-ImageView-10.0.0.ebuild 694 BLAKE2B 7a9e3ac2dc936524867c0d046a8be34a336e86365e6d3874f22a66d076678ebffbbebc2e079769bafb3af3b44f1fa2361c977afae5cd9716635161a280500cc8 SHA512 7adc62eeaae38106f4b0855d1195d74b42c8a923f07bb2182b27a10fcf7b399f41fbe8b33de945f43c414b570891918c34285a1f17a2c79cf57e0b79f3720a96
+EBUILD Gtk3-ImageView-10.0.0.ebuild 693 BLAKE2B 2f54394a6acd831f71d7099166824d61e4538cd9052d9522fcc4eec4b0cac121619b5fefce3990a553e03eb2e467d834c35bfd3acda641d46130cb9cf2f27f30 SHA512 41c7cb008c0a73cf85f795e5956a12e7caa204c40c97bc07f7e744b46e77a8e7e0e3759835a236f5a26885c806fc29609a534b917945e82664d6c5893fad5cb9
 EBUILD Gtk3-ImageView-9.0.0.ebuild 691 BLAKE2B 81ea41684762dddf26d7bb212119a45c9adec9dc30aa8885304117acd1d28bf7d3387351285cadc030b374a3e2786bc9df3ea27e604cf2b99469771c8564631b SHA512 021d0dd86d5125bea046f6bef25bbfbf493e8945691516b38ba963b1af9c0ff9adfb9b04180069114d29e3d1e5a4b7f6dcb0039b7889a05f84ab8b2853449e5c
 MISC metadata.xml 1018 BLAKE2B 3b984f34f2b493db7ab1fd89b6edbac39936461826a43de10c6cde112a9e1be83eebd9f6184fe2c39763ecca1c050d44211641049028e8bc5aa7cb00cf3ac1e0 SHA512 eddb5b455c5561f7ccc1f84053c6830af833cde842af7422d0b4907765d3a771a892613c64ab6bb09ee49da53c8c989f4046bc172ccc70a4a3cf9164e337474c
diff --git a/dev-perl/Gtk3/Manifest b/dev-perl/Gtk3/Manifest
index 37a1e09411b3..52337fde040a 100644
--- a/dev-perl/Gtk3/Manifest
+++ b/dev-perl/Gtk3/Manifest
@@ -1,4 +1,3 @@
-AUX Gtk3-0.34.0-gdk-pixbuf-test.patch 1992 BLAKE2B 3f81159c626971f91ce4272ac7e89b693b6d11c430950e48bb24f9b581b2a485a562f5f5170ef44f3b26bf45c7e2b8090307bee2556dbf72fb9e569113875d0f SHA512 ee2864b036a5463df4c821c3a424a62411954e9799be485076013ff1f36b0dd19b678cbb9a7ea1bc3d5365a15986958241b15b8e4009ec91392e0401e234049a
 DIST Gtk3-0.038.tar.gz 57426 BLAKE2B 76e74320c9bfaa19bd71b58742037d4acb85920466d0af88c3a276f5e4bf2d34c94ee3b278d385914da498794086924de19f4ed1c280b6b0b793d15d5fb3ca27 SHA512 2289184a25deec342b9519028cc5ebb3a66137d7891366485e4b6a1ef52a4a28b5ba8083a317a56664d4ea6eb1bc0619477d1ca169baf79b868467fba27f82bf
 EBUILD Gtk3-0.38.0.ebuild 675 BLAKE2B f5a71b78b3dffb2d2734726bcd4248f09603722abcca939e60ede007c95368255096a4e47439c4da99d212a8dbe30b8e501cd5626a8130d1913ac1f617475a5f SHA512 cde095b6e37331412bf6d92ebb938d999d1cc986325d0747dd99fa68a174c68a854b20b366ad0f2be9f355e8ec71aabc8ea8823158b7a302f2dd36a6b34e1b77
 MISC metadata.xml 447 BLAKE2B e86451eb327d582b41d7f9bf2c0f07a4d3d043bf55b6b022c8e7164f200988f5afcd13bb6ddd696977e1c8d319e2fa1dc8bacc89fe1b1f7906fdfce18b004a32 SHA512 60e6df94c123f033be340a2ddcfdccfe49ef1dbadbc6027d783f12eba2cbc75e909fe6baeddbba891e86e873906f0ab531c5122757f83038a70c43dcf1293414
diff --git a/dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch b/dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch
deleted file mode 100644
index 48a725f1437a..000000000000
--- a/dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 88bc49e7a21da0131b10546aa07ebdf98d18a37e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= <kaffeetisch@gmx.de>
-Date: Sun, 6 Jan 2019 15:18:02 +0100
-Subject: [PATCH] Load GdkPixdata introspection data if gdk-pixbuf >= 2.38.0
-
-In gdk-pixbuf 2.38.0, the GdkPixdata introspection data was split out into its
-own file.
-
-Based on a patch by gregor herrmann <gregoa@debian.org>.
-
-https://rt.cpan.org/Ticket/Display.html?id=127071
----
- lib/Gtk3.pm                      | 14 ++++++++++++++
- perl-Gtk3.doap => perl-gtk3.doap |  0
- 2 files changed, 14 insertions(+)
- rename perl-Gtk3.doap => perl-gtk3.doap (100%)
-
-diff --git a/lib/Gtk3.pm b/lib/Gtk3.pm
-index 6a65487..f90af7e 100644
---- a/lib/Gtk3.pm
-+++ b/lib/Gtk3.pm
-@@ -60,6 +60,7 @@ and Perl packages:
-   Gtk-3.0       | Gtk3
-   Gdk-3.0       | Gtk3::Gdk
-   GdkPixbuf-2.0 | Gtk3::Gdk
-+  GdkPixdata-2.0| Gtk3::Gdk
-   Pango-1.0     | Pango
- 
- =cut
-@@ -84,6 +85,10 @@ my $_GDK_PIXBUF_BASENAME = 'GdkPixbuf';
- my $_GDK_PIXBUF_VERSION = '2.0';
- my $_GDK_PIXBUF_PACKAGE = 'Gtk3::Gdk';
- 
-+my $_GDK_PIXDATA_BASENAME = 'GdkPixdata';
-+my $_GDK_PIXDATA_VERSION = '2.0';
-+my $_GDK_PIXDATA_PACKAGE = 'Gtk3::Gdk';
-+
- my $_PANGO_BASENAME = 'Pango';
- my $_PANGO_VERSION = '1.0';
- my $_PANGO_PACKAGE = 'Pango';
-@@ -471,6 +476,15 @@ sub import {
-     package => $_GDK_PIXBUF_PACKAGE,
-     flatten_array_ref_return_for => \@_GDK_PIXBUF_FLATTEN_ARRAY_REF_RETURN_FOR);
- 
-+  # In gdk-pixbuf 2.38.0, the GdkPixdata introspection information was split
-+  # out into its own file.
-+  if (Gtk3::Gdk::Pixbuf::CHECK_VERSION (2, 38, 0)) {
-+    Glib::Object::Introspection->setup (
-+      basename => $_GDK_PIXDATA_BASENAME,
-+      version => $_GDK_PIXDATA_VERSION,
-+      package => $_GDK_PIXDATA_PACKAGE);
-+  }
-+
-   Glib::Object::Introspection->setup (
-     basename => $_PANGO_BASENAME,
-     version => $_PANGO_VERSION,
-diff --git a/perl-Gtk3.doap b/perl-gtk3.doap
-similarity index 100%
-rename from perl-Gtk3.doap
-rename to perl-gtk3.doap
--- 
-2.18.1
-
diff --git a/dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0.ebuild b/dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0-r1.ebuild
similarity index 77%
rename from dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0.ebuild
rename to dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0-r1.ebuild
index 8ef3b367ecc9..30f763cdf32e 100644
--- a/dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0.ebuild
+++ b/dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_VERSION=1.03
 DIST_AUTHOR=DRTECH
@@ -11,14 +11,12 @@ DESCRIPTION="XSS filter using HTML::Parser"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-perl/HTML-Parser-3.560.0
 	>=dev-perl/HTML-StripScripts-1.50.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( virtual/perl-Test-Simple )
 "
diff --git a/dev-perl/HTML-StripScripts-Parser/Manifest b/dev-perl/HTML-StripScripts-Parser/Manifest
index 69c14b6135d3..0f235bce5786 100644
--- a/dev-perl/HTML-StripScripts-Parser/Manifest
+++ b/dev-perl/HTML-StripScripts-Parser/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-StripScripts-Parser-1.03.tar.gz 9524 BLAKE2B 7a3f9b7edcddd604f1e23d746ac80187c60bfc74f1c36d7b84e9a59eb4f3aefe9e0df1f1c136c1c9ce2b54f7163afc3103dc43fa17868d434c8dd93eb1a4e399 SHA512 3bc766ff738623191b23c5212751cad32b76160bf5e3dcdfad5e161288c906deb1357fc092a962da87525b7364ba924de9ef68b94966c003ee7cb23e8035dc15
-EBUILD HTML-StripScripts-Parser-1.30.0.ebuild 459 BLAKE2B f89e49af65ee4f5be5449c17dd0f02846513788d06d2dab117660ed1fd5f9d7d470fae7c5bd0c52d4415b0c23d4d5efb92d18c8c4575d4aac5655ea9ab68a132 SHA512 343b6969d79fa1f6dedb50aaaea4d94455e0f997c87ec3294f48903cbe50d7a2a30de12baaa269f0e81c0a5de4804fc9bebc60e18b57d00c180292775b04a0e1
+EBUILD HTML-StripScripts-Parser-1.30.0-r1.ebuild 421 BLAKE2B ff220e088a87eb3fd3c8ef5110c4876b4d28ef5342a5ac50bd3f64f700686495112a9533bcc2d1954997d5586ec641e61ccf0e6b32dc6d6ba0e1288d3b7830d9 SHA512 5bfdb929c01e499ec34db8ab7b3854dcfdc451cdbc693fd21decbf1fd0ebfa53f6885948d4cd65b3dfeab746bafb882b13d32bd69d4e0750a9c4559cb520050c
 MISC metadata.xml 422 BLAKE2B d5fcbbca7a0c16e8acb37a642998010dd68215cf76ae557a1c22df63c2ec7372e7f30d055e64639b55b23204c50000563cf070b90ecb05ea05f4fd6a267ff631 SHA512 0c137cc9de19cef00c031605c1f24e90a0ab046c568a7b65f3dc579b33f2e5a7fd91e4dffc23677b9c7e58c8017abc816f14067e643d455468ba8c23b632cb16
diff --git a/dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0.ebuild b/dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0-r1.ebuild
similarity index 53%
rename from dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0.ebuild
rename to dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0-r1.ebuild
index a4f6b0ceb367..3bfa3ac67531 100644
--- a/dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0.ebuild
+++ b/dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_VERSION=1.06
 DIST_AUTHOR=DRTECH
@@ -11,12 +11,3 @@ DESCRIPTION="Strip scripting constructs out of HTML"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/HTML-StripScripts/Manifest b/dev-perl/HTML-StripScripts/Manifest
index 53563eecd7d2..f02f2c1e332c 100644
--- a/dev-perl/HTML-StripScripts/Manifest
+++ b/dev-perl/HTML-StripScripts/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-StripScripts-1.06.tar.gz 44745 BLAKE2B f239466e7d328113979b3676812aab4371d69e5a8d783a4cacec14ee2cee86058bef2e201105030315b7387a2e6a861d303c491066fb1750a469c5b45083005b SHA512 5d358997816653e32dba8916ac95967da345ec8c018ba7d21ef3bebca9bdda3131917b596dd25f51a3c63f85df7babfeab6133b46a7e15a0cd0409c055e2c589
-EBUILD HTML-StripScripts-1.60.0.ebuild 399 BLAKE2B 452f541cdce6acd4a87c7143972e5744f3aecdb04b35899c68ace419ed63583c50192fc79264306a6297a0fd210101b313d7b4c384d1623d18e4d5c47d95fb8d SHA512 092dbf7d2ddd06891206adfe44117755bd111a70042e29fa7ed47f134f8e795321bf61d5e5175e254b00281aabf096138f395b06321bb0202e6f4c5ba0feb592
+EBUILD HTML-StripScripts-1.60.0-r1.ebuild 257 BLAKE2B 8d3784fa94fff4209de1c973552b16a368e6212a6efd1a997ee06ff435995a6d8212f4e0ab677ba5ecb00579c027f8c09d1ef1d2b486de13c7cddce82dc68fc7 SHA512 3c9befc3c76cf2183e1346a131a84dd935463ebd26d38b801ca61efdfc289fb2396a68d908bd8464846a3c1ffd43c87de2916c2894126ce16e0ccb27e03c5e40
 MISC metadata.xml 407 BLAKE2B 56d695875dbba54b148f005761054962bdeceddde21390f3b0f668fb999365988358970ceec87742ae841b08106994e0662a0ae2a8f84333b3e5c1f92dc30a44 SHA512 6430c003f964db620c4f9b2716b006411ee991c76e287d7b8174e33ca1e0a4043e80fcb44c1916fb30c2e1035318cb132c4f3bcf4e2be40b2fcfa46fbf71f662
diff --git a/dev-perl/HTML-Table/HTML-Table-2.08a-r1.ebuild b/dev-perl/HTML-Table/HTML-Table-2.08a-r2.ebuild
similarity index 58%
rename from dev-perl/HTML-Table/HTML-Table-2.08a-r1.ebuild
rename to dev-perl/HTML-Table/HTML-Table-2.08a-r2.ebuild
index 8100d4c3b593..5eccfcd9aca0 100644
--- a/dev-perl/HTML-Table/HTML-Table-2.08a-r1.ebuild
+++ b/dev-perl/HTML-Table/HTML-Table-2.08a-r2.ebuild
@@ -1,16 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-MODULE_AUTHOR=AJPEACOCK
+DIST_AUTHOR=AJPEACOCK
 inherit perl-module
 
 DESCRIPTION="produces HTML tables"
 
-LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-Table/Manifest b/dev-perl/HTML-Table/Manifest
index 9afb85384994..884dfd695926 100644
--- a/dev-perl/HTML-Table/Manifest
+++ b/dev-perl/HTML-Table/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Table-2.08a.tar.gz 23934 BLAKE2B cf08002baafc2c83929b46ad1d6695b5bd42b18e6e413da16e1804f9885a9d60507afe04fab7403f0948aab01385cfb891892023a04edec12482feb32acddf46 SHA512 fe2e0a9777a45cc7b720b33694fd9aec6626a27720dedf57238c4166163ae6d35fd8f61a4321e6951c589269c28a3ba2677bdd1f849446bfadb2c90e6d052a36
-EBUILD HTML-Table-2.08a-r1.ebuild 306 BLAKE2B 6138f53d9b18754f69e2a1da8a2e8295837c64493731b6027097ebe4edbb30fbc59bdc4ef7d571e239860b84e30465d13f180c479442931816c52df377b27419 SHA512 cf18d9579689b1ec02b1dd25cb0712cc563ec9e328dd243f7b2d252185cbde7e0b9ab1d9e79289c82dae5f8547a6e596bde6e64368f093156ce5566662448133
+EBUILD HTML-Table-2.08a-r2.ebuild 246 BLAKE2B effc4b1b61fd3db3edbbf4040bccbcd10d2e2e16216cd6126e7e4ae360bb34599b1a94d58ef05fa9e8ba9fcc3f9a5b2b50916dfa1fa9fe8d63bbcc22901e6ea5 SHA512 8cfda21496c52594796a1ad2e0adc35362dbcc587ea4f176d53ff25cdc61d3d52280a85649b4d6b5cc35c063577728c02268ccd569eea0bacbba3b45c760cf14
 MISC metadata.xml 393 BLAKE2B 70a4d8b52cd807b31c515aa9b7f97d734698b17625b3b7de7cffca2dd38c94bbd03e68beeb78f1268ef0c9244e5c5c60e627f9d719049136223bf22b15c30557 SHA512 5e71160ef44d20e18f2012acc9a17d60d50ea00be1a17c7958b8fd981903e12788419b9e99537a697e26ed62d25eb173a0bf1ccb9180d667ae8f41e2efad5f15
diff --git a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.130.0.ebuild b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.130.0.ebuild
deleted file mode 100644
index 642f69822aaa..000000000000
--- a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.130.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SDRABBLE
-MODULE_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="Parse the content of tables in HTML"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="dev-perl/HTML-Parser"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
-PATCHES=( "${FILESDIR}"/0.13-test.patch )
diff --git a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.305.0.ebuild b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.305.0.ebuild
new file mode 100644
index 000000000000..f717feaa1540
--- /dev/null
+++ b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.305.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=WYANT
+DIST_VERSION=0.305
+inherit perl-module
+
+DESCRIPTION="Do interesting things with the contents of tables"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/HTML-Parser
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/HTML-TableContentParser/Manifest b/dev-perl/HTML-TableContentParser/Manifest
index 881500cb5b7b..8425cc2b18c3 100644
--- a/dev-perl/HTML-TableContentParser/Manifest
+++ b/dev-perl/HTML-TableContentParser/Manifest
@@ -1,6 +1,6 @@
 AUX 0.13-test.patch 2076 BLAKE2B 4b3e46ada5bc7e3a9c7f6b105bbf804083abcd4d3c1873ee894468bf2ac49aa089b78583c061c83a34d37149a165efc85db0a40ea5b537e1455763a58abc5cad SHA512 39037bc38e5bd95f710dbfe005b05f2a355fa075b3f6de3681e6fc812e18850f9ab727ec9012761c6167b35302462223f4d2543dce6135ba63320b0751600bf9
-DIST HTML-TableContentParser-0.13.tar.gz 4664 BLAKE2B 062dc7ac6a78ec75f7d306649710ef470c6b6f750f651cc976d9f44fa40fbf247a89e0847ed8a991cecd929f3ea328bbee69c2cb29627f6d4fb0e23d3a3ab5c5 SHA512 0707a0059a7d885052615ee7badecc8915d5f8c67fd8683a226e23a0690f1872519475c32f51f299333c3208c20ea15380624fd0ebd1dc0b11457febfb3db585
 DIST HTML-TableContentParser-0.304.tar.gz 18437 BLAKE2B 404ba11f9174cd3db019ede6078fca246722ff9ce1d2108cd689cfa3f79aebb178853143faa45022e5785daae5e79d1f21ad519099508c5554828d54da84e369 SHA512 f5b8aee24f777a7e8d6b4a88ac6b88927b6ec51a6b14ff2f48a33248702349f2f3a446bda3679b7c510cf6c9390b6a635721c696be3b49165dc9ca89116b2202
-EBUILD HTML-TableContentParser-0.130.0.ebuild 377 BLAKE2B b1b2a33a0751dc88124ce78bc75c603fcf91de3c21bbbdc74bc209d8a4d1db7cef3f19866fe893b74c7a44ad080923759065a17afbb53ac55e4132ffe9a0885b SHA512 c318fb523b0a654ea8ab89dcb2e9c36bba77365843f6d3b1479397dd9f3e0ec136a36483a3cdb26e2625919ce39fac273d0e674d336d101705e8fe2c41811b9f
+DIST HTML-TableContentParser-0.305.tar.gz 18931 BLAKE2B 616bfbb1809af1f0434fe3fb61082e635ba2cb62c1d14c47d059eb2c2dada80fa74ba577f85e9961036bf68f179ccc036410e2f3d67f497babbd3fe713bb6f2b SHA512 beee3b16e61b32e39bd7fdacbf993f18c1b11b6e0ba9704584243a629d72abed0012ee14518cd8c2490cb08a4c1323ee9b49ac2a764f37fa26c632a1d0ec2450
 EBUILD HTML-TableContentParser-0.304.0.ebuild 384 BLAKE2B 1cab7f626ee25f51b5f680c63e0dc34defba6d201315f58dedc86d579561b09fd89bb4a2aabc27753d31067e11f15ef2a1a71664382becbfee8ca19f3bf7b6b7 SHA512 f83be083b19e5197bda0fc74b961375a749f18de4f38093d9233992fffd969018a23870748fd413805434a114578306a1c8f7ddf72285a37d7c9be0125f163c4
+EBUILD HTML-TableContentParser-0.305.0.ebuild 377 BLAKE2B 32ec756b2b6847fb1dc898bbcf78a619d238280f06116aa0a7397727963c11a887cc326f94ac15e74da8f047816e8a4d26f236933d491110e5da5f719c0fcc44 SHA512 95e3ac2204cc4813b91c356224dd23ace9e66f82f4fe4e3c2165758f1134a70c4ab946bf769c6b4d88a8a979b8ac2c013c199d223cbbae89fdd949309327c2db
 MISC metadata.xml 535 BLAKE2B 13cdd17014d47497260675c128c0c7fc0ecbbbcef8743ea831d7df5d2db66556318dbf9c69a8bc674a017d6f2f1054cff9e4228447c9a853d2c6064cfb6ed65e SHA512 e21705171dee0812f3213417c721cb0ced4a0e8e0773c447dcff7f791096a4b883ec6ce273c68444980dc109c1f68a3b7aaf8d17dc61402ae57417ee86a150d1
diff --git a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0-r1.ebuild
similarity index 87%
rename from dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild
rename to dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0-r1.ebuild
index f5cca70f2a48..c4b1b8a6f23f 100644
--- a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild
+++ b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=MSISK
 DIST_VERSION=2.15
@@ -11,17 +11,17 @@ DESCRIPTION="The Perl Table-Extract Module"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 x86 ~x86-linux"
-IUSE=""
 
 RDEPEND="
 	>=dev-perl/HTML-Element-Extended-1.160.0
 	dev-perl/HTML-Parser
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
 
 mydoc="TODO"
+
 src_test() {
 	# https://rt.cpan.org/Ticket/Display.html?id=121920
 	perl_rm_files t/30_tree.t t/01_pod.t t/02_pod_coverage.t
diff --git a/dev-perl/HTML-TableExtract/Manifest b/dev-perl/HTML-TableExtract/Manifest
index b6b7e0ea8931..3fa5df260694 100644
--- a/dev-perl/HTML-TableExtract/Manifest
+++ b/dev-perl/HTML-TableExtract/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-TableExtract-2.15.tar.gz 36481 BLAKE2B 37562bcd8dc559b4a6dede3c3242e80726374e059841963d36c7ae83130444cadc9c080316bf5a830b12d7c6d9a01b2f27f75621afa0e0c063bf069be84e8ff8 SHA512 54fe445bd4bfc55d244ba6ba9888ea556b1a93b384be1f935ae3e93dc6d9e07167fa0fa07365d7fbc89e0a4924a40ea10fdc63d2ebf55f8d5f0d2ed90848a607
-EBUILD HTML-TableExtract-2.150.0.ebuild 581 BLAKE2B a49464257b693b84ddc3ae2540d2da98b468f4b2c826000eee77f87a05259922afad960afc860da0d7192ba7d57a633f12415387195b9756fb34e83e596923b4 SHA512 27068ebd0ec31ebb399ebd34fb0ad03982c1cf3644777df2adafc585a682470f4a7e088145b2a3eabb950185141b9223a1cfb95eac77f9d4c85e3374869b353d
+EBUILD HTML-TableExtract-2.150.0-r1.ebuild 575 BLAKE2B 017612d25b1a14e52929b4cab06b7ed068ff8cece76540cfa452d45716337ae12dc0935c2c978a294289d6274554739f1d28eaee6ba390c850ada3b783d096c4 SHA512 fb5b3ce6214889fb0722319fdc0f05f83033370ac99a214a0563fb2b8b91ebd49a726790543d9aff7ccb5ac61cf05adda53660fb4776f191f6619ea0f78a617c
 MISC metadata.xml 631 BLAKE2B 4544a38d4491ef354fcd63bcf67a4637de4530ce349205ed8d862f636fed4e2eeffdccfe2a513d4ccaad9a9327a9aadd9c414876c261a6cb0382e727346634d6 SHA512 73ad1a7440b00eca33ba693979fda0ba230047c221f317417483a08b1d8986fd20ff92da416792b6a4d6328976470e1904b09e15d8b5113e5d2c3825d4064b0c
diff --git a/dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild b/dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild
deleted file mode 100644
index 328fd43b5041..000000000000
--- a/dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DJERIUS
-DIST_VERSION=0.42
-inherit perl-module
-
-DESCRIPTION="Extract data from an HTML table"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/HTML-Parser-3.260.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	virtual/perl-CPAN-Meta
-	test? (
-		>=virtual/perl-Test-Simple-0.320.0
-	)
-"
diff --git a/dev-perl/HTML-TableParser/Manifest b/dev-perl/HTML-TableParser/Manifest
index 31706266bf0c..d941ae5c78b2 100644
--- a/dev-perl/HTML-TableParser/Manifest
+++ b/dev-perl/HTML-TableParser/Manifest
@@ -1,5 +1,3 @@
-DIST HTML-TableParser-0.42.tar.gz 73638 BLAKE2B d422069322eada6e72a6742b32418b3c99dda824ebe98c10211b0cf0c4bf7133c6c7fe990148969c8e18cb01c2f2792ebc13ebfc04f8b5032ab48c4febfa6992 SHA512 dddde421a186ebd354c06201fdaa1379378b83acfc86fb0ed9a7959a993dd403c6d40d9aa36e143d1236c9d21ec56c851d82867783e4954f0eeba75ea8400d3d
 DIST HTML-TableParser-0.43.tar.gz 66079 BLAKE2B 5309e8b09fdff9b85b8612e4122a5732b2b85bf8e9382ba8656605d0b7faf4bc88e267226e3c7c4565637e370fa9a8526354d38e4296fa7d359004614275a91c SHA512 1f4fa5d5d91c830b6b0e53f6353af4a6016c08aeb572a9ab9d22f21d694b62cace6e745f6af3f96160b885ac2cd788331f0beb0a8777964fb80ff561c227dbf8
-EBUILD HTML-TableParser-0.420.0.ebuild 494 BLAKE2B d84ed4bdeeda30c26e06a35789f118c64ce2c0031cc9780cb9a39439bdf1cc4a55d8d3aad02ac8eb68b2755997f0a50de6572916671ce1e3b11f4d05cd8d513d SHA512 6882a6ac9b4fdb9aff29208b58732bb3ec300386f9895026e404321e9217e21ea98af7e8818ea7b5bdcc63572199686e7eda66dfc7382cd665c0f28b9d8ae44b
 EBUILD HTML-TableParser-0.430.0.ebuild 508 BLAKE2B 504be2182aba8491f7ade95e37875b1ea283cd67f9806082ea8fc2afbe616db1b77c2044aa1fcb1c063acf81a0a2b60773d9642c1f671be08e88e01bf7bcad04 SHA512 8e8dafa3bb1ac7eb2e90f79c51bdb9f241efaa8bf3e15d3c9471bbb70c2bca764e7f7d5a76e715183c5cb3d0b47ff22e89284dbdb8114456b5d5215a00018ca7
 MISC metadata.xml 476 BLAKE2B 5c03da9dd21d5b093c059b438103fe16aa34ec07226c19c157525ad7b74ac885b2b86fbdad00bba073cafb57a276bb28ba3796c888b7c462909f149ca0df85f8 SHA512 599bd2fed0f4f25132859c20bb1e3a03c35c6d8e6dbd59d0f5b621fde8f410155c9e796f059f9b951f99da62a134a2b39d9c86fe27f3d880b0ce330d85b1b3d9
diff --git a/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r1.ebuild b/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r1.ebuild
deleted file mode 100644
index 4cc96417be10..000000000000
--- a/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SAMTREGAR
-MODULE_VERSION=0.07
-inherit perl-module
-
-DESCRIPTION="HTML::Template extension adding expression support"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/HTML-Template-2.8
-	dev-perl/Parse-RecDescent"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r2.ebuild b/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r2.ebuild
new file mode 100644
index 000000000000..efa6dc81724a
--- /dev/null
+++ b/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SAMTREGAR
+DIST_VERSION=0.07
+inherit perl-module
+
+DESCRIPTION="HTML::Template extension adding expression support"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=dev-perl/HTML-Template-2.800.0
+	dev-perl/Parse-RecDescent
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/HTML-Template-Expr/Manifest b/dev-perl/HTML-Template-Expr/Manifest
index e8f135617457..8d88736a0b12 100644
--- a/dev-perl/HTML-Template-Expr/Manifest
+++ b/dev-perl/HTML-Template-Expr/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Template-Expr-0.07.tar.gz 19540 BLAKE2B d3c9e44e4b10a4bd97bb59ea35cec459f31f49d487420e346cc3aee40ffe6bcf0a675d74e6821e81f3d2486c04f52a0ba17f942f6cbfa37b7be466df92fedcdd SHA512 965e684a19160d0ca78be94736583a1402666b422432655104ead87c4b9bac4486b97ffbf21ed1f21006feed3ebf25a8dc9e8d6a1e9e1919c6a6f2bcc49dd85c
-EBUILD HTML-Template-Expr-0.70.0-r1.ebuild 387 BLAKE2B c465bce1a609a5da1367ce9bfcf6718c1ad200ef29ef969311eba5c40f1ccfe7e46061dc4ffe599787cead5c00d15a7e94b4bbb9ef25b3ac78590c0e4c5a6a30 SHA512 a8b5f0bcde9c71da74d816661bba89cbea586dc788493eb7a72d032cb01659e3f544fc0902d41e4f4ea3723ddd509bc0c5f9d6398530cf5bd75e4a7743821fed
+EBUILD HTML-Template-Expr-0.70.0-r2.ebuild 366 BLAKE2B 3796d45ad9917bd90005e19f98267ad66ca57e0eff27700ef5772c921349e5c5a48b04d63c36f254d2c3a302ca4dfce8da5fd665a93db6d9ed26001150298004 SHA512 f935f0b8baf4d8c43faf5c8bdb51357866356e62cb3e1211f0654c406ac31612d393f7a2452d98a6ad655ebb8cd0a649e6efa75566afe61ea07294d4c8d2d280
 MISC metadata.xml 410 BLAKE2B 4ab116c7178d0847ee603b56562ea2a6e17ff7a68e5dabfd3d17ecf85d4309322b0fb8756727ed68ff81f5283b7acdbc42cbc5257ff2816da355b609c325158b SHA512 eb17f90795dcd35f1ce39884c34e76fb5aded01c18a5ca545bb3e3367d4562f112175ea5c42c0670e57a74cf63522fab26be854d61a7730d89f7e2e8c4ed58f8
diff --git a/dev-perl/HTML-Template/HTML-Template-2.970.0.ebuild b/dev-perl/HTML-Template/HTML-Template-2.970.0-r1.ebuild
similarity index 85%
rename from dev-perl/HTML-Template/HTML-Template-2.970.0.ebuild
rename to dev-perl/HTML-Template/HTML-Template-2.970.0-r1.ebuild
index 852ebfe53564..f4a4e3e6c232 100644
--- a/dev-perl/HTML-Template/HTML-Template-2.970.0.ebuild
+++ b/dev-perl/HTML-Template/HTML-Template-2.970.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=SAMTREGAR
 DIST_VERSION=2.97
@@ -12,8 +12,6 @@ DESCRIPTION="A Perl module to use HTML Templates"
 
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Carp
@@ -21,7 +19,7 @@ RDEPEND="
 	>=virtual/perl-File-Spec-0.820.0
 	virtual/perl-Scalar-List-Utils
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		dev-perl/CGI
@@ -29,6 +27,7 @@ DEPEND="${RDEPEND}
 		virtual/perl-Test-Simple
 	)
 "
+
 src_test() {
 	perl_rm_files t/author-*.t
 	perl-module_src_test
diff --git a/dev-perl/HTML-Template/Manifest b/dev-perl/HTML-Template/Manifest
index 3c438ee0debe..8366e5e53fbc 100644
--- a/dev-perl/HTML-Template/Manifest
+++ b/dev-perl/HTML-Template/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Template-2.97.tar.gz 88236 BLAKE2B 266b6d7988e04f4e2c0392c364245944cffbc5816d6038020dd1d9d56d5ebfbf6ce26d286ae6e09b17725faefc3409cadb4c562a5125fb753d59992895d98ded SHA512 e1cb68db24db1692c0fb3838739798e5716340e3e78260ee95614af5bf29ee100cc86bbd15a2dda3bb98c7f2ecdf0e3ff8ca7775171a44d9ed347d7f9c850783
-EBUILD HTML-Template-2.970.0.ebuild 706 BLAKE2B 5b539598aeb6aee352375b1134e13b70f405a5fc08fcbeed433004523509f5e8777fdfc579d07f95786cb8543cd6ce7281cb653b7eae7e892077dc2ea9494412 SHA512 8893bb021d31988dc674666083cfc1120f0d00f6ab5717cdc4224db853a879b5b09ef71a9cfd155c2fdc4434fccaf5fddb131479d49b43e60001f5968c142480
+EBUILD HTML-Template-2.970.0-r1.ebuild 669 BLAKE2B edfdeccf8213e7e067b50252a17d000e8c5c0ea6ed08eb38fd47104aa649535cddf1d15e79af68486977ad3becab38897256e17df1cd2753589f2b6cefea5b5b SHA512 efa4d976d4b5cc16b37a83d3bb5047f4db9fd272d2e7af1ef8e751ed6cb2c0af34811f9d57e74b9f3a4a14ef456b5d0ccaf07201ce4265bd00acc43013a03c33
 MISC metadata.xml 1084 BLAKE2B 36072b0cb89900805959824befdeb1790cc92e50c06db354fb09f5ffd8fde88dcd85659802a46aff0bd8ebecdf22c32faa8a71ca49fc6b73aaf2cf597e8c8220 SHA512 284ab385d4b93bded1afbc4535c5838c5bf740376dca62eb54e747dfeebd5b65b1275afcf365f301bd07f1794a7a98bd45334b13a7652f33371d78716c3c0ca9
diff --git a/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild b/dev-perl/HTML-Tree/HTML-Tree-5.70.0-r1.ebuild
similarity index 92%
rename from dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
rename to dev-perl/HTML-Tree/HTML-Tree-5.70.0-r1.ebuild
index 3edd78285834..b260098ec75c 100644
--- a/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
+++ b/dev-perl/HTML-Tree/HTML-Tree-5.70.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=KENTNL
 DIST_VERSION=5.07
@@ -11,8 +11,6 @@ DESCRIPTION="A library to manage HTML-Tree in PERL"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Carp
@@ -22,7 +20,7 @@ RDEPEND="
 	virtual/perl-Scalar-List-Utils
 "
 #	dev-perl/HTML-Format
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.280.800
 	test? (
 		virtual/perl-Encode
diff --git a/dev-perl/HTML-Tree/Manifest b/dev-perl/HTML-Tree/Manifest
index 631fb8c30691..0e7cf6166276 100644
--- a/dev-perl/HTML-Tree/Manifest
+++ b/dev-perl/HTML-Tree/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Tree-5.07.tar.gz 150477 BLAKE2B ff1cee33e144e8b27b71e26c3fdf4e07b70642533167b8a59feb17729c34c58066f7a5a742de43c879f0101a2adc1302aa84583b536f0e2fa4097f7d240d444e SHA512 a1faaf547d7db323388d5f6b289ab96887de5a80add55aefd380e4b540948514550a86785bdccf0776dfff38085b6bd3e98228f96231264217adcfc2f132c5de
-EBUILD HTML-Tree-5.70.0.ebuild 820 BLAKE2B d6e11c1ae30c7cb37adb35d93ae4694d283d86042873efbf7c86e87cc9d0a86e771e27503d1662be46b514a534a8dbc580ea7f92ef17d1540a1cff6e19770c8e SHA512 3ed40c8a193f961c0e4ac1b975cbeae57ac1deffdad6b03c1bcfbfe42da5ac1cc7b9b98633f14b12c9e74e5b0d5a9c85624a58a8bd4005f8afe1025e08a9921b
+EBUILD HTML-Tree-5.70.0-r1.ebuild 782 BLAKE2B 8bddce0aaff8b787f392773b0ea3736ef14cf216d89613e60b0d06b9bce0a650b70b6c541f1e843fd6b1ba77c80561aa9c57889825bba670ce598928e4ca1be3 SHA512 f85db5584d1d53bb60424993ceb6387564b965bb37c459bfd884fd24b0eead10ced9973c5d9822a7f199dde9ba0078e547a6f3330f2a3ec662d0442bc4d83c04
 MISC metadata.xml 702 BLAKE2B 98efc20c2116006dfade0ec668042f4a78f4f11aeb3309fd9e2bfcc95202871c06cb43fb6f9c2d1e247ca117ecb787d1e6c7da1376fc84ede8dbc822ad909031 SHA512 79010169b3782e344aa0e7989ca8dc33a3ff90d84f8cbd092c1ed6ccfcdcd670ac8f25b6ecdea7e7ee55634fed2158eac9ab98d236dd736e55849aded3e94151
diff --git a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.140.0.ebuild b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.350.0.ebuild
similarity index 53%
rename from dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.140.0.ebuild
rename to dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.350.0.ebuild
index a9a648487707..39c1cb43bfec 100644
--- a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.140.0.ebuild
+++ b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.350.0.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=OALDERS
-DIST_VERSION=3.14
+DIST_VERSION=3.35
 inherit perl-module
 
 DESCRIPTION="Determine Web browser, version, and platform from an HTTP user agent string"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
 
 RDEPEND=""
-DEPEND="
-	>=dev-perl/Module-Build-0.280.0
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
-		virtual/perl-JSON-PP
+		virtual/perl-File-Spec
+		dev-perl/Hash-Merge
+		>=virtual/perl-JSON-PP-4.40.0
+		>=virtual/perl-Scalar-List-Utils-1.490.0
 		dev-perl/Path-Tiny
-		dev-perl/Test-FailWarnings
-		virtual/perl-Test-Simple
-		dev-perl/Test-Most
+		dev-perl/Test-Differences
+		>=virtual/perl-Test-Simple-0.960.0
 		dev-perl/Test-NoWarnings
+		dev-perl/Test-Warnings
 	)
 "
+
 src_test() {
 	perl_rm_files t/release-*.t
 	perl-module_src_test
diff --git a/dev-perl/HTTP-BrowserDetect/Manifest b/dev-perl/HTTP-BrowserDetect/Manifest
index 7696915cf430..bffa38348156 100644
--- a/dev-perl/HTTP-BrowserDetect/Manifest
+++ b/dev-perl/HTTP-BrowserDetect/Manifest
@@ -1,5 +1,5 @@
-DIST HTTP-BrowserDetect-3.14.tar.gz 95445 BLAKE2B 08a90c6e1154f7a7e1c55af2c056e67ba906d187f3ac8b4e82f1039446462ea9a60f1f875e5f26a2229275436c0deb5acbf090f893aef51f7971ae8e0e547c62 SHA512 cf05af60dbda462df81a9d38d5738826b820534c5fde52f41a290f6d3253783154a2e460042117be32e86dd95f7f1e0e6055b4ca549cb7972cd3c156200c09df
 DIST HTTP-BrowserDetect-3.31.tar.gz 121365 BLAKE2B 454f702905b269cf579bf6d192542cb8e4d63430b7107c78b505db65973c759f79f78053cc45e14b8f7c152f4c53fd18b728f04c0a5d8e86393b1c2bcc4c6b9f SHA512 9ea830b244be7b5d0707118f27a212c520a2117679fab75192881c04d244cc50ae71ee6de2d2be7c456c2a0d5f2bfd0c9bf473893a86ba5b13db89a7d4943e8b
-EBUILD HTTP-BrowserDetect-3.140.0.ebuild 663 BLAKE2B c1ffd7489a32e5da4a38c96b23d4b34cc961e91ef95f15cde0b60b9cd5fe9c443504f35fcda68ab6d87e68aed45065b32e6c1fbc26c19bbbcb18e30dbb2cbd0f SHA512 da3c8f4e87a24d965888dac27736f940b6b85ca72e0fcc1993169c9957b38ec9fe4081109148470b433cdf76998fd98c91949ad3aec9726e42e0942d425d4b9b
+DIST HTTP-BrowserDetect-3.35.tar.gz 122366 BLAKE2B 997962c232419cdbf3ca8a1675e50cbb18190e6f5013156a2da9de47ab939dec81c086a300cca62bd6854a5e9f439ec79a20c5f7fb35ef66f26d57cf68fea928 SHA512 adf2239bffcafc9ae250307173cc3900fca55a4b8860aaefab93090853e5a307902d15cdee459d28c444c4c096f511d1e3f65df51e2f77cee045cbe4a5fc9963
 EBUILD HTTP-BrowserDetect-3.310.0.ebuild 664 BLAKE2B b101d097b772cd857e10085eafd94e8e05906bfb24c5d427f031cc58f0cee5f16af64a20434c726dc960463bb39a99c0dcc2191807588b7907b858e9be6469ac SHA512 b6bf2d714ee37dbcdf531a645945f002e3ea95b31d0ce3a366966845152e7f37cd5f38ea2dc2814d415c40152cefdb86f01fa5f430c0f469041798467863de32
+EBUILD HTTP-BrowserDetect-3.350.0.ebuild 718 BLAKE2B 5b8e860614d00316618aa1a879d4731660e4cedb4f2da3e958036a20ad37b0f31e89e1a06bd9b9d4ac61b5c8d25cbdeac880c4184a5520e4d36bd3cffe0399ea SHA512 7511041ee4d67e4112f087bafd51f63482f8a3304ab0ab697b1c043abac0a309ad5f1d775900af6dd74cdf450c1379476ac11850030f5f1b6da34b75451a6dc6
 MISC metadata.xml 409 BLAKE2B bda1e92d5004df838bb2ad091ae6d2018f183585c3f1ffefc7352a17585ab4a5dab5527c30f258623b4b0a8d7fda031fb5dd6744e0f3d9e24f1e2c87f64ec6b3 SHA512 35ce77d7fb39f33dd8fdfab6e2f9d2e1c8a7e50d9952a2e8df18521fa043cb333aeff72bf4329d985e0465947e88dce05c3def0ae3e52ca57d52b91f1f601d16
diff --git a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0-r1.ebuild
similarity index 80%
rename from dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
rename to dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0-r1.ebuild
index 64f3bc62d1f5..e725afec1564 100644
--- a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
+++ b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=MATTIASH
 DIST_VERSION=1.4
@@ -12,17 +12,18 @@ DESCRIPTION="Cache the result of http get-requests persistently"
 
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="dev-perl/libwww-perl
+RDEPEND="
+	dev-perl/libwww-perl
 	virtual/perl-Digest-MD5
-	virtual/perl-Storable"
-DEPEND="${RDEPEND}
+	virtual/perl-Storable
+"
+BDEPEND="${RDEPEND}
 	test? (
 		dev-perl/Test-RequiresInternet
 		virtual/perl-Test-Simple
-	)"
+	)
+"
 
 src_test() {
 	perl_rm_files t/pod.t t/pod-coverage.t
diff --git a/dev-perl/HTTP-Cache-Transparent/Manifest b/dev-perl/HTTP-Cache-Transparent/Manifest
index 917c23d25d23..242fee13960a 100644
--- a/dev-perl/HTTP-Cache-Transparent/Manifest
+++ b/dev-perl/HTTP-Cache-Transparent/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Cache-Transparent-1.4.tar.gz 10289 BLAKE2B ccbd8a232cb5ff9ef8354d9613a98546efe4e6bacd5c77b9e36affd3ee8e04dd1f5ffae979e9737cf03f3cdb077158683ca7a310cdb06ac019c661595d7a4b18 SHA512 bd48290de4aeffe64cc4748d2f4b054abef539770dd8679f88fd24d9478819c31d7201918335404ea5ed0251d4c4f7d19926ccdeb6b4da2cecf251d2618589a4
-EBUILD HTTP-Cache-Transparent-1.400.0.ebuild 636 BLAKE2B 96a209668afed946e055d6189bdb8f82f3705f81d30d2d54797fde0975a6f3c98fade752b94a30931c1bdc7db97688d8ac5d9d1e02612607e72178dc37c77477 SHA512 2522d926cf6692309c291f23a71fe820119a4b6267c152b65d30535e742c9b13d3dd19b47f9ca964c2854d03192ac56a30ce8e3383707b1591ee344e48671ff2
+EBUILD HTTP-Cache-Transparent-1.400.0-r1.ebuild 602 BLAKE2B 5844564b6049106d8edb7c7595e00303b3a36d42464a76ab49f1e872569236decc821bd60a3561c0516985f2c2e1b3bdf8aa1c1541214fdb304a243844308149 SHA512 fbd659e0eff8792702d41bad009d958996f761619cfcf3dd1a962a5b15534f32fb4bce0a1f190afeaa39a736ac16b8b8ad868155c6a47bea9bcb5e1c9b82f879
 MISC metadata.xml 418 BLAKE2B eca216ff35c08d6d7e0908dc9b42aed104d16542e399f0f55d14dff39751d5f90ae6057ebc3617942165686eaede5bc8e47b7cd269ab6d0ea1abdc7233c5c29f SHA512 0b7046cdddc54ef135ce71eb2e05759c47a866ba1d1c7d557b2bb569b64b2da17fc4e2b29381c319f3e0b3dd5ce72f13f4e564dd67dd932005b242d77bb24e05
diff --git a/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.8.0.ebuild b/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.12.0.ebuild
similarity index 82%
rename from dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.8.0.ebuild
rename to dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.12.0.ebuild
index ec1518bb120b..a7b630431d11 100644
--- a/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.8.0.ebuild
+++ b/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.12.0.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=DAGOLDEN
-DIST_VERSION=0.008
+DIST_VERSION=0.012
 inherit perl-module
 
 DESCRIPTION="A minimalist HTTP user agent cookie jar"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
+IUSE="minimal"
 
 RDEPEND="
 	!minimal? ( dev-perl/Mozilla-PublicSuffix )
@@ -20,7 +19,7 @@ RDEPEND="
 	>=virtual/perl-Time-Local-1.190.100
 	virtual/perl-parent
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
 	test? (
 		!minimal? (
diff --git a/dev-perl/HTTP-CookieJar/Manifest b/dev-perl/HTTP-CookieJar/Manifest
index 20e2e930345d..ca92d0c17f8e 100644
--- a/dev-perl/HTTP-CookieJar/Manifest
+++ b/dev-perl/HTTP-CookieJar/Manifest
@@ -1,5 +1,5 @@
-DIST HTTP-CookieJar-0.008.tar.gz 28754 BLAKE2B 7e0b55506cb6c48fa8eb608224e7848c150addf64a39fa8c6abca5396152695b835cc872efff862e6045ca246bb2a9fb2a23830711d8c5d349de1a340546e4c1 SHA512 6e85c22084ba2959b385f4cd706b2b937fcdb68f219ee03ccdd69dd2a01ff34b72bf7f442e414e3da43199fc43624b781af0c7599f856dc580a5d0a7742c6aff
 DIST HTTP-CookieJar-0.010.tar.gz 27883 BLAKE2B 3f0bf8fcff066955d1350a420a02fb8388238addc9877fee36e6073d04d4382cb34889b0fc851c13da10c020647be64248399fd35309c0346f6995178b651c19 SHA512 5e7d6222b9128441c506f1554de327af9695cb07bb6db9a772386752a6815b7e8ff1d02185429f9cd25a11085860867d42f6e209175c68cbeb9daa6547d83eac
+DIST HTTP-CookieJar-0.012.tar.gz 28223 BLAKE2B 67284519bf19271896625ec577121171d6bb559a7c011f2a8f1e92be537077d1ec5bbd5f4ad043e44c754d5b2a3f2b617e37a87bfef3026533fd442fd9275613 SHA512 3b4b0cd2228d53dfa9c1a75cf108f9b2a328c3bf054f0c7d8308bc0a71375340684b165ab05cb7868cdbeb232e4ceb4b465177a43c7573863e9274f8aa4034af
 EBUILD HTTP-CookieJar-0.10.0.ebuild 831 BLAKE2B 4a73ade9a0b0958ddebe1ee53d2fb9e9364e9e06fce0774d3e6002aa6dbaaf8bf9758edb9b379eb2a45739fb4013dcd8f40264f48ff193edd17345252ccd45cf SHA512 76e289cf04766ce28a48185f93eb3622f128ea1daa23f66559debc679c292e314882ff7ff8ad6a98c34643f55a5eabaab28b55bf063a3f296d1daa93018442e0
-EBUILD HTTP-CookieJar-0.8.0.ebuild 743 BLAKE2B 65a7fe8c6a74580a39fb4007dd5564c57c58c1c6319494a062aab6a63865cbe2078e992f77be6888ace886297e2df71701414d56972dc5688f158c6c57c1a613 SHA512 39c3b9b6d380f9820c1974f925b55819c2ca6767b9fa64a8dc7d2a31db6bdc44d7136ff7352db2e7cb8e3b8e27e57e310430798d4827f9efdf22847416c42aeb
+EBUILD HTTP-CookieJar-0.12.0.ebuild 712 BLAKE2B a6922c9ba5b767b63c32a3daf09749b26efc0e5dc5536bba4d6dabebf81c0bfc4e232047294a33609431b3337e162b5358d93d6d402b7e3da364486f5b552479 SHA512 108055a1a3f715949031c7169dbdafd1a8adee1ad3e308fd2ed368c6fcc512e5d06c6771432dbb024700d1e1d08bd4718ff7ce8e104501ff8818fd467d32906f
 MISC metadata.xml 468 BLAKE2B b2e2c0b06433b5ea89a63c1a64627e081229cd1f108a1bb335b4f7013935aac05772bfc396be234bc30c9bdf3f99b65c5f8a5583318f08f67e456cf8b404696e SHA512 b012ddf554fff7a6da7391ee3472c87246c0a23bdf63d5e949118168f0ca782a3fe5704802a4cd20b455973e4ddbb528699725c30b0862b321eaef9e8b0a41c8
diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild
deleted file mode 100644
index a90f99537465..000000000000
--- a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=OALDERS
-DIST_VERSION=6.04
-inherit perl-module
-
-DESCRIPTION="Storage of cookies"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-perl/libwww-perl-6
-	virtual/perl-Carp
-	>=dev-perl/HTTP-Date-6.0.0
-	virtual/perl-Time-Local
-	>=dev-perl/HTTP-Message-6.0.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test
-		virtual/perl-Test-Simple
-		dev-perl/URI
-	)
-"
diff --git a/dev-perl/HTTP-Cookies/Manifest b/dev-perl/HTTP-Cookies/Manifest
index 7d36dd6ff5bd..2192393908cc 100644
--- a/dev-perl/HTTP-Cookies/Manifest
+++ b/dev-perl/HTTP-Cookies/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-Cookies-6.04.tar.gz 39502 BLAKE2B a6a5de4a992ee246dd0e04594fe47ce635248d7fb004acdd4eb926a84c27a7b69f0b8d5a522460287f1786f3d3f9d8bfd23c933ab7650e8cfaffaf392eecb94e SHA512 e8b24b96e6630f1238e828edfbf7074fb9186a391fd1d129fb65a82748a4cf7d71669fa658c31957560a6faac3e638c8dc7aa3182acaa6fd14f0d56f3968f5e4
 DIST HTTP-Cookies-6.10.tar.gz 42448 BLAKE2B ce261bde7071f34811827099322a0c7282c4f2287ce4baca258d8237dc82ffa5502acbe9ca2a4b76ebe6d8bd0c1facdad5448f1f377390e46c2f4564550bf57e SHA512 c24a986e524ebf5d8b13b4580c3ee6aed018e79c203fd62208bfe970744482832fe9c41bb3195a596af1e11058053ed7615a09a26fbcef4433e270f0f5d38658
 EBUILD HTTP-Cookies-6.100.0.ebuild 719 BLAKE2B ce9c047a5d39a232b9fbb15820bf8075c602cea4b3b399706d97373a60e6b07a581122e79a74b851368c47b34e8efbb4083fc7d0f40738b2ae4f62014f83a436 SHA512 ae249509c74b73aea495cd107e3e432e397c3d05e8a8baa284bdad822900c3359dbc463f73d0aa1039a761e1e0d722719f37463073906fa8c3f285019782b7b8
-EBUILD HTTP-Cookies-6.40.0.ebuild 718 BLAKE2B 220362b746587ae543c10a9f97e33f9042e0047a3c7fe65723701b6d4bbbeb6f7c9c68193b57fd2bfe85f2b67fff36e1728cc20bb6bd45601195958cbd062691 SHA512 d116eaec72e5d0e002d63ef52cf1ab09258a98c8be1cfcb32615ebff4c534bf7e180d91fb1a82ee4afe3ff5ccf032204c2803b54ae71dd631de122aa52be0910
 MISC metadata.xml 538 BLAKE2B 00d8bd5654ccf373c841f1aba00b24f8daea430563678c11d05240da7a490c0fb5143b4a3d2b7084f175d2463ded0ec439131f169b81e177fb893eb94e0a93af SHA512 db97715e85fbc77d77e1e467ff045b5de7fb77b47d3d00ac507068358eb9a1d2da35ce1591f0696d081fbe1ab27a29a11f93c80c58e518fb410cb07cfb9fd67a
diff --git a/dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild b/dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild
deleted file mode 100644
index 111c7c54b13e..000000000000
--- a/dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.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
-
-MODULE_AUTHOR=COSIMO
-MODULE_VERSION=0.48
-inherit perl-module
-
-DESCRIPTION="A WebDAV client library for Perl5"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/libwww-perl
-	dev-perl/URI
-	dev-perl/XML-DOM
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTTP-DAV/Manifest b/dev-perl/HTTP-DAV/Manifest
index aca78044cf11..6949120d06d5 100644
--- a/dev-perl/HTTP-DAV/Manifest
+++ b/dev-perl/HTTP-DAV/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-DAV-0.48.tar.gz 105090 BLAKE2B e0a88e186ae26d3240783aeed91b3da786b1ad21e31f9293c361147c540bd513cfd1f570b9dabc77301c5310ca65128c1574cc342bd5512fcf7e6340c97eabf2 SHA512 2edf92791660b1996eb22b9ea68bd4e417c497afeebb56cb0a2ecf0cf72ea54b6fb8efd4d69dae1dcb946517f917593932a8040bd0ef5cfc83f7fdfd1fe3ccf8
 DIST HTTP-DAV-0.49.tar.gz 107841 BLAKE2B 202a37766a949441417e6e88de02dcb238f811408f16cc86ebb5187f0cd0c8b780e322b3704dbc115225232c1d815cbe9d5fdb8ac7755e222c7eac5357ea0a81 SHA512 01a097f47d95090fd0fd08a44b440d0ed4f2f04e0bedc41f8e2abedf1879e7cfcae6cf5cf7a415ac89dc610cf0cacf4f75078586bbf6a818f8c6dd36ccb451f6
-EBUILD HTTP-DAV-0.480.0.ebuild 372 BLAKE2B 4cb11d906a11e262f2c695a2b1540f018e69e13299917110ba91d0da4455f86a88aae3692fefb85c0ebca3876463d2c496b1c58399bf10274548b8d44ae2556b SHA512 dfafb88a030a4f8ad85e4d187ca1da707c37d37e59a4951f86cd90d420bc91ead8c24356dbf668032849f02df08d77016333aabe718c7893c7d2c68c8561d6a3
 EBUILD HTTP-DAV-0.490.0.ebuild 435 BLAKE2B 2796ef0d74a14e500498c375e3003f364c4737dd85a36b998ee64ae9fe8d87897f4e1f0383b559899f91acaf2b9bf1848317cc3875c7e90875872dd95289033a SHA512 3d14a8e1f2c3d71b57331acd1d9f91c00b787f21e861cfa5c88583a82ed5fb352633a490d1d379d880c0dca76795f27282ef525ba57d8c2adb257a317c18d577
 MISC metadata.xml 911 BLAKE2B 6702010d6814956b0c6749f56f37d6d0252d2ed6ef45117d89f80eeda2ba8cc6623b84bb7d3b082e2ea7c83169a080b8fad47b5fc84ec675cb303ee867f0e371 SHA512 f5970d806f19eeee3ae089e701e2a7f6284e590161a761347770874dfe30ddd70165b0d5b7903abfc3e28602a7d5bb94a8c94fcb5cd1613a3b525e895b701af7
diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
deleted file mode 100644
index 36e0fc57d1b0..000000000000
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=OALDERS
-DIST_VERSION=6.06
-inherit perl-module
-
-DESCRIPTION="Base class for simple HTTP servers"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-perl/libwww-perl-6
-	virtual/perl-Carp
-	>=dev-perl/HTTP-Date-6.0.0
-	>=dev-perl/HTTP-Message-6.0.0
-	virtual/perl-IO-Socket-IP
-	>=dev-perl/LWP-MediaTypes-6.0.0
-	virtual/perl-Socket
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/Module-Build-Tiny-0.34.0
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-Module-Metadata
-		virtual/perl-Test-Simple
-		dev-perl/Test-Needs
-		dev-perl/URI
-	)
-"
diff --git a/dev-perl/HTTP-Daemon/Manifest b/dev-perl/HTTP-Daemon/Manifest
index 5a3f518baacd..a0f80036ec3e 100644
--- a/dev-perl/HTTP-Daemon/Manifest
+++ b/dev-perl/HTTP-Daemon/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-Daemon-6.06.tar.gz 45576 BLAKE2B 3f5a5eaf8fd89422cad916cbe384ac45989147510d171d9496937e732fe83c8c5a5514d03c468415358a575326aa86fc78d8a135b8c7602560923511268fca67 SHA512 8e6dcf4451aaa6bd5f38508a087e5bb9b7f5105e8e243d09bdd3f4be3d7009222b3d9f8e494f049b48f0caebf36f239b8bbc7b8edc805f7d32b1bbeb38431732
 DIST HTTP-Daemon-6.12.tar.gz 47117 BLAKE2B 54b494ff3976af427c899b2db6f7b4dad27fbf441e4b821c5185537f6661e5e10cd6a52f2faf07ef5843dbbfe86b8c8c86abe478663553d16e9b1b4a19dd791d SHA512 83a8b868162dfa1be66d4267e99af1111d28122c793e89d905243c175617c22ceb66f88b6ea54c29e7b131c26668776ab24cf671c4cc6c1c8810505e0f072596
 EBUILD HTTP-Daemon-6.120.0.ebuild 952 BLAKE2B 90711d533c21ab5249ae7229ac9df359fd3e2fb9f4210f9f037b8ecba43f8b256a46b0c59ef419afdba4260bb03dd9259824142664b9acbc6fe83f4617bc5406 SHA512 dd21be4508923bfaa781ffd931b3fc3d4515f7696d69bc07d3613834661bb0340d0fa3cd3924b6f2efc0c8991e42be2e105256b0497e2d42d5934d6ba447f18f
-EBUILD HTTP-Daemon-6.60.0.ebuild 897 BLAKE2B 8bcb7960c7e8a138a6d13cb91a08fa7897ba4c34f099565ee591265450828c09a207b009b0b7d816ad7cc3d16c85a523ccadacd540be53e8883b6b3a6966dfcf SHA512 d8b1e4765d2a545a53c8f931be914617d447b2e4ff3b14d6d925032c77db5cc17d8c73a241677e00c12b95ec88afaa6e11d481c987bd76dfe3fe8adf47d82e9e
 MISC metadata.xml 452 BLAKE2B 1b10326b32fb64392656299369c668b30d9ab252d92dbd7a6a3c07253af72d1be090cc3d90c629d19e7e3236995a4963316068137d56969a5b1fd3150e138824 SHA512 e4ec899dd68c1111d6fe25a701fc727fd65dd260d9f0ab6074360a5ae1e93cccd5dd8ff18af8434001845181707aea4a43fae4cf83c36399400d5664dacdef23
diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild
deleted file mode 100644
index 4fe24de8401d..000000000000
--- a/dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=GAAS
-MODULE_VERSION=6.02
-inherit perl-module
-
-DESCRIPTION="Date conversion for HTTP date formats"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	!<dev-perl/libwww-perl-6
-	virtual/perl-Time-Local
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/HTTP-Date/Manifest b/dev-perl/HTTP-Date/Manifest
index 2dd99849db80..a25e1a7761f1 100644
--- a/dev-perl/HTTP-Date/Manifest
+++ b/dev-perl/HTTP-Date/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-Date-6.02.tar.gz 7319 BLAKE2B c56c349c612d88b90324ec2379beadcd0238e448f83fb2bed7f758dc4fb3d234d4f4cf203c86f3260692ae7db1e1deaf22152c6d7fa9d34a2c835425d0d06d32 SHA512 056d2ff01482922a644757f04cb924d60fa15b86873fdea02e65c78c8af2bbf3f184495852b579eb4fc86bc44f8a5a52f785ab800cc554431ed3e2767e858232
 DIST HTTP-Date-6.05.tar.gz 29673 BLAKE2B 680af1a4ea45160c15a5d086275b5157a091c7816bf5def67c413690c97756946e24d436c50d664e2f8809cd4ac8054e24466d2ef4127b4b09bc681d6b19a404 SHA512 08a427a860161cd0d7a34a4fa3eb6bf6439c2504478a308ff560de0e6620c20df46f004cfcb719e3d19e35fdb650728d6983ffce1423f4d9da06f91d85c7b927
-EBUILD HTTP-Date-6.20.0-r1.ebuild 546 BLAKE2B fa4a1217d43a75679887bbb2071fb3ad04aedc6d02adbaf9ab2f5662f28fdc29379d189d90ea89d49201abe8584faa744db811fbe4ecb3a97a0184dedcdbb705 SHA512 2ad1cc782b4469e711c893b5de98437c3ca3938de445fddbf98e31a2e06f275be13fbc4e61179e11b10e4b9637b33346f85a59bf95b21a51ed4a6db410830803
 EBUILD HTTP-Date-6.50.0.ebuild 611 BLAKE2B 6b39afbcce757a842bb783ed82787c3f4501949667a625a611e89afe8c3752e8d0a1376cd2a53ed6c6a1482ae839ec3aec3698b6fc4cab531f9fb404a5f40960 SHA512 bf404763b8936fa1074828d3ce2215d4b48455489024cab4a0dccae057b2d974b25077c7a837aa8a80e358c932e648542c6febf62e24677dcef0adfb64eeb7d1
 MISC metadata.xml 379 BLAKE2B 2c0f0627932dee277c0ad0564dcbd8a0819a3a846d6f024d92a5971f2f226f377900cd984fea97ddfb917de2a17f3666b9ed20a902b7d3ba19329e9ae38dde26 SHA512 cde3ed4300f0f1d3d9e0350671655ac8b55c270accf79faa9688b4ce1713874fda2846a9f91d527f73b467f9a03020c08453b27e836fe0f68b9998a0639eb74b
diff --git a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.200.0.ebuild b/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.200.0.ebuild
deleted file mode 100644
index 6c3d42870e60..000000000000
--- a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.200.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=KAZEBURO
-DIST_VERSION=0.20
-DIST_EXAMPLES=( "eg/*" )
-inherit perl-module
-
-DESCRIPTION="PSGI compliant HTTP Entity Parser"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test +xs"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Encode
-	virtual/perl-File-Temp
-	dev-perl/HTTP-MultiPartParser
-	dev-perl/Hash-MultiValue
-	>=dev-perl/JSON-MaybeXS-1.3.7
-	virtual/perl-Module-Load
-	dev-perl/Stream-Buffered
-	>=dev-perl/WWW-Form-UrlEncoded-0.230.0
-	xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 )
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.35.0
-	test? (
-		virtual/perl-File-Spec
-		>=dev-perl/HTTP-Message-6
-		>=virtual/perl-Test-Simple-0.980.0
-	)
-"
diff --git a/dev-perl/HTTP-Entity-Parser/Manifest b/dev-perl/HTTP-Entity-Parser/Manifest
index efabb63d058e..6006b39b398c 100644
--- a/dev-perl/HTTP-Entity-Parser/Manifest
+++ b/dev-perl/HTTP-Entity-Parser/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-Entity-Parser-0.20.tar.gz 23662 BLAKE2B d003bf695e32084b524a9e56327b5485ef2d8d4f608d55c776b960372165e2139cddd8a8db609c59f40ef84c979eb42c3af010fc36f3bd52945a6a88417396fc SHA512 c80d9058b8682c51a0fe3669249cc219142e674959237d8ae6bd435afafc16c92a38328329e9b09a25af8a79fec5bf01050145d3c63dd81b15ad9d75946fdfc6
 DIST HTTP-Entity-Parser-0.25.tar.gz 24307 BLAKE2B 6c8e7d6dfef9c023ea9e6270d12c0790711a03bfe783ae7be0550b83859d03ad94515981f3b87887d2174ca45b1d3cbbee427064f1377f28e0a7d09c2942de2c SHA512 760bff3ddd818ecb8eeeaee86c2d2bd895820b4011c306135b2d6eb3c2519322b3bd4e20098c9458c2fec7dd944384dcd33bfdd5b2d368a28270ac14e8dab54b
-EBUILD HTTP-Entity-Parser-0.200.0.ebuild 797 BLAKE2B 1b5a485bd48788be00f5649a545dfd5a5c059f256a9bceb330f3335fc10073031e5aed6d3f7b4d9d3881bbeda75f4135add18cb26ef7a4183ca38ea9b8e35b87 SHA512 75e6cd0a2cf322a13ecf3a9ce41536c3361043565fb76a9b55024ab2a875b5a0f2d8ece882eda07d39f93d877e121310f7f26a839224c4c3509952e5acb69599
 EBUILD HTTP-Entity-Parser-0.250.0-r1.ebuild 766 BLAKE2B 1fb0f16ebddb7b899739d7687c7da5e919de4a68d6f8253a9a174b68b9b93a5e8a264acedfa037c4dbea50e3eb3400a9974940a2309a708f39ddf03f9300354a SHA512 67b36bdaab97bed1042d88c8ee668de44d6da1f63c4499dade725782b645876527a9e883ef6e03be5310cd6dc28c3b9ccfd121d4a59cbc3b6297ae43ea76e02d
 MISC metadata.xml 815 BLAKE2B ae4e50ff437df8014acbbd1ec2b8d888953647423c030ca6fff757edc51a47b95d60d3da9d3aeac3b5b165180a22f8fab093dcb0bb6c44b21c17d660eea25790 SHA512 4e649faa0bc9dc7c207dfc501760bf6d4530910bc0fcc8e7f30d2be768c51ac6d390021124a3abca5c939bf1026ab22f994fcfae1d72fa26061edbb76e7102dd
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 950e174cac75..7ea2cd5afe2a 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Params-Validate/Manifest b/dev-perl/Params-Validate/Manifest
index 8dfce0287b4b..259e2829ff89 100644
--- a/dev-perl/Params-Validate/Manifest
+++ b/dev-perl/Params-Validate/Manifest
@@ -1,5 +1,5 @@
 DIST Params-Validate-1.29.tar.gz 137609 BLAKE2B 46c62649a7bfc1d2a97f2c038d3ee288163c81b6019e1276ded18ad0560514ed3e0a6377fdfd1103bdc05df28af5d2355ca97c96ea5352d963d03049ced78925 SHA512 afa887d1ce60d38b82cbf3ad88fb892f473e0fa45db528b68e66bbb800058af453180cc96afddae56a2cdad8ec531a587e7aac36b6869c489caa6dd36a57a385
 DIST Params-Validate-1.30.tar.gz 207327 BLAKE2B d30700b1fdb8de83b3082144a96e2243471fb0bf4c3932853995698e0950252809d974f471c078613413559f138402982f2b4646bbee4e680135d06871e15fbb SHA512 ca6b54a55dc003be6933ad5a9353abf96f2decfc681354fabc974e9666b89b3afe8394cd0a13ec91a5f84c825cbc0b4697a4977bf773feabfefab57006c9f20e
 EBUILD Params-Validate-1.290.0.ebuild 923 BLAKE2B 7fb1e9dd43dc9b0b8b39efa10bb335e803f736ad296a1a0ef59a04146f49b9ef81fc7296f9d2e07584c64d7ef888fbfc45ab0b2df454e546639b663afc570df3 SHA512 d759bbb58a1d9af5717933aa849af58785ab11be3037cd1c8142496db35e121d2502810120f4cd2be7cbf7b4316da59e1450bc704c047fe27ad08671648f8f3d
-EBUILD Params-Validate-1.300.0.ebuild 894 BLAKE2B b2196c8a1dac6b1bc54af401a12c5ffb9d483b8b2046c5b5fc909fc84e4656268dcc6ed65f31a3f8d61d8e28d26bc6ea5fdc4acc226aa62ca1addd4b8efa4f10 SHA512 ff5504e67ffbb2d45c5e6e0b0910af26cd890452e9ea6aac7d75dccf089c254360f741a25646d7f629420bc78ff9b0957422d300bb518a4b64939d9455988a66
+EBUILD Params-Validate-1.300.0.ebuild 892 BLAKE2B accca6dd35a00677fd9279743dbdcc60f1e3f0aac02b7ae8e54953d8ba7707b6d205c90f41e4814debb0333572ec5d73eb8ed9a3b5f706e95e7fe1227de33d4e SHA512 8913c731795e683a68edd6dcccb5b346ed17b53568fd4d9a7d679b0a1c4007837b8ac17eb0074d691e9ec92de66d0e88c2c1ef0aa9b9420d63a7eddf6c7e9d89
 MISC metadata.xml 611 BLAKE2B 134bf814c1c820d305b9b0b48e5537f4ae95d7bd5c71883b4794352729a57b7497f664c3c8c79fc570af5302d8eccc144f0864b742cd533cff552c18c7c1ee44 SHA512 4c12bfa5430613b179c107188a7e220ab5527338e21b53afcf4ac3dbc041d27bb91f64db5dd530110fd35c9bf313abd9fd1062fb04624592c1532ea114e43eb0
diff --git a/dev-perl/Params-Validate/Params-Validate-1.300.0.ebuild b/dev-perl/Params-Validate/Params-Validate-1.300.0.ebuild
index ff7304e53e45..0d28548f85ec 100644
--- a/dev-perl/Params-Validate/Params-Validate-1.300.0.ebuild
+++ b/dev-perl/Params-Validate/Params-Validate-1.300.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Flexible system for validation of method/function call parameters"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Specio/Manifest b/dev-perl/Specio/Manifest
index 28c50ac87250..3dd26b4e70ab 100644
--- a/dev-perl/Specio/Manifest
+++ b/dev-perl/Specio/Manifest
@@ -1,5 +1,5 @@
 DIST Specio-0.42.tar.gz 101641 BLAKE2B 9c527cd1b306d1a8394ad5b6757153aa00edcf111a444b3792cf088aec0a00597c655f59971eef7a8a6a7689e9b683ca78789b7adf1c9d19a0b6861cd4b90733 SHA512 7a9ff3e96cf3957d7857cd5f6af5efd9e35fc4c888fcd8177041e34a2388f54269e7a3da84ec60961fb61307beb882ebf54e19ae4346876e06197b1ff57891a0
 DIST Specio-0.47.tar.gz 108288 BLAKE2B 187ecd5ff0db27faeec03bd9cda6500d8e38d60d4c31aedc50d29fe3666fec68343c04294008941d92618622fc27b88623a8e18b29a63812ccddf79174bdc10f SHA512 68cdcf22818b27c38ce92b497adae81f27605aa385e9156d51d5e8e63da121d6bf26b7339a7ee3c9408cc6e3731702b008bc4b2e3c8eab67728f959f03682f44
 EBUILD Specio-0.420.0.ebuild 1013 BLAKE2B 35dd74a3f2c6d1dc04f434f761c30afccd842b2b1eafc9300461bb9b080e50125915f2291b1258c5c15a72d142d03a42839f37efc3e350d57993cde6f1444771 SHA512 bce97616294757c560a95d91d247c5aa4d2f1f4201dd484762be7929bc3b880aa53d493a238287883c8671e1f8f43b9499bf54dd552bfb43a2244360543607f1
-EBUILD Specio-0.470.0.ebuild 925 BLAKE2B 76f3352b9ccf22eac9a2fcdf5c585f5cc6ab13eb37de51e6cb6371186c428b495b6d24a7fc2c5cf1fbf557a829089609f070b2726e196d3fdb5f3e72a4bbd051 SHA512 665e64f13083c60ad3f609f094906a810e1e6099ee3d681afba340af4ed1aafb587ce8b18e1bda669d5d076e3ac9e26817d2042afe83cbe7eb9a22975bd389bc
+EBUILD Specio-0.470.0.ebuild 931 BLAKE2B 02a0ffef0e1991c7047e50fb07222a407a75a3c29e17377c0c0d6751d4b4cf62d886722a0abfe6bdbd5961c1382417211c641c00fad506af16e9780203d397d8 SHA512 e31c93bd362bc95b2efa044549e49b49062d49e226c8f0753e7f72dd498a715a6b58d8142c77ab103c316f178ae878bea82387b491aaa96dd1d84d4b0cb3449c
 MISC metadata.xml 3182 BLAKE2B 7a2dcca648d380fb70b0ec0c9a88904b7eab40f946bfe6628623a648d48c31da42eb03248c68b95a581657aa6f1cf581df906f2f85aa1114492562a8f47595d7 SHA512 a7c0321adc9ab021d9b3b9095923aca9d1714c1421969e04f7e911861fba3b1b6af95894ed9aa9fb2184eb8488483037355347a0a0926c80bb18e9de707a3c19
diff --git a/dev-perl/Specio/Specio-0.470.0.ebuild b/dev-perl/Specio/Specio-0.470.0.ebuild
index ee421b054c76..80ca50cb25ad 100644
--- a/dev-perl/Specio/Specio-0.470.0.ebuild
+++ b/dev-perl/Specio/Specio-0.470.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Type constraints and coercions for Perl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Unicode-Map8/Manifest b/dev-perl/Unicode-Map8/Manifest
index 066025149c01..c2db5d31a569 100644
--- a/dev-perl/Unicode-Map8/Manifest
+++ b/dev-perl/Unicode-Map8/Manifest
@@ -1,4 +1,4 @@
 DIST Unicode-Map8-0.13.tar.gz 99250 BLAKE2B 675e39d091c41c2e92e279ada53c2b18283aa5416efc931eba67534af02fab196151e55757ebc689fc26840d290fa54ed91a77c588f8534d5ebe2ed0379ce42e SHA512 1e8db5bb1e10f13da4eb2c5de36d38e1cad5eeed2aba7e6bfcfb36cde727d557902ac476f64d28937ff2a53992c67f027d1a42edb005292d1c2ec89d05e18f2a
-EBUILD Unicode-Map8-0.130.0-r2.ebuild 372 BLAKE2B 09f2bd94b716e5391c7f53a1765f623d3f3561882ddf9d87017b4c3030c10b151051d8939ea3922f121396426705073f61b274eca76252a2cbb9eeca8efd8666 SHA512 ea4617c98c3608cd2f7f9c31661643b12b0aef4268a9fbbc2eb6e4853374c3781917981330cac362feb711a2bad025045a4f2819f0a9ddbc1a1f7cc2d27279c0
+EBUILD Unicode-Map8-0.130.0-r2.ebuild 371 BLAKE2B 8a9e9a0ce00088e9da02fcd062571c6ff60a77681cd8b08ebbe5e7420e6404fd848772d2ef0d65f90ba51698331b42ae310d122aa7573b3aa5edabbfcc637808 SHA512 4a429aa57c2a834de4d57fb3c1080f1e740a44532bdc72c5ad6eb4a8c2a79656e769135f10e05de8794051119e633094aed8292252f3671e417ac84347ec1d2b
 EBUILD Unicode-Map8-0.130.0.ebuild 389 BLAKE2B ca73d79cc1f10e9a1027a0174ffd96ab36b8ad570be38e64d9d922601872a7d9c2405814370064b840633df146a57e2ef00a4eff5d9f77bc41a4a8502ad03de6 SHA512 f61fd306df79a515527a3150543727a8cd7dfc93344f1640784efe50d736721d118ada46d0fcf516ced3059c3297b78bc393da9b5f0c9d47313379c4d165d0ca
 MISC metadata.xml 397 BLAKE2B 35a70d53e492b84efb60b06ea34af4ab513049c619b8e05aaba51a5754a96f90f2dcbe48fb0cab15eb8598c46c4bf2df0d28534042b718cbc194953f529d588e SHA512 e820b1784470ae364ea6bdbbaf29aea3f95bbb12a62c082412086218e5955847d39c206ac1244df8c68774cc0c450c833c14d7cf2b6f212393d40bbf2708b785
diff --git a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
index 43b9a0468b76..2d39f6a2c027 100644
--- a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
+++ b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert between most 8bit encodings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-perl/Unicode-String-2.60.0
diff --git a/dev-perl/WebService-MusicBrainz/Manifest b/dev-perl/WebService-MusicBrainz/Manifest
index ca9dc9be23ab..8d3ca96d0100 100644
--- a/dev-perl/WebService-MusicBrainz/Manifest
+++ b/dev-perl/WebService-MusicBrainz/Manifest
@@ -1,6 +1,4 @@
 AUX 1.0.2-no-network-testing.patch 1965 BLAKE2B 29ff98e11459421b6820b5423a3430b36e4d0587809eb8bf41932cb2e871857ff518fa39ea9d9880109c7f6c9b20659d46004e9e4a5bd1a7ecd3bce8acdf85a7 SHA512 7e359eefe4836a49dd19e7f3685a22450bf6fe319190fdfb3a6a63b24af2c12c930fb4e9856c68e9a34663f0c9853cb556c7598a2033fa77c97e90d7c4d85a96
-DIST WebService-MusicBrainz-1.0.4.tar.gz 9937 BLAKE2B f57dc8edf4649bd1ee69d105cb6a1e885f695065f319e2537e1aa24a44560d19b2a947b98c2ad4fde0a965b93b3b3a9a562e6f6f6139d5694599e246735556d0 SHA512 91442fe4696a4f9ac1434cc9dc8d3a16d2e3a8ccd3434f5e4ac642ffba0d56db6583175283c0a1a75365cdc65dbb4516bfa6182be568de16767fba3676f2368b
 DIST WebService-MusicBrainz-1.0.5.tar.gz 10029 BLAKE2B 52e9e09f4b0c68fb26391cbfca2ba092fece7ebd1ead2b09a243718da1876209a4c12e723fdaf5ea8a3c796ec65b10481aeddba6297ef40812f61fca935f743e SHA512 b1dfa497b460fb56702905518d3f2de0f5af0f4003be9ce983954673b0abc8a67215a77079a2989fca2c0228409788ff3f767302659003f544e6bbd56ab6df24
-EBUILD WebService-MusicBrainz-1.0.4.ebuild 437 BLAKE2B a64d4f352dc1eeea5483717d82b2bd570ed7ad26b66087fc76245b94146d364c3a27ebcde41f0d38dac040fb3a747e497491b9dc0ca5113a99521e5c62ec9b79 SHA512 997531cdaf3b4f396b46674e0e684f9fe1524091bc34adbab74f896fb11e7caeda94dbb6acdbfa2036f43c61142302a2061092d6913fc0ee7eec0f8fac04a7b2
-EBUILD WebService-MusicBrainz-1.0.5.ebuild 416 BLAKE2B e9a2983da24d9f9c8bd2114174a3fa1fdf1bb05c364779987d75355e1e6e31a90e5b9914324e76f5add4cf9509b81f048f8392f839b0d8ffe9d674a3446c94e1 SHA512 c682e8d83c610e1e9242dcf8a3af1a2a3c222aaf2da2ad4700cb3de7e9db0f484eb54d065b079feb093f47eddee6e3a0a571a1291dda72b7f5a77e3e8c46bccb
+EBUILD WebService-MusicBrainz-1.0.5.ebuild 412 BLAKE2B 2d57a1a5525622a08206083fda7702ddcab6c75c601d9d56302c2177fd36b2d3a659189bfcdef7dc92735375ccad7d15be1b173fef13fb3aa36d4e3cae932689 SHA512 758f96e0f7fc14bb48b6c2a3089f77c02a18525b80a84be3920cfe44523c52d53214a281df4fc7a0553311c2ae9fcff1c849828a2090e002b715d69e154ec646
 MISC metadata.xml 616 BLAKE2B c011d9576426a66f0b04bb9dcb5bd838a356c8252c50e21d58959d395df335324ec54653fa258ff44fb86dd2cbfc2e4b456231a0a3ebc128baf4c4479fbe29b6 SHA512 47658875ff2da5ac0c27bfe60a7cdd583e0c04631a80058f8a40a3712235e693bd7946a9c08da6690ce3d2d903b8ab5e39e28ab3f259b506c6ee6381abf3fded
diff --git a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild
deleted file mode 100644
index 7d1b87b678c6..000000000000
--- a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BFAIST
-DIST_VERSION=1.0.4
-inherit perl-module
-
-DESCRIPTION="Web service API to MusicBrainz database"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE=""
-PATCHES=( "${FILESDIR}/1.0.2-no-network-testing.patch" )
-RDEPEND="
-	>=dev-perl/Mojolicious-7.130.0
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.420.0
-"
diff --git a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.5.ebuild b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.5.ebuild
index a135c22b3bdd..25e96ecfb98a 100644
--- a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.5.ebuild
+++ b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.5.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Web service API to MusicBrainz database"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 PATCHES=( "${FILESDIR}/1.0.2-no-network-testing.patch" )
 
 RDEPEND="
diff --git a/dev-perl/XString/Manifest b/dev-perl/XString/Manifest
index 13e219e463c2..54a0ce5b418b 100644
--- a/dev-perl/XString/Manifest
+++ b/dev-perl/XString/Manifest
@@ -1,3 +1,3 @@
 DIST XString-0.005.tar.gz 134507 BLAKE2B f660122cb4363dff1912aa69907e003eef7da497ce95e3a377d7dacbde0887049167a98ea82927341337ba3a85e6f048c65018d979e71e6484f594a97f21e352 SHA512 4a6055e9e59169b77e04e8b890944b3a7bc4ff9844ad6b2557f7181f7b1c8576a7aab7ebee351044cbac8f3bff2d37dea2af4bc7ff775fbc3a398c9785c53aaf
-EBUILD XString-0.5.0.ebuild 300 BLAKE2B 72206610124dba2ec24d405d1ff29f0799851235feff345d95abe4580f4601c415466c525f3a4ca579e0e57846f4df16960ad655c4d4f40e9943cb5489432a26 SHA512 248c1762a10a5da057ab4dac784e84535b20a653fec18443d98465c2d2cd59c282160fb81b0d6429a2d8c9567f9525af3d0b52634b5f65b0a4256a595cac3fcc
+EBUILD XString-0.5.0.ebuild 306 BLAKE2B 07bb5a14db11d27fc987c459026cc6e554e68a39f2a5d97b012dbe07169c5fbc5cf8a4b017684d1cea8071b9fbb34828c1452cf64b85343f269541267d7655a8 SHA512 5cb7873693f719cce32f08f4af1f588b1cced4073f1c091d173d1e42fd1815f70d0662b306051a7f5ff2a494fd60692a00e980a63f824f5916bd610e2df36c1a
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/XString/XString-0.5.0.ebuild b/dev-perl/XString/XString-0.5.0.ebuild
index 81b1debc57d8..491a746ec76e 100644
--- a/dev-perl/XString/XString-0.5.0.ebuild
+++ b/dev-perl/XString/XString-0.5.0.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Isolated String helpers from B"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 310ef381171f..765d43d3a348 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 6bf0c7d1608d..19b256faa4da 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,6 +1,8 @@
 AUX async_timeout-3.0.1-fix-py3.10.patch 11203 BLAKE2B dab3b3e09832ed11a9c684aaa3c21f2294f0066a740ebda047ae8b550c72caa1624b30520870989ec2cebedb72a8e556a92aeea0652411afc16ffab1ca2d825a SHA512 80249589c7f2f2f7c914bef7bf6fb3f03bc9a7d8dfd3376307baf85df28f3240381ca3a580091d1aa1aa9fa4f360ae5d92a5e1b46c308ac0c7e0d857b9d6648d
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
+DIST async-timeout-4.0.0.tar.gz 8258 BLAKE2B 7a3edee9491aba11e59ef6bf7c07b9e3f00e97bf42e69adac92a23d89715e2c90dbf9e431c146c20e44b05ed47905cfd5afa41fd04df63315d9f347a6b8f70f1 SHA512 92716106b42ad3746c9873649b44d414da08f75cd507a0dc45d764270bcbd6f483c149e5cebe1a4c36f5cd02397c21b67b92a0475117d9dea17c580e422cf4da
 DIST async-timeout-4.0.0a3.tar.gz 11386 BLAKE2B 8918878c4edd64c70d831ddd05e3235c3c7cc116a99755205b7624df52cacfb61bf4e80083c85d93e420fbf18e7da16ee3ebc796c5a4890e2801885b670a494a SHA512 04775ea30ffba90a4b604ef040df24a6a2711fd3e2c3b45d1ab87ae3487f216458f44bbfb2c85498bef286acca90af43d8b3b95cf22244027c0a48494ef84e7a
 EBUILD async_timeout-3.0.1.ebuild 974 BLAKE2B 532d3834eda42a0b4ddce694a89a202e2e76ac0d5ca148a8b22b47070524ac27ce2baf9f2633d8d9067f2edc6d492e23eea7aa4ad21ac12bd845f8ec3f5836db SHA512 458d6b58d40909245e9b4601046a7c24e9012d5167a6593877ec0d638ce0deecb90b4beff417376667226b7a479e64d492c9089d7c6a927de67e3c53b0d62157
+EBUILD async_timeout-4.0.0.ebuild 878 BLAKE2B 7ab62de84648e1203f09e6b7e977567ba8e987d5b44132ecb27062fa826918e5b3cbb36bc34a59beb6b13e2e1689cddaee8a01caa6f26d35576ec65edf87b52e SHA512 7d69fc0ebb94ec7600a396dfc4e731277277e51271106ae968ba993ea6bd3c399365daabb781e3abf0b16af4c6f727c2964fa04a15b9f23750ac285fa81f3ad8
 EBUILD async_timeout-4.0.0_alpha3.ebuild 887 BLAKE2B d6bc843a5d322ba66ded96b85effbaf2c9b86c06595c7a6e9bc8f0fc5d4bb5de6bfa54cb40af227fbba01a1b8085ff5c2e79ec19c594ce49907abcb3ebd87d74 SHA512 888a246286d1c5f834f83a875358945ca25920e699a9965fd02fbe58e3f62f88780bfddecd4ec64f0dc38673af677ec9bb0fdfa316ff4fa2aa41d2c22ab94824
 MISC metadata.xml 460 BLAKE2B 33594e2b78abaae89f7cb0c953a432ead4c468e01d005d4a65aeb846030fa01b1544d8df393e9d73cc4af6e557f106f8077c3fc4b0b35aacec20033352564083 SHA512 47b1f783f49a63c17abcabcc73d350582297f5bdd266a3d57079f1a50e4a6e88680b73993d9efa3609fe9820decf7a4ea4b5b87f9db6e99509695286c50aab1c
diff --git a/dev-python/async_timeout/async_timeout-4.0.0.ebuild b/dev-python/async_timeout/async_timeout-4.0.0.ebuild
new file mode 100644
index 000000000000..2f3850143bcd
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-4.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_P=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -p no:aiohttp
+}
diff --git a/dev-python/autopage/Manifest b/dev-python/autopage/Manifest
index 50f205228faf..9f22c1e932c4 100644
--- a/dev-python/autopage/Manifest
+++ b/dev-python/autopage/Manifest
@@ -1,3 +1,3 @@
 DIST autopage-0.4.0.gh.tar.gz 14809 BLAKE2B 8b91d76c04f3b6519fe2660cbebb50c9b767346b6313303b757b04bea8e7eb8a48aaeaabe364b1b18cadbd5125c95f77b187f779ef83c913e8db13ca88284311 SHA512 a7573dc5d62559f06b54b4b40ffa916209ab7c3348ac7b0cb20ae840fe841e8f8efab1c1853196b4cad0ce5fbc52b679e651f76f7023af960dd8cc876a6d1f14
-EBUILD autopage-0.4.0.ebuild 745 BLAKE2B 8653da6eecc042f9af3e6d6ccec6aecaab864755ab7ddd386fc061cd417cc6cff6ffd484d0c09476ac61dc99f72ced9c0976de1d0b3587bc9a51a03028471d06 SHA512 b96e5b5d781529a95c1b8e6aa54f06c29ccae8e80576dff61b85c39f9fb851e302546bfe94c1dea9aee728cc801c36cfde3c15f485cd679e79d44bd315920259
+EBUILD autopage-0.4.0.ebuild 751 BLAKE2B 96efdbc0ed72b1ff2bf3d8d54485122cb2b6478a1c470ca37ac7d12aff75d89cdea923d49482a019b57950d5b8426dc1d115e84f70a96a5ff2c1f6bac58aea5f SHA512 f6a64476b33c8d94e71ce93135fd4c03f119c3fe567c13a56b64e6de31c6c2a6e31649e15023ef5c3bcd6cb21c6a36550b25958f433ac9ec7336f96fb872f75e
 MISC metadata.xml 390 BLAKE2B 6be679e40e58985a6ad622fcb85f130bcc6b8039accd14243e6dcba458a0af721eaf9e7928bfe0d29f62477df6e437143865b68a61820b88dfd61a6e760992ea SHA512 3d76be1ae51467569281305138475733f9ce9b89b7d2a41f496c69bebd86e205019d1e75d1de22267d36aa2822ebe8bf94f5722d46ec27a8a79f349e38dad3b4
diff --git a/dev-python/autopage/autopage-0.4.0.ebuild b/dev-python/autopage/autopage-0.4.0.ebuild
index d14b9446a9e3..0eb41b6e9617 100644
--- a/dev-python/autopage/autopage-0.4.0.ebuild
+++ b/dev-python/autopage/autopage-0.4.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~s390 sparc x86"
 
 BDEPEND="
 	test? ( dev-python/fixtures[${PYTHON_USEDEP}] )"
diff --git a/dev-python/backcall/Manifest b/dev-python/backcall/Manifest
index 23873e0d03e4..a0ddc04c614a 100644
--- a/dev-python/backcall/Manifest
+++ b/dev-python/backcall/Manifest
@@ -1,3 +1,3 @@
 DIST backcall-0.2.0.tar.gz 18041 BLAKE2B 67f9ac96d26b368972a5749775a70c497b5705b37d45ba7f64c1259be776cc7f4c9d78ae51da9c1e9e46521d33bf511790675688feef88a68d25ae30cd79612d SHA512 7f086121c485c0ea4bc6935e7d116c8b14ff44ff6001a49665d0a698b6cf9a809823b9bca634a78d92cf40656f953dbac0132241327a5fa6be0ea685ff63636e
-EBUILD backcall-0.2.0.ebuild 507 BLAKE2B 87311455a2b16263ecd901ec7a0766bf6f4f1b6649c751efaf8198aba21c8b494ec0dc1c5353b26937ed33d130bab171b900f3d7acd19d0c8b230e207d308188 SHA512 cd24b666cb2b6236f0cb80aef41aacee810f079d97b7eb20398a2f01fe9ab4721ebd665f15ca52914f33e13b9f9713326b6e737020a9e47e1d58e1402555d25c
+EBUILD backcall-0.2.0.ebuild 513 BLAKE2B c93cb6dde38ae2341c942ebfad543dbd841c3ee33ae083ce185725a82d361ccf88b3d738c5313a8c7fc3f2a271423bf2ec52f7e4fb2919a105f8e9434062bc5c SHA512 51864cc12f1d891e993dce120af924eb3dee74135e5a1d9bce0e0972cd26738bdaa2b502883b38b0f2512a0c2e7650edaf9d4378bae6802fcfb37058807696c5
 MISC metadata.xml 336 BLAKE2B 68a24b9019b03bc28ae1ba63aa540019a73e1ecfaa894b047b527e91022888c4ec12473e99db840a877f919c2141b5de86c565b087a9341d8ef105e527f709d7 SHA512 7c5c1fa30436195a17bcc2f3b972db4a92a89585a4f2f73ba25c15143d283e7e7708c6f0ba579703ed1011f48052fd4ea0fe78d68eda46cd6e0303025ef5b99a
diff --git a/dev-python/backcall/backcall-0.2.0.ebuild b/dev-python/backcall/backcall-0.2.0.ebuild
index d449fcdeade5..67ffbe2ac9e2 100644
--- a/dev-python/backcall/backcall-0.2.0.ebuild
+++ b/dev-python/backcall/backcall-0.2.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/berkeleydb/Manifest b/dev-python/berkeleydb/Manifest
index f1bf03e86e22..098c31044836 100644
--- a/dev-python/berkeleydb/Manifest
+++ b/dev-python/berkeleydb/Manifest
@@ -1,3 +1,3 @@
 DIST berkeleydb-18.1.4.tar.xz 137160 BLAKE2B c93e7707bf12199c8161112accfedc3b0180b8f6edcf5c928c03f373528bb9ccb23219865344d9ed29d30b0133a2161ba0325257b6f7a2d22a58e8d9b1f82ce2 SHA512 bac2848e82ba5fdd3ca8fbf3a02d04faf270132f4b9fe93096ea57ab99fcc7eba02ff8a9638ea8e028d8bd4f16eebbefb65f33ea67e95c0a14cced05d04b23b8
-EBUILD berkeleydb-18.1.4.ebuild 1731 BLAKE2B 3f1e770b70d92da17190d9a32b535f27f483655fae0ccf4cc5d808a235afd08fb208318b94d54eca6db09503e837278e3924c061f4e27dc0ae4305b479dae6d6 SHA512 5c1b0bf4871ac1bc69a73f340b05fdee812cf640d184da75def74ecb32864bb63706023d22830a78313f70299d2d03cd386b0b04052ec03e49d1ecf8bbea8e77
+EBUILD berkeleydb-18.1.4.ebuild 1737 BLAKE2B 607cab974b1eae7e26d134ad27db81da97ed51df4459ed2fb8ce05f0d4336a0fec31090ec959c688abf18ad1b5cea849dae372ed2ec69cd49cd695c650224519 SHA512 06cf1a4332f3949dbb0242ac37d59ca3804fd9c5018fba2b32b76588d9debbf21a2cae467510fb4e0ff2f75a770430c9a7c78624a658e6f9068ff2a9b8e5d5d2
 MISC metadata.xml 324 BLAKE2B 0741c4e1875fa2e306979097f6cc2fe13e9dda41f6aa49e54322289776387f97f399caa9ce79778dfeb8f4841a1b0cb3674e5748f556fbd5b116e97277a9a8ad SHA512 8eeeebb33f5cddbf7c841809d61f363f44757960ad5c71c84f1afa45c77d7e7c2ac5af226bfb0bd0348f4fb9167d2e9627b43b76951ca1abbdf514264feb9a56
diff --git a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
index 783079c3e482..d4578a5945e2 100644
--- a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
+++ b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/${P}.tar.x
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6b0c2f32722f..5ea4b2417ddb 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,11 +4,13 @@ DIST boto3-1.18.65.tar.gz 429858 BLAKE2B fbc80e0d8d10f6d02fcf9b86c6b4be03a9c9083
 DIST boto3-1.19.5.tar.gz 433567 BLAKE2B 52c12a4dd18d6f02326f8002b345cc5df224455fc862daa700326ae1df258979211d2753f01e1a106f237de393e483dc8926bb4ef0e08bafa575f20811dccd55 SHA512 fad05102f0c3e7e30a3342009f6b3ae28f52758f17a0c22b4da9a03dd10d7f9149ea2ec0119f55ec7280824bd8173653271821e82fcd54ef9fb9161b2d62df70
 DIST boto3-1.19.6.tar.gz 434389 BLAKE2B 3c7e4c91c95b93358b4a31d401e03f8a397802004a6ee2bfc2ef1a31df8b89e8866fa73d3354509ae00537898cc8e04b878cc9d00f82ae4e94266e8185e7abd1 SHA512 6ba4f7a89d973991afe329b4c648c8ecb0bb256d63c7e60ae8bb70e6fd5fc9b1929168dfdd55f2c84039856a32c891013abf61dc2e65f516490c446b0dfaaac2
 DIST boto3-1.19.7.tar.gz 434848 BLAKE2B 102b2d985cbad6c6ff6fc7866f47c172028e4b1a56ef7eac5854b12aedfbca1b94eb426fead04397e119ebaf939f7732202718395775b0555f566ed938c27dc7 SHA512 40cf5341bfd7cc4cae4c542e39e4c5ec1b63ba3bfee5faedb75633e656700dd5e80a137b234b57d22cc1b7d85a2056ced4eb8b7189ab57c8f2c0269e8826811d
+DIST boto3-1.19.8.tar.gz 435192 BLAKE2B 2cec7fe3a114ef349e4afc15f15315d351de93ecae3439946d9936effa257e55a88f6605b33e13ca927a245e99ad60b0c9c356320be6e4f95a99e52c6ff8da11 SHA512 f1038a0103f09c4bb20d4feb30abf3e2be2535d8e9e0e807e4d98f20ac27f27f0260b274c1b6e6b91f00c5d3e4206a92ab1cd80029f2b0720241d98356f688e7
 EBUILD boto3-1.18.53.ebuild 1213 BLAKE2B c4458bb3113ba83bc2ee3ca57c264c634f702ca4cfa5d95b193442695bcf13f34adb6a30cbd78de4845a3a9dd033eaf05c4ee590c2fefd1dc9abf5aee45dde99 SHA512 c9c841375522cad6d3fdc6fa89172044d821443b35f5c9a957cbec52e6fd7b7e3e15038e03b67091d24c45d010f79ec152fcda93e534061d2636dc85ed574357
 EBUILD boto3-1.18.60.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-1.18.65.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-1.19.5.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-1.19.6.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-1.19.7.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.19.8.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.19.8.ebuild b/dev-python/boto3/boto3-1.19.8.ebuild
new file mode 100644
index 000000000000..450c87d9f8b7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.19.8.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 206a9620a99f..ff6b67c1950e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,11 +5,13 @@ DIST botocore-1.21.65.tar.gz 8261668 BLAKE2B c955019d06aa1b2f4503673b7d9009e5d6e
 DIST botocore-1.22.5.tar.gz 8301083 BLAKE2B 91f9d38e7c5bcb0b8f58c04547ad45489f58d2240c6b7301cf632969a4a73cf4a1d51c8c68c8def27653c10041d2163ad7ca800dcf6fd07972b506bf2566cae3 SHA512 710a9eeee03dc79ca4ffacc4974f09ca769e1e3b8cb143f6f0349240dd8c2af8ee526a1dadb7310a26019363f683fc4149cb4c73d8b94a856a384fab7f84fb5c
 DIST botocore-1.22.6.tar.gz 8302901 BLAKE2B 4627c7bfcbd1750a6517c045b7c7c986c6defb9b35e413fae47e03fe24f3404ff4905c714212ad00193eb4dfa2893a0080da97acb538965a8792278915823a3b SHA512 f39eb6f339011709fa764d3783f225fbd4e4100e51466de9c87d6a3a5430823e81be1b024963ded49785b4fd49febdfa66dd3f91c3b9296508c3d71d794d170d
 DIST botocore-1.22.7.tar.gz 8306878 BLAKE2B fd427ced3eb3c2ce71a28f7334ee312293fc98c7b2d91991ce6c894f71bd39b356aa3a2f0a0495fd91e394be4d284b21dc8272863e9568167112aadccaed21a6 SHA512 39eaa5d4bc64669bc398797c69d63157a6a4539bed1c4cdc492c4fe94c9a32d58ac9ea8c06fafd75a5c36ab9d3a5c99f88990b03bcef6cccf7e0c4247330780b
+DIST botocore-1.22.8.tar.gz 8316687 BLAKE2B 0ea2bfbf794d156e5843687927980d4dc9e4243c00ec6ee3175dd02cf7d99a10e549b06eb377edb52b73ca64e4e97e6c03c96389773f5ac87f648a6ec6a89398 SHA512 d35748c240ad83155c5d97b044569e1d7093469acdac948d4ce396b1f17563ed5e9bbfa91799a87fabd93df3b63724be096d489be909aa1567d59e6bafe99e03
 EBUILD botocore-1.21.53.ebuild 1105 BLAKE2B 67442baadc85283cd67ea7877938531c70e59285747e631dbfa9ce1519e646af98169ff4ef538cc6731874a06ee3f2948fcf763abbf889a3e3b2d73ebf1cb69e SHA512 73b94ac5892d16aeecf54be238ca180d909885bfea39653d4aaa9e80dbc89aa3f0b040bff51200eaaf25d3642a43f1341d5dc3c27dd65891c368ada5d0ab3a82
 EBUILD botocore-1.21.60.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-1.21.65.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-1.22.5.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-1.22.6.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-1.22.7.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.22.8.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-9999.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.22.8.ebuild b/dev-python/botocore/botocore-1.22.8.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.22.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 09498b61a96a..5873f1de8bf1 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,5 @@
 DIST cliff-3.8.0.tar.gz 81862 BLAKE2B 3a8219f822fdf14e1de56204b0f536a92d27be5a99fb628f3aed5b569a1e703d4711bdded28fa42c0692316454847ba3338baac8efae873540652e46d155227a SHA512 002e3ddfb254c5369582cc28572856a8b4ad05d598a7f8aa690add69f49cabb12ef2ef17b6c1553792aaee785b7c1703b05dd9d4889271cd5eba5629fad3d09b
 DIST cliff-3.9.0.tar.gz 82687 BLAKE2B d49840831e55a205e809abeb54a6c9d45e807a622dc9b02a104311b8a5ddda43415b504f7fd62075cc4cdf89a1b61605ecf32590fbca3d720c07da83d58890a2 SHA512 04b33e14c3b29a02dc04855044184f934919ff92dbc09003f620083e5815597f8dee7201fa33019dd58a3e701d4c3f9966be1f4d23e019a881fee9a9bc1f0dbd
 EBUILD cliff-3.8.0.ebuild 1162 BLAKE2B 437d306a8b53ed989eb8118c33f8216cdbe2643a48f8f444492b50ec96113ff376c7709434eb9017521e2d5f83673f88b440ed2b112fcf67cde91a39d9d3db0e SHA512 61dfc0762c58b4dcc8ee498a5f3f6199786a33d35ff1563edc7af5c2f106af832b60a2dd9dfd080d65cbec0f265174790ee63f5d6bc9022c657d2bd0172d3e7d
-EBUILD cliff-3.9.0.ebuild 1136 BLAKE2B 4eab924db7602eed6f25b0fca381ade8e216befeba68c9658ec356d24a422ad3771b9c10df0f5b3ee732245bd78f6cb6d0681472de953bae0e55d6e4f9008770 SHA512 7bd96dcedb96bf427383f6f0eb1876bac054d3e7cbde680aea5e80a0c408fe5657bdfbdcc463bbebf2b20ff21e629a5b9af7e0d3bf28a94043654768ad022cec
+EBUILD cliff-3.9.0.ebuild 1142 BLAKE2B 603b418162825a94fb162208f79c7a72e91598ac206cbe4706e4786543943e1f3c34e553e17933a4bdfe49c86fbc5ad2f27ecc722fba5541eda4884bf4654dc2 SHA512 92d43452c8804cc02f39f041b21f239f7829e6e3339f8bfbc4be5da3a0eea027befb6bd2bb7d30e3ece81c58ba77252f9beaaa73efefc070e2c3d9f90260cd67
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-3.9.0.ebuild b/dev-python/cliff/cliff-3.9.0.ebuild
index d783eb62db71..9c52872fd13f 100644
--- a/dev-python/cliff/cliff-3.9.0.ebuild
+++ b/dev-python/cliff/cliff-3.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 38baea563187..0cbfb985d86c 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -6,7 +6,10 @@ DIST Django-3.1.13.checksum.txt 2552 BLAKE2B e82052d952f7dfd15e11b413fe2f106af3d
 DIST Django-3.1.13.tar.gz 9656683 BLAKE2B bb2dd72ba2dfc13c8f487d6b59cd9302160800dca4f63b92e640eddf4aba2e5b1bd67580e56477bced44a5393b5f65a463a9c0c539ba998a20606bffdfafcf74 SHA512 55b1ceb24b6e0ba542a96319f63b138439532cf4b00971a8432baaab4a8ee219cc9fbb31d457ba7da9e932c919df83da9630866d909df4a5d432866b158098d7
 DIST Django-3.2.8.checksum.txt 2552 BLAKE2B e3bbf05bab72cfd71521451620706eb2b66d2f16791cd7897b2606083af91b62af6c6ea1e9f2b2a1437e3ffc1e1688149f9084d134ac6fc233f6285418bdbe5c SHA512 62cef4cc4c9de4be5db763e35957f2e71e9ca9fc5335a35bc51a1e337a91027236f41b84dd1f9eb513cb769174d9375c0a7b52cfc645331a3927c5498849eb56
 DIST Django-3.2.8.tar.gz 9820955 BLAKE2B 5b53c1033babda046c3e3ff8421465d5bf31e92c5c65e6ebf7d4a401a5f85017625efbf227c718877d58f80f9153fc205b817aeb030d0f322c26b10394e71287 SHA512 0d1d745fc7ebc20a2c3c1d18e270210ec57d605aafafb2bc2bee4229727469dfea6fbd510073ee6509b389eff2a7bdb75765aecafc4506d4489c2ce37a97bfbe
+DIST Django-3.2.9.checksum.txt 2547 BLAKE2B 7a1c38abe3215ee4533984c7d78c37b369545695fb11d84d6600d64eec290addb9257c4d2850af4e311df2245799572e0866917e09713643376da7859754a2ce SHA512 9aae8da65079e20dcf9071fd72fa5f5c61640264b52c842d96cc2f697ba1d5003cf7b7c6d1f95549eb8ec4449679a00ddd267c022b3d0483ab030cc96c9405b7
+DIST Django-3.2.9.tar.gz 9809157 BLAKE2B 27fc04e874055f69466f06b009c015b46c2d2fa9ddd0005f7b2b7b32a45bd1b8a9f34e693027e040b8d05fa581dfeb9a00aaa1d876477cff5292167f20768b60 SHA512 62fb297694a7f5e48465e102dc97e3d1d04b94499bc6d98d37a00d96b438b8c919b6d08055868a1836d62b89ff65ce4fa7dbc9390789dab2eeca0187269b125f
 EBUILD django-2.2.24.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
 EBUILD django-3.1.13.ebuild 2772 BLAKE2B fca2574b02e943a7535bfb3ed5e98402a65bc86b5b9ec72a7e814cd7c2da7d0017bcd2127e69e8ed6646ba3905d53deb657818d87435c34747b9296ba662dc0f SHA512 15e9ef76ec559b138f1d49bebdd0c5f2603d2ca48693c4066dfeb0a1e3d2baae598e8c8604e05fceb649f5c6d792ec277599ee257c91248df7db718361a08869
 EBUILD django-3.2.8.ebuild 2897 BLAKE2B 3eb77c93ad333559fae6810321a035a7bd66a21400cb985517523e6656af3409e120af7f3434a2a11ac4e97a1afdc2745a32b5a35928dc5197b2e7097540029b SHA512 7b68975726c94cb166a985d36a31c1380d5e6c54a6b858a3cfa3f50883f22518134de8f89eb322093af45224d2db1c631e413db4d35abae41428448ec1c8da4c
+EBUILD django-3.2.9.ebuild 2901 BLAKE2B fd56aa9bff6a70202113eaddb416a2f8877713f871b1cf22b94d59615b2fff48f2bcb337f0f96ca39cb8b13885fc4e8c1deb2207cc7340490286a1ca9033b443 SHA512 c3ad10ca03c068e188723ce8e65ce744219bccf1450dbf5a00c28d21ef4b9755c91db82e89238b88e6c643fd5b038c947b0806c9270756af66a81c7f0b5babf6
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-3.2.9.ebuild b/dev-python/django/django-3.2.9.ebuild
new file mode 100644
index 000000000000..28502c5a9117
--- /dev/null
+++ b/dev-python/django/django-3.2.9.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	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
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	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_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+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() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	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/drf-yasg/Manifest b/dev-python/drf-yasg/Manifest
index 71c74b7253dd..ade892f61b27 100644
--- a/dev-python/drf-yasg/Manifest
+++ b/dev-python/drf-yasg/Manifest
@@ -1,3 +1,3 @@
 DIST drf-yasg-1.20.0.tar.gz 1800321 BLAKE2B 3db8b0b33c2919d4a331b06b1f6e324ce6e0e160c0454cb066e61cbf7bb580efadb5cd9624579492db3404edcc8e50753e63b6edae022842cd087b820779557d SHA512 b56cd00d7a09f197e95c0129e20e561ece783b4edb389b228027ab8768247ccba15db5768f52a3d5ac5a4c47faa7a447ed7eb9b22af2a21377a36dcb7e7b267f
 EBUILD drf-yasg-1.20.0.ebuild 946 BLAKE2B da0987843266c6da7b7f425f5e14cc5f70fe16ec254063879d10ada8b1e17343730ee0aea3d96ce94464c62b99046db1015213de7f2997c185f046d4db9658ee SHA512 69704ea4e7290e6d38a663598015991466af431b778aa38dc3b6ca0039eaab59955d17f84acce0e5a64cb6ffa76fc9838b97960c279de0572a1552527328c94d
-MISC metadata.xml 354 BLAKE2B 84a2843f9a2c8114b4b5a4d8a9cf232375d1416a54f95aa0e87fdbd11299434af2e35a592b676cf94f9e751c43a2527944c93bc4bb4becccf65a8a8dcbfcd35a SHA512 bd20a9bec093a76a4639cabb1b98ae6148293b96107460faa6c98143eb9b874faad20e3c0818f4af604153dfb5eb22af0f912479b7d328b22e41e49612031f1e
+MISC metadata.xml 411 BLAKE2B a166990df10a1a15f98b3dc4ec418785154297056fb41d635c0778ba76ac6262ad913deb614a4cbb08cf79aa4c13cc57e0aadede509963e897ae822d1ac2ef30 SHA512 c25b4ac9e2690096b5c219329cb44147d8fd8631b39652456cb336d8d9b544855b8ec49407be9d15e7efb331341f5929653ef14a7d84bd808c5f62a03f46a0fa
diff --git a/dev-python/drf-yasg/metadata.xml b/dev-python/drf-yasg/metadata.xml
index 4855944efa0a..872e1cf1181f 100644
--- a/dev-python/drf-yasg/metadata.xml
+++ b/dev-python/drf-yasg/metadata.xml
@@ -9,5 +9,6 @@
 	</use>
 	<upstream>
 		<remote-id type="pypi">drf-yasg</remote-id>
+		<remote-id type="github">axnsan12/drf-yasg</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index e8801b012588..34e0d8bf892f 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,4 +1,3 @@
-AUX filetype-1.0.7-examples.patch 824 BLAKE2B 1e3fe9e72a422eafa45f35b43d04bb0cb1d4ccc379b7a318b6de33924b3e4139ca3e6c6efe529da5d99e4cc4038b818f4edae38778c9b9f7e0e0fca740b5ffec SHA512 9d5171016461f65330d4f1e6c985d1764f1ee8a173529e35d4abebbe98a7a3ccf920752f4baab8b3c6fcca484b59043f0338cc7c0b3c319948399781eae31e7c
 DIST filetype-1.0.8.tar.gz 804082 BLAKE2B f636e9fdddd93dc8972c434666b82d97fd9572ce94f0c3b617add2ecaec2e1bfeaa267bb5ceaa07a6ed76d0b0ef0736451f9e4395353ce795e1a61e7cce5d543 SHA512 5ab87ec277781d27bdd7a4245f406d230724b0f0a7ab26e879cb78893262fbdff7088bb306203fb1fce38723b5d1c2a998fb8ae113509502755e995a1f81993b
 EBUILD filetype-1.0.8.ebuild 487 BLAKE2B e688eaaed951f4f9d776193cdabe28eedb8fd207cf35418d6cb638ab6391362f24639b5979e4ccb4db1760601a6fb58a21caa71c2c9e53da4c2caa7dbf9b8576 SHA512 984a133836a5e028892521145d7a521d2e9f51061367fb4a664955c903705becb9ef1c61786acf585a8a2d3bafb12d621b0a076efbd5e2a103174a700dccfe0b
 MISC metadata.xml 478 BLAKE2B 90bbd2432c69c85eb34fccdf6c8e73d7f226d8005d04136a1043a3a0e561a6cf12db5393720e2192c2ae39cb501f4db741d7b41d1c0c3d217e4f84e1d846200b SHA512 18f363a259cafd46ffd3e5bf943d38efea4ce39385af6976b1681088c75fe7b2748752b6f68e9e8fe120786d0fafe9e1c2599dff40951bb28442d9542c422c41
diff --git a/dev-python/filetype/files/filetype-1.0.7-examples.patch b/dev-python/filetype/files/filetype-1.0.7-examples.patch
deleted file mode 100644
index 04eeb8e1ee68..000000000000
--- a/dev-python/filetype/files/filetype-1.0.7-examples.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0aa106c03d0bc7dc872edb349b4a88edd170ca05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 9 Aug 2020 14:55:07 +0200
-Subject: [PATCH] setup.py: Exclude 'examples' from being installed as a global
- pkg
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 45bfd49..8a69c6a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,6 +36,7 @@ setup(
-         'Topic :: System :: Filesystems',
-         'Topic :: Utilities'],
-     platforms=['any'],
--    packages=find_packages(exclude=['dist', 'build', 'docs', 'tests']),
-+    packages=find_packages(exclude=['dist', 'build', 'docs', 'tests',
-+                                    'examples']),
-     package_data={'filetype': ['LICENSE', '*.md']},
-     zip_safe=True)
--- 
-2.28.0
-
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index d5e2885dbb61..8d3276f24a4f 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,7 @@
 DIST google-auth-2.3.0.tar.gz 184993 BLAKE2B ac1392ca61e092e3e53c9e936e2d0bd11aeb8f33cace2458e80055734a96a05294335a9273acfcc3f385f423ed537d544404e41599cb6a75b21a10998fd72562 SHA512 cf0040d238880ea4bbad64f0a47311f2ed3922a7301a0d5287319b39ea8e76dca66dc78fd860cc12386b078bd2147a1cba01de97381420ef94cc44fca0c90ad1
 DIST google-auth-2.3.2.tar.gz 186112 BLAKE2B df2321252984ea43def8ec703590d153ecbd144f385a4915ce8f52e4cb71d66e31929f95a1ac783c4c4436a454b81a71d13517d38454892203c8ef19dbd80822 SHA512 1a7c828ecf529e8e64f946a5ee1923bed1544d4828b00449d027b0898af47e99b90be1a490b60e19a133fb59397f8860265306cd3dbaa8600bef823da1e4a215
+DIST google-auth-2.3.3.tar.gz 186600 BLAKE2B 52b1269b88d27fafafcb053219c93c7f180cac11cdf32b140531553dda547d02087b0418d44edc6497eb37793859d86d4beaad1a7a128c86839202785584c9ab SHA512 3ab6d97e71988ef5e338e0a643545f8fa504f5ea04f4176afd9417ecf0e9a3fa45333f0c2c7ea5bf32423df32c48ec59ac9d16ef8bfc35a1aa4c0fcc114fef63
 EBUILD google-auth-2.3.0.ebuild 1509 BLAKE2B fbff7143162485d0246563df76ae32f66ff717780f42964e4aedaa09c0028fcd968d3301dc6bd42b8fa308326d77ebe3212f0dbb90cf97692993518e325609d8 SHA512 14a478f56a307c9241842226e157112ef56114990f8e5eb352b342bbf854c6ca4a9e74313398592fbdfd0e1ccf2e75f3473adbab4c11a0d388b83dde7dda67d2
 EBUILD google-auth-2.3.2.ebuild 1545 BLAKE2B 335205543367e55ac4c3d7730133e82952d6bd855576b98cd52053237daecf27536134fa58ff1490aada839acc15746fa16dc559aa7a0127a304030a6c0c1be8 SHA512 3e0963371c15ae4b00332a1f3d9ff47db4f0486e495d3dbf29d8ae4efedeb185d1eded75369ead64dd166ba714fe5fcd921e76c2f20777fbef4cd70532a3d2dd
+EBUILD google-auth-2.3.3.ebuild 1545 BLAKE2B 335205543367e55ac4c3d7730133e82952d6bd855576b98cd52053237daecf27536134fa58ff1490aada839acc15746fa16dc559aa7a0127a304030a6c0c1be8 SHA512 3e0963371c15ae4b00332a1f3d9ff47db4f0486e495d3dbf29d8ae4efedeb185d1eded75369ead64dd166ba714fe5fcd921e76c2f20777fbef4cd70532a3d2dd
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.3.3.ebuild b/dev-python/google-auth/google-auth-2.3.3.ebuild
new file mode 100644
index 000000000000..01d1b603755a
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.3.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index cdffe550ec31..e6f601513266 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -8,5 +8,5 @@ DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad04
 DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
 EBUILD miniupnpc-2.2.1.ebuild 905 BLAKE2B b062db8e22fac0c6a8f8f9f5785860bdb8fc8102902828c41144d140643e98466f966223fe5c8c2ec58be0143a0e9203d5d1f983c497408287325e76d738efb8 SHA512 4fceee78ba6e8bd03f6a27c83ddc4ec877112fb4e66ecd88f22839641e30bd46551c454600edb9e90cd0402361e5de4844249969fbf46b4f6cd96ff321b7e0f8
 EBUILD miniupnpc-2.2.2.ebuild 905 BLAKE2B b062db8e22fac0c6a8f8f9f5785860bdb8fc8102902828c41144d140643e98466f966223fe5c8c2ec58be0143a0e9203d5d1f983c497408287325e76d738efb8 SHA512 4fceee78ba6e8bd03f6a27c83ddc4ec877112fb4e66ecd88f22839641e30bd46551c454600edb9e90cd0402361e5de4844249969fbf46b4f6cd96ff321b7e0f8
-EBUILD miniupnpc-2.2.3.ebuild 903 BLAKE2B 35ba634549aeac4dc665715d18cefcd1d77c5855909e583d4924621af98f0c6e0becc3285410f06f34723dd8b4acc57b35e4d6b66b3a7292909f7f1ec954d768 SHA512 21017a01191e3c0f8a198dce8a5ffbd22e1427ddcde6e9afbdc279f6bdf936e2a9bbecee9c8597a5121cfc931b22d34307dd2ee821375dd05d1f75737170002c
+EBUILD miniupnpc-2.2.3.ebuild 900 BLAKE2B f485cbbbde53e397cb545afc5a98993f893c4127d1b148aa565490abe3179f094d961e666d7ae1249554a85d6d21135c6650ce36d9c7582961d98b6860fa8502 SHA512 4137f08eb911b1b9d30240779c3a0346d3896beb8d6ac84509bfdc56f51a82ac6a8a338d87176845daab627bf318fd253eaa23022b5bc89ee10e62a0d84f4b7b
 MISC metadata.xml 320 BLAKE2B ad0563e313308b3f4e7449b7010821c45c720f90fa9dbcb72ddd82707281ccff98d0c9ed60083d3b3e6c650a2d4f57c83fc0194758e1fdbe7ea73fa0fd6f850a SHA512 72ea7bf08fc1d4a32c473d8e62a368e9e79b52814a4d40a3f0be85bc208e2a057895c8db55196c232564e4a496b5e2b19a1206e967450b715f059219e13c53f7
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.3.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
index 1c9a9048f4ad..9775eb42bd47 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f60c6fba9ce2..80f1c44929b5 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -13,6 +13,6 @@ DIST numpy-user-1.21.1.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b175800
 DIST numpy-user-1.21.2.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.3.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 EBUILD numpy-1.21.1-r1.ebuild 3726 BLAKE2B c81ef764b3a069469783d3c005894bab1b552e1d638f3bf21692e8b3116d54e71bc5d0260112467427a0fd5a4172db950dae4679706fc503115c14ee13f2c387 SHA512 4ea551537644b20d252e5056bf8704ce872af0bdbd058be17b27f65225c1f8264ede22a8e06c754786322970ccdb7246cfae41e3ddb76287bba77882738f800e
-EBUILD numpy-1.21.2-r1.ebuild 3722 BLAKE2B eb903b0e58fb7ceb475d969753c5491a693475aefc6f8e024e461513b6a748d3f2bfed9253ae11cb89d6670ef614f18089b464baf94ca342dc68450238682c2a SHA512 7ed5132bf063e30ed939be7998d381244970bbe7e9ed5f46b5af5fb469efc2aa4b0aa6d5db43efa77887c8b22c1943c668e1fe67d1a41cabff0f40e736825386
+EBUILD numpy-1.21.2-r1.ebuild 3721 BLAKE2B 28b9a634378c0173f255c3756975b32dd68fdf700f8f96846e1d7e727c31272b46d02f9dca3f76c852494dbce3b6f7296d035b85641333a4551b496b5252c0c8 SHA512 d3246d9bd9451f3d83f4025af22d11656ad0c7b37e9324d8d5acb4379e8aac0759a28299cf69f68e8b9211b464d33a0e986d40d32185fc1192720433598f8ea9
 EBUILD numpy-1.21.3-r1.ebuild 3716 BLAKE2B 2f47bf2dee1172e6aae91d8945ecc5067f795919c27465324b89b7d967f64c01a533cab1683259c92328682db055811b8f3da6f29c1ac4ed02d1ab05a2471c92 SHA512 5e0148cd7e35d81275e481890de5287f5b03fecac044e1eb46a73fbcedc95d7f12480433c977b66a3f83b57fd09eb506945efc3746b14e594fb643a405811ed9
 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390
diff --git a/dev-python/numpy/numpy-1.21.2-r1.ebuild b/dev-python/numpy/numpy-1.21.2-r1.ebuild
index 0802501003f1..43d5088c7985 100644
--- a/dev-python/numpy/numpy-1.21.2-r1.ebuild
+++ b/dev-python/numpy/numpy-1.21.2-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index 8cfb7959abb3..351b27d3fd26 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,3 +1,3 @@
 DIST opt_einsum-3.3.0.tar.gz 73951 BLAKE2B c8e39c9589bb6b89150fd5699fafd77c5ac6022f66d1b778a55dd61e606067be4b6df85972dd4078df084e34a39463f5e59d69426b0ed9152e93f93798417eea SHA512 f34c58bd3aa4a15794cfc604167c0e3175b9826da2a2449bb48ea5c3095f8215e3f990daec51e77e505a03204201694df1a09360ee51b8a4a793b9844d9c2d5e
-EBUILD opt-einsum-3.3.0.ebuild 465 BLAKE2B 16d3c745892adb8eb7da21d41d44fc54ddd090bc318e6060b767efd6909d43aecf9e472f48d821d42fbd3b58dc119178d9046405eda84e20a4fe7862c04423e4 SHA512 68a19c5000287d7bf522a2f380572151bff3a40855c370c7392ab9200a1a146094d167c81323e7415ee72e92485a0324434e219a59f33e3d09c7381ed38b9118
-MISC metadata.xml 471 BLAKE2B c913a584b406e39e234fee42b3c31cd1b51ab636617194f2d890c8c2c4a8fa32e3330d02b1cd954374006372aed343a183ca1e0194d7b51b71a79b388256c09c SHA512 bdb53f728b0e41a5954a479b93d130b8f280850238aa0025e652cdbaabba841459741a81ca071c9d495086dffb59da7bd251c7f6412b3300eaa938756b234777
+EBUILD opt-einsum-3.3.0.ebuild 488 BLAKE2B a5efe678127877b2eecb3f4c20280b786099d5a6553817157bf9615a84bc2ebbba54ce00ea86ff26c8351b5fcbaf3505f43ed3a21b31485ff81a21bba9f47524 SHA512 8a4772e19c7074f9f038b68bbade38c806ebf9e738c68530b3d24e8b6b2cd994a5135b78a160688cdafcfb4943edfd96a29324aa496f6b888d8670e0c898f2ae
+MISC metadata.xml 530 BLAKE2B 657b3a76e2d097512c79cdebe6f9eaf334c788b525e4c6f7a02ee90be68d36d19261972393a47739be4a8f405bbd07fa8678e9b84c8bdafb8c8808ccf4356ce8 SHA512 0301af745cbdad5ebfc9f87e07f5e0782cc80d6dcf449402757267e5894ecca087f169dd68f9e3aa33818fca3349e90ccd421c8e19edb00dcd8da67069aa044d
diff --git a/dev-python/opt-einsum/metadata.xml b/dev-python/opt-einsum/metadata.xml
index d9e9c889794a..551209959880 100644
--- a/dev-python/opt-einsum/metadata.xml
+++ b/dev-python/opt-einsum/metadata.xml
@@ -10,5 +10,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">opt-einsum</remote-id>
+		<remote-id type="github">dgasmith/opt_einsum</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
index cbe9bf30b1bc..0c44a6ee477c 100644
--- a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
@@ -3,17 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
 HOMEPAGE="https://pypi.org/project/opt-einsum/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+S="${WORKDIR}/${P/-/_}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}/${P/-/_}"
 
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index dcc3130ee83a..0de13cd9134a 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,4 +1,3 @@
-AUX owslib-0.20.0-no-privacybreach.patch 1213 BLAKE2B 482a7cbbf12f335aa9367a1d7e311f625069c197b48fda85f063e0f227c2c2300b481b8b71f6572f71a8eb1ac55ff9738c14857d7d99c35423e358394045c628 SHA512 da4955ad7c1175929f3d303dbd7e3f713e26742b270c060b182b158ad4bfafd6e14aaae09f209a12682430655103e6c943ff24a1cb13b6e2bc5aa14a3cc7dfac
 DIST owslib-0.25.0.tar.gz 936550 BLAKE2B 9cb34a6c7c93dc89a466c13351d457c9372d405055fa3f6cec9c05c231e76762168c6813085523037b3a6439100500c46c1044569bd2bb598c3e2e63757d8b86 SHA512 058108cf77197ce24793608869d56bf0467230f5f231ac9ba48445f2e02d07ea1e26be03ad6967504a1e625008ae2768ed2a663f3b7a49dcea410ee4a8b40cec
 EBUILD owslib-0.25.0.ebuild 1008 BLAKE2B b37bc0a351127e7dbf203fb0c3c92f17e0acd7ef591fa70922e0ea1e249a5c2d1ff2d1b7359aec0e63a25a72ccdfdee7bdc62694ea084b772c2f29a96fd1ebff SHA512 288045a3f8840f587c06290839eb70d37b4716946ed55cc669759b3ce3f062c561a2a7fc8a7f3df61aea892acbdfbb293f5af9e1e1bc6325e0c54392aa753c58
 MISC metadata.xml 520 BLAKE2B 01705147ed084a8215d15016b6cc94b2fcdc926eff2755cf2d4c768197d0c39a30a8b0602d93bac7ec221e32c30b9280b37d5736f2f46342ad36e23c1b4a7c1c SHA512 c146cb483caacbde7966a95b899372261493543826cb20d638cd91e7cae245d60f1504bc53f485e35ca5d6c3f83780fc1da211c0838c604dafde27284dd8e40b
diff --git a/dev-python/owslib/files/owslib-0.20.0-no-privacybreach.patch b/dev-python/owslib/files/owslib-0.20.0-no-privacybreach.patch
deleted file mode 100644
index 45bcb8b38d18..000000000000
--- a/dev-python/owslib/files/owslib-0.20.0-no-privacybreach.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix privacy breaches.
-Author: Johan Van de Wauw <johan@vandewauw.be>
-
---- a/docs/en/index.rst
-+++ b/docs/en/index.rst
-@@ -5,11 +5,7 @@ OWSLib |release| documentation
- .. toctree::
-    :maxdepth: 2
- 
--.. image:: https://www.openhub.net/p/owslib/widgets/project_partner_badge.gif
--   :width: 193px
--   :height: 33px
--   :alt: OWSLib
--   :target: https://www.openhub.net/p/owslib?ref=WidgetProjectPartnerBadge
-+`OpenHUB <https://www.openhub.net/p/owslib?ref=WidgetProjectPartnerBadge>`_
- 
- :Author: Tom Kralidis
- :Contact: tomkralidis at gmail.com
---- a/docs/_templates/layout.html
-+++ b/docs/_templates/layout.html
-@@ -3,20 +3,6 @@
- {%- block extrahead %}
- {{ super() }}
- 
--<script type="text/javascript">
--
--  var _gaq = _gaq || [];
--  _gaq.push(['_setAccount', 'UA-32866201-1']);
--  _gaq.push(['_trackPageview']);
--
--  (function() {
--    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
--    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
--    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
--  })();
--
--</script>
--
- {% endblock %}
- 
- {% block relbar1 %}
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 9fe3457413b9..79b2665bdbdb 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,3 +1,3 @@
 DIST pickleshare-0.7.5.tar.gz 6161 BLAKE2B 9c9327d16350b6610d9e7b844a70352c802463a110c13c670cfbd6a6cb0e82d8dea0f9eeac83cda65eeecbf27a2b8c4b1bd21809117c07eb1b67a03d3679c4b7 SHA512 6048634b7c08b6997b75be1d8fc53dd3218294e1f04c5e287ef3c6e4d80da6746fd242980f58b9671b4a4cf639a64bd25861b62fd28d435bfd2386fa655a30ff
-EBUILD pickleshare-0.7.5.ebuild 517 BLAKE2B 2cf942cc4bbb9350352bafb313f6b0fb73d1914c2e32f3e1a025847b3b763de5f1ce83be13878a01afb633b21e7c17cc8dbe71fd0ee52236022355f6ddf16822 SHA512 409f3f1908ac448ce73291142fd2e3803858953fe5987624314b1069f755900137c28b6c8ec1d9b8abae6ea37a84a84f29fa2c61ef0a1f6d332ccfc74ea7d596
+EBUILD pickleshare-0.7.5.ebuild 523 BLAKE2B 9bdcd7be117acc868ffe52845f6b87c3f4d10b53b2de9852d3eba39baef7ca2a4b1a638cf8149846282748a47ad1dd3b6a0b916ed5065d879e5a90a02d1f236f SHA512 298070d4b3618360995ce36e21a8148f5cfecd8e872ba3a3f98f1362c4569472216b6cf1375480952168ec5c71a331f6d241c3e16fc9a3b9161cc2e392f94ea3
 MISC metadata.xml 970 BLAKE2B 834db945c8e9c90ddcacf7d001f108b9e26321a155a747f5c7f00068cf915590813d1293afa5f0516233ab52d9a04d73091793bd945fd6e9a96cf51263fa8dd8 SHA512 12a8f50cd4f8aba47aeba2326400d488051d92ea05336b91d59f10e8c2885d00b39a453455c748ff1777a339c39ec0f5273126e719cbbcc8aa15503285b220a9
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index 564b35aa6ed8..0e651b5ed909 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 8e735fcf2859..87e01f17d1da 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,7 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
 DIST prettytable-2.2.1.tar.gz 45102 BLAKE2B 59fe355603791c8b3a584b1d1f2864559a7e2c7249923d5299c967db74dbd37baef9557d8d5511defe54f64e3f4625ef45635cf2f00a051a599177a3774da1a5 SHA512 5496b1525342b9df4b88cc2cd6079d8c329787b20f7e581465dcdf447b90f78aad764c6505aab8a0e3c4cbb44c943720672373cf754d6f7313b68c28005a707c
+DIST prettytable-2.3.0.tar.gz 49386 BLAKE2B 368dd454da9dde3900009ed52c0d55c30ed69315b36fb53eaebc764af419851b858dc648ac5d8ca62592c2aaa68dac91ac03a1a1bf29d10ee5162981f2937c22 SHA512 feeaeeb0a1897c0aaa2bc0ac7f470244529e8c70debb26976494719607840c8b8a80698b7e463402031b250fe152091e947555be2a6f983764e01bdaa1a71a22
 EBUILD prettytable-0.7.2-r1.ebuild 606 BLAKE2B 5ee8d1567cbcc4ba9ac75bc7ade72ee37f9dd658bcbcd8097ad3104b021e121b02fc93dfa31ffd711afceca065b4b9557ef8668e7b6da73fc01379a16f152ae0 SHA512 1a1016c21f70ef304875c21a1a2660c0433c2e68ff2d630695a123b581b15d0846a97d705f7f91ec1a4f3010fa90baf28e4c7fc29c42fb3ed63d709f10ccbae8
 EBUILD prettytable-2.2.1.ebuild 809 BLAKE2B 90b9f97cb7f30cc80d59bc6b7055ed536c395fc4b93d4d481e340ae358bc8bc67b793dc37471fc0f67cdbcbcc6c63fc9bcf471a90c1c691a8d7302ca274eff6f SHA512 7c2fa538d1e7d9d9a34a3d30ab6c4299c39adeb37d0e8ea51b839679d30384dddf580d2945d2c39f7ac56b684ff470441bd70e1d19ae6c8805b4029052b6b049
+EBUILD prettytable-2.3.0.ebuild 783 BLAKE2B 2e77787bc3819eacf104528910299f6cd0c5c05987fbed50a6d6adeaf1c8928bc0902e6c0d972f9873e025b3ce852574ff632cb6d927fb6fe64c1c64f149a069 SHA512 39d42f57786fa59302e6c7794a044b7bbd134fddce101c240b60871febe8cb6ab9a99c277449d32afd5f4989717e378a6cc18b5f39a954063f579b1d495b7881
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-2.3.0.ebuild b/dev-python/prettytable/prettytable-2.3.0.ebuild
new file mode 100644
index 000000000000..0ea97628ed56
--- /dev/null
+++ b/dev-python/prettytable/prettytable-2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="
+	https://github.com/jazzband/prettytable/
+	https://pypi.org/project/prettytable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index e4492decec08..54116c722461 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -3,5 +3,5 @@ DIST prompt_toolkit-3.0.20.tar.gz 3037349 BLAKE2B 52773f9c277d1a16adca007c19d087
 DIST prompt_toolkit-3.0.21.tar.gz 3041438 BLAKE2B 67ce3749404135a16e8b3d032e088e93aa12c851142b74e3ddddcf66713aa1fbce17231935bb22f7e0fda3f86af3da7dfefea612dd0fde7f1da407e2a72cf26d SHA512 46e43329e35b3eadb39c7f83501577cc776a2899005f9a7c299ee9e31eb6fba5e3bf8da33e0092fb1c20367f01518a3079fc4ca92ddbad0e3dfcbcfb1fd3be03
 EBUILD prompt_toolkit-3.0.19.ebuild 612 BLAKE2B df5de2b77aff12ddb7dd80d746931e589e5b2ba4afca55da906d504e8f73402fd7281f79abadcce8af4255bc1fa804bd54255e323871cf0e397adf72cd0dbc3c SHA512 91e0b16cb8d9e1cced54bd4342670d4a4eb86a7f27cd926dc016b893ae88db7d1f0af68ef787c6ce1d42664b43f3cde1ac1c13d11bab8debc43b6701f8c25a6d
 EBUILD prompt_toolkit-3.0.20.ebuild 620 BLAKE2B 27d958dc82f59aad9395079a22b226225ded45fa5d098736b02c133528d298821b741e1cb49e266f8b87efb3bdc2f93b9d0b27734d28de311f0fd1b053321638 SHA512 3146f81ca228a7bc5687bafcf34e62dea7a13da0ed3f86b123c5607a41c006ed12d712a4208b41fe17dec7e4bc7e5dcd739f076192b173c1c9d992a2ae7e1273
-EBUILD prompt_toolkit-3.0.21.ebuild 622 BLAKE2B a77d4ae7baf282ea618c76b7f63d1506a8c0710519c2be69e38e5e040f08f2bb55dcf9c0cfa658556f1266709eb9a29899cd04fb611aaf2b8316102fd65157bc SHA512 170e9d8d4f11973b1634d9eb1dd62adb402ce0e8a17cdf869ab09bd813b476804e3cbf5081d7758408a7768b83fe6d9d7b7c507ad1167d4685b2a33571c6051c
+EBUILD prompt_toolkit-3.0.21.ebuild 628 BLAKE2B 31e483c177ac9002fd48bb3e7cd4eb6cda3ad841dae4f43f428a01b0a2e2c86028ed53364a65495742c2ba43f9e5f28825a77c2b7a713f87e6a41d723fa544e8 SHA512 d24e8017be8e63b91a266567a1ffa7b6b6794ca1a07b958202af6f886c1986631abd9caa8bc5055f7e55296227ba3bdd44f7bf2ebc9b934d4376a99d858ebb7f
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild
index 880a84917d1e..8d7e4ed391f0 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pynest2d/Manifest b/dev-python/pynest2d/Manifest
index d11801af7778..4af3e3207fbd 100644
--- a/dev-python/pynest2d/Manifest
+++ b/dev-python/pynest2d/Manifest
@@ -1,5 +1,5 @@
 AUX pynest2d-4.8.0-fix-cpp-version.patch 516 BLAKE2B f10567673b4347a45446de9f97561faff615685df9027cea0f2c3625ed8ecd4df1ae80981da0295ef0795529795295ebb37e285f6926e3d1c69fe70081aa4b03 SHA512 0d01349a110bc2cde6b7279ba8b8d60cd71c599fe10054e4082aac86bf4e30184959dcfcc795a63ae7517845c014b14db029a6070833696191d874dbfa24ed30
 AUX pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch 1422 BLAKE2B b42ac90f1182e38d31e9dac877d8e94baa01db734dc31381d674f000a9982ed65f316c4613f0cfcc1910ec086c3e3bf51cb08d4d72624fc684ec658a8260f8f4 SHA512 2957da641a52a457254bf53a83a7f83085306f2158ca814feeeee6a230c4d6b9bafb29dd0aeb7244857a4152fdb927fa02085d2a19b77b8f990128491a051ce6
 DIST pynest2d-4.9.1.tar.gz 18252 BLAKE2B ea98af68e7b60d615eaf6e90a68b37f8e26aa181fafecc2470b5d93d1d20a9667f5a8c903be87d419cedf47befd4e9ce757a90880c0ef19e7bb920147b2443b2 SHA512 f208e13cace4345fe691beebfe61895cbf81b7f90c19adf6a63b592928abd8591fed5c10e5b12d60c375684398856ea8d569fe8d1893a049e45d89b0ffcfc51d
-EBUILD pynest2d-4.9.1.ebuild 712 BLAKE2B 88abe1ebacd98b606b5f63693037914521673c20fb05102d0049ed7c7e56740cf14bdc048cdd3b69d0e7244b8484370c20ec6ab66c8365ef25c92fafe47aaef3 SHA512 8caee389b39633a187486b9260cb2e859efb10d14ec44190f6e560fc50e843720ed4c1a3a1fbfec3e73cc4ec05333ad5d366ef46512c8437cc36b51e0fe03759
+EBUILD pynest2d-4.9.1.ebuild 713 BLAKE2B 45811d912c37008a210f1b5bd6d4b2c43214c30c57698d6ad8409b5c98785221194b606b9103246bbbb62b3672c83ca1a02d3d16ecaaac71ad03b2ca29958ca0 SHA512 22af425ddf9f79c1ec2307a877e6fcdf15ca734ca8ee917dbfa45e75f1dc14f88eb1943a8e6f3196fd77466210f862f29148e413fb530b10cfc5abc11301538e
 MISC metadata.xml 410 BLAKE2B ca450f3ba075ee6d2fd14a913b4ca7490b1be6181cb5354fc4dfc05ba6813630c38eec71342fe3b7108ee20a16ea3902d72833d697f6816add8ecb498271ba23 SHA512 95519c23b3d8783c70a770ead0dca24c6afb917a864d15cf712f99a8303c5917020f1eb0d227df8782d163cf1bd09bba5b9e2a0de6bff0c5613b82b370746c6d
diff --git a/dev-python/pynest2d/pynest2d-4.9.1.ebuild b/dev-python/pynest2d/pynest2d-4.9.1.ebuild
index e6226da74083..d7a3591a7c44 100644
--- a/dev-python/pynest2d/pynest2d-4.9.1.ebuild
+++ b/dev-python/pynest2d/pynest2d-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
index 5cdc5c68f773..95470f272030 100644
--- a/dev-python/pytest-lazy-fixture/Manifest
+++ b/dev-python/pytest-lazy-fixture/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-lazy-fixture-0.6.3.tar.gz 7878 BLAKE2B f3a034678f590090a453b44b9fea938ced040c80922f139f3321ec20db856be219d039c7f4199ef67af79b5008d37425b5c08a0edaf71fdd7c8f248702acf488 SHA512 3281edc516f21f23104d7fc188b5c9aecf364f55109dab52865cbfef4a540727eb2bd42fb9806a7e8be728b249bc7a224ffdbab96473f043bef9a7aea1e4baa8
-EBUILD pytest-lazy-fixture-0.6.3.ebuild 467 BLAKE2B d060f6c8374d387893f482baa0409b5d55ee590855198ad4a7e620291d5ae91d9153b5cc98fbc72fd6bd20736fea104769d779210e71d8d62c54250f8aba7d81 SHA512 a90acceb888748b965b8eab03908faca3e51cc9db4940e31e8990bad74fc6e81e053f9ab39d92deb33659fffeb82585c0687f30865ea0fc1c196fd0c1be14fd5
+EBUILD pytest-lazy-fixture-0.6.3.ebuild 473 BLAKE2B c9cd67ae7484415676f1c5f30e72df43a2c269f6b5022bc8c8af69e4183b27a67bb25f01045f8418a36520a601a01933cdf38934ec84336484659db795ada43c SHA512 a7319c38f295cd4d0b9a894d93e1051c5224b5e7695be9c8b83f96d46e16cd7d8042a6e71a519b2dcb9a14181688fcb96851dd2f4d7fd2431b7bb31ec95061ea
 MISC metadata.xml 466 BLAKE2B ed3b8b14f649b2bd165f688ceddcb7c75846e3ec75c5629678d1777d9d2df8e784b0c076d497a38dcf457607d739710c8d6f7069643d802d175ca8dae5f955d5 SHA512 09173c651b8b9ee5ac5928117da08ec7a318402bc76e94c14c27116f6a44c07a8a85f83d222de9a5fd09f1224fa256ae2338c5021e6d4893cc8ce6a1b1540b39
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
index 5b7c8f820706..2b9279fc7fb2 100644
--- a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="It helps to use fixtures in pytest.mark.parametrize"
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 44fdc80e0a77..9283ea41f26b 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,4 +1,3 @@
-AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02
 DIST pytest-xdist-2.4.0.tar.gz 67199 BLAKE2B bba867bfbd1e161ada2157fdb5a10f929fefed959b64afef74453206d91e5014abaaa1363ac9adbc89ed476a841607f6830781817842b9be119a09bda7278b91 SHA512 2d2da6aaa8da07a28d7c6c81a0044493b7d0d1a68921e7ec94cfd2f698eaa5594b6da4d82524804637d5cc061fbe19034f3c65a07ee5a0c906170856edc3d383
 EBUILD pytest-xdist-2.4.0.ebuild 1158 BLAKE2B fd617b12aa19dec1f7f85bce83025ab6c0ca8d913e8a8cfd1a3247c7cedd4cbb4a0d9aa97d6f8e497379578d0e2e7dc322b96d5db2c4373844a195fdfee4be3b SHA512 e37fb1565e462690e5cecb8c70fe4013fc8033d071dd1c83ec9f11215b2ea0508911c3e284907126c80496d4a1985077cf710c827bee1b1e640fd004038e85e0
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch b/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch
deleted file mode 100644
index 2c911601b070..000000000000
--- a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 082beb2ce0fe1f338311d85e656b962df8a16ce1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 15 Dec 2020 11:38:53 +0100
-Subject: [PATCH] Disable pytest-services plugin in test to avoid worker_id
- conflict
-
-Pass "-p no:pytest-services" in test_worker_id_fixture() to ensure
-that the presence (and implicit loading) of pytest-services will not
-cause the test to fail via overriding worker name.
-
-Fixes #611
----
- testing/acceptance_test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
-index c273bfa..3bea8fc 100644
---- a/testing/acceptance_test.py
-+++ b/testing/acceptance_test.py
-@@ -1025,7 +1025,7 @@ def test_worker_id_fixture(testdir, n):
-                 f.write(worker_id)
-     """
-     )
--    result = testdir.runpytest(f, "-n%d" % n)
-+    result = testdir.runpytest(f, "-n%d" % n, "-p", "no:pytest-services")
-     result.stdout.fnmatch_lines("* 2 passed in *")
-     worker_ids = set()
-     for fname in glob.glob(str(testdir.tmpdir.join("*.txt"))):
--- 
-2.29.2
-
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 95b94dfaca6e..c0b8dbce737c 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,6 @@
 DIST pytools-2021.2.8.tar.gz 63381 BLAKE2B 975a611c0ee7b013facf9754926d52e66184d69b9bbbe3ddafd252d0c0bd093c11cb91140879e2660b7e2a4f2291b58f728b2e19add2e205653df59a9f2b7be2 SHA512 9dde96889c3505f5cf4eb06c3174b889ed8ecc964ac95d8cbf36ad500ab23470c5ee46b8f96bc4fa5d2dc710d3603680643a61e10bac4da8305d92b1e3ebd0d8
+DIST pytools-2021.2.9.tar.gz 66254 BLAKE2B 576e10a1ab823827d030466a2f39ec5510c02a856288d840904a5d3b612191d2a108393fc9a73072b8757e7729b4ead84829805e8913e4c54949465594ac8842 SHA512 1afe6feb6e5094171aba9a2749418a5e677cb70286be1ac9b65d1470835e1ae68f72f7c4221149358ab1595cab438688882b51682c5865955edf89ae32ca6d6d
 EBUILD pytools-2021.2.8.ebuild 551 BLAKE2B 9679116e983c06b650ade862f561ab68bb164915b71fc032151f7866674b3818b3609ce2eb05dc89ddd906f94e5a5be883ff5d317f65fd09f63f3b35aec4f98e SHA512 b17924ce980dd2424ca2b57e0d5416a98f2d97f6ec08b64767527d06631c9d791abd4696e92030d0419682dbc70007267747b5ad24edb7c3dd3635349a351a6d
+EBUILD pytools-2021.2.9.ebuild 552 BLAKE2B 8ed49e0428f6646baf0aa74bde7effa173a68139d81b4cb9a4da65c24472eafa7965a5707ba1eb0f44f13985a3f3282056ffee25953c38e24824d826cead0972 SHA512 b82416f833ae16a5551642d06175d2552f7e1d73bab5db51e29cde8f56cd9e9b994e2c6485059b27092450be1b4814de4c8a8f4ec3645670d2c3084ebfcd79e3
 EBUILD pytools-9999.ebuild 540 BLAKE2B 79935eaf65d8de5623d628068ae537aab12ecc18588272ced9da06c7c3f9343cd83423baf7c56308fa596809f4b2f28607b5f7cba9810958df8ca8157751a3dd SHA512 41da1b9e57b251a497a6040bb95503534a262b1481dfc92a52534874d7268857ada753d36cad384e78878c05221bfd4efc0f427538c829add7be996f68f28d43
 MISC metadata.xml 395 BLAKE2B aaf2add895c8e4001828d7b4e34a251d6690ae783d129b5a75e7676aca5f7e655597343df4eba3dffd40cbb9f4321766885a94ef8ae5c31f57aba4b23b8d6d67 SHA512 3201eaa7dccb492b48ec3143ed91696519c420d99d453e5e2a489592c50e532c7c270be8c6ab8c09da0eb8dac85dad9ba3ca0c98ec57b5fa850efb912c557917
diff --git a/dev-python/pytools/pytools-2021.2.9.ebuild b/dev-python/pytools/pytools-2021.2.9.ebuild
new file mode 100644
index 000000000000..5400173d9dde
--- /dev/null
+++ b/dev-python/pytools/pytools-2021.2.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 7254f6ce9336..dc219ca6341e 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +1,5 @@
 DIST rdflib-5.0.0.tar.gz 818586 BLAKE2B d0046590b00211ccb4f0f586dc829c061a5f426b1cefed44a63d21d46396354b9012dbe0a63c8f9de138b25ca7d73ba624c49da6fb305ececd983c62c917fd8a SHA512 ba98ab6a7bb9d993d11c559a739761f297282eb9307f3e333db8dd1c6b365b408a59b701d823bef9be774a59b3f44f64c9444e3bb0115c0c549cb00945385dab
 DIST rdflib-6.0.2.tar.gz 1273100 BLAKE2B aefd98c480710ece6fc5e621ebc0526eb24c61d36872280aa369baa2ce5bf90173190fa01d592861d2d6a9700fe9fc43a9ebe6d0b1f68851442e860ca702bf31 SHA512 0d14902d24582aad01289f5265feba3c533bbf5a0928b2e1032ba0af16d16cce46a92bde0f01ec2980351c1c13fe2cf4113445d2731e04400f0c20de73efa050
 EBUILD rdflib-5.0.0.ebuild 1209 BLAKE2B 8c7608e445a10f5ee8cdf04d44d0055ae1eca18b6af29bb7eec75fe1ada154510439818822cc2470976628e9f226a6ebfa4a0c0f564dc894f77a6c6196fd2671 SHA512 d45fe4ca9a55f56d9622bbd0193216907796e4b91e4d949df0a93ba8eed8b58f30995fe74d8eee96da7bdf3aaa52f4bb681cdc4b4b3799b7029825eec8660e5e
-EBUILD rdflib-6.0.2.ebuild 1299 BLAKE2B f1c05369e7c38bd568dc63a8a930564a955def6e353eab498b77814762acb303e484bde37ce0700a3ffdbc4edeb5b3d8eb967437ee4bbf395d741d5a5bd2d79c SHA512 d5cc4e11070f70f3d274b921eaaa1b604e17f4cf02bb05b5fcd1c8a97f5f7f8858ced9429b49618953bb4bd49eb729c04ca342f3751d6c56b6cae0a6e6f5435c
+EBUILD rdflib-6.0.2.ebuild 1311 BLAKE2B c33814cdc50ce492d5ea03af76b55b1b45bc3a0fade7187224c4d9bf6c19cf87e06d7de32ef1c85c7b33cb4cf5d2b87303e5ff1067e5e2238ff21c953689fd49 SHA512 f452812e17101d84525fc191808940991567222b64010aafe4a253b20835a9fd61503164ad0de93c0420eb42a360a8509b597c6174fd4f5da106a7017d9e5e8c
 MISC metadata.xml 400 BLAKE2B eea3d3a69375a70a1c4a93cebf48169032f9d7cc6ba5df0422bad8c0f4e1caa10721a42b66cfb0dad2ab85aff38f826a0790b4d2dbac90be16e88ecf507d9025 SHA512 d8b94c9c8c037f40db80a44d235ada552851c3b979f496462e19a909eb2b46f606c23458b20869060b596969015616d065b2df0f5b24d2b3d7224afa6089e8e7
diff --git a/dev-python/rdflib/rdflib-6.0.2.ebuild b/dev-python/rdflib/rdflib-6.0.2.ebuild
index 2895873653e1..6f38b57fde6b 100644
--- a/dev-python/rdflib/rdflib-6.0.2.ebuild
+++ b/dev-python/rdflib/rdflib-6.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="examples sqlite"
 
 RDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 63d4d379ece0..10b937be93f4 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -2,10 +2,12 @@ AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fc
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
 DIST regex-2021.10.23.tar.gz 703746 BLAKE2B e26ec50994375f8b128206743209dff1ceb760b67967ff66d2553c1da27840e0df1611bf1a2746fd26246d3ac8b4a3974c98c8b4d4ede4e6d7954875c17b2405 SHA512 6bc67a066a7f33f6567a672132b1b65d89b21152d5ec3546262e542413ce40999ad57fb55eec92b9f4010489968b6eed1dab27efa63e14b771d883a890ddf9ab
 DIST regex-2021.10.8.tar.gz 703541 BLAKE2B da2a35c0f95c208fe2a9951d4c8cf756cd9eecb3ff27c5d729e9b5702256cc12bdde896019abf2aa12d206cbaace0fa693be332ff8d8baa5e6e628866eb64dea SHA512 395fbef61d54fad539bbd1e51c9100cba02bcd3a147e95a32ff8c32cb7fca66df98bade638e24f9a5c6e5d6c7becca033f925c4fa675b4e6689cba8316a8b46d
+DIST regex-2021.11.1.tar.gz 713328 BLAKE2B 165949eed94deb7ad6a12ca8e73f99b2b6aae26032d6545e74a897c25b32101707d67efba4cc936cdcad361a799e5742816178f0157d37e1fe9876c8cd4d60f0 SHA512 98efb00a88548ec63759f82870775d192ad2456d6c7b6362837e66980f029356fc270e991cf40ea049ead4c98d2baf8bb9a19b118ded7fb24a0bd6efcc1f6916
 DIST regex-2021.8.28.tar.gz 694689 BLAKE2B 1aeceeb77df3c67e3ac14811000dc0f0cccf2a4994fd349f01f3a4e793f265dc9a73ea685202c6a7af8f507f0db94d6b74b1ae448ce58dd985ca4122c3454cba SHA512 da95f8ce03200f45b6be8730b65d01170847d074202e9b5f311688e22e3d59c32a8ff93768e2ac0105bac02936cbcde49eb114b762e89e6ebf895d8b799b4bf9
 DIST regex-2021.9.30.tar.gz 703504 BLAKE2B d958fa97aabb4c25c424591cfc9b6006c72e72d33029902a00e705c0db6786dcca92b006c4d77f98b0dd183405f63e282f33af75361d20d2b61f65d70da40da6 SHA512 3ce87e01a6e90a2519046595548f9ce38fb177db0d5c2359c57df857a2a9f14be1c6d228b7bd724d5bd66f723e33fd6056180fb45c50931bb0ec5e723df2f16a
 EBUILD regex-2021.10.23.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 EBUILD regex-2021.10.8.ebuild 859 BLAKE2B 77a0bafb82852650fecd29f1d0d9d380029dc15aa117d496b4fc6a5025fb263a6da0bf6ca8baaac886ffb6f920e9372851b9ca629c89d88ec6b27b04483131b2 SHA512 e5cdc1b24844d406d3c79141b9e318e7ff42e04e7d23709382ecededb8421babd288a5aa12725e3d05b244f3f8cd31f2cefb11a6f1c9551665019cfc22fb0179
+EBUILD regex-2021.11.1.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 EBUILD regex-2021.8.28.ebuild 858 BLAKE2B caaeb0db90154588d00da89b05f0d7310cf8c9990ee7172b47f3c166daa56559d81b83811960174a9134dcc6f7d481e1271986f7ed94a3d7039a81080837564f SHA512 e4b91c910d1684786ab453f47ea5f3939ab1d5d18ba7383a7108a086b1bdc256abe05fd096212b186f658658589d04459f0a4b581b7e421b262c9e13ffe4d5b1
 EBUILD regex-2021.9.30.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2021.11.1.ebuild b/dev-python/regex/regex-2021.11.1.ebuild
new file mode 100644
index 000000000000..67c833d04b54
--- /dev/null
+++ b/dev-python/regex/regex-2021.11.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 4a79bcc15065..089f84b5df8e 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -10,5 +10,5 @@ EBUILD sqlalchemy-1.4.20.ebuild 3127 BLAKE2B 1eab3aec274e4151fdf6fbc3dcf7d6160da
 EBUILD sqlalchemy-1.4.22.ebuild 3135 BLAKE2B a33219c712e87ef93f1cb549340d04c513222878fa3e374824158711407272be30f64d865aa2a5a5e2e30434c79728bee719214a7d1f9ce8c077d62842727037 SHA512 390ac7f5f6f607d2418b275192ef2fd53387fb9ba1df6f4ed4519b9e512bc98bbf2fdf49b6ba09f36b2d568a9f882752966e3727bf925c9c5d1c4d70afb37f16
 EBUILD sqlalchemy-1.4.23.ebuild 1561 BLAKE2B dbd9e34b6ac33894ffe547827b8fad24fc3e4194457e7ca83a2645fc45f1abec67d3152f9a69cb6bc64d3949bf952ae17b4b823252efa303f4f48409b709cd61 SHA512 016509c20424b3cbedf3dccfa96a39d59427e43dea14cc938471c005903023f5d0dcd04caf7153319310880ffb0320539d8daa32c02d97e75a03ccf04b9cd93c
 EBUILD sqlalchemy-1.4.25.ebuild 1558 BLAKE2B cc6d1a53451ed1b8b6c3d538de7c525251cdd47b38156149131bb9539f173406e741d68709f3338615c7740912c891c26f8fe94dd40ffb6d0e5db30e202c2bdd SHA512 bb73b56dee4b05ca4db6af151efa64ab9705f5f7533912b824e68a9e1b487eeddf765ef778473051b8987d9823f0fe521f5af72a85d39d79d05e58d079486727
-EBUILD sqlalchemy-1.4.26.ebuild 1349 BLAKE2B 7ad1c4e8df10aed258a8b1c308546dfb5376d5e35d3c6982a5158b3f4dbc6cd2db260c7f693cb2b62d15c378a5e5416783776bbe9c0a4e83919bf6495fefcdc3 SHA512 20be1ccb79bf7999692ccecac1add743ddacd517d29ad56cbc879b25ce90be95a885aeea10f7cd5b359318bcc925a9f714b88c373f613431426714577825837d
+EBUILD sqlalchemy-1.4.26.ebuild 1348 BLAKE2B 8443c938e9317d68ce944effc05cf2eea845e2cc92b59c4f0eb65f14a0a576604b80b727adcf8dc3ec5402d3fd59d38f3f9c6eced2231e9b8283f2180e46a15c SHA512 0d3a2a099040c67834a08beb899de4d53299b57649f9a5798cc0295c93a8cf5fa26f751487ad1bfc75f23903972b668fe29a899f6d26ced7e2dfade01e1446b7
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
index f739ff2527e2..c65335ded350 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
index 6b1ff495f0c3..de869a2e73ce 100644
--- a/dev-python/swagger-spec-validator/Manifest
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -1,3 +1,5 @@
 DIST swagger-spec-validator-2.7.3.tar.gz 21364 BLAKE2B 05e4d3281c112895eff88050f1902161ecd661c77179f9421cd1335a04e759a67480a53858977a5b8ad4b2ad749c8940e01a646960954ee1006b3e75481c5103 SHA512 182e67f6b2a83c61a2ad452614557cfdebf72e30178f3882ba27a55bcbc475c34a02db46ed037065e986ae24970ab398ba7992fbe1e07f7b45cfb5ddb0379759
+DIST swagger-spec-validator-2.7.4.gh.tar.gz 47446 BLAKE2B d284bede24477cfc942d094937cec12224535902383779c223899ab7b359ea45427777ebc8d5f264a76696eae6746b619d35824090ae2f87c6acda4ef040b293 SHA512 d65c060f4730413280a188b01cf62d0f2d77fa04461bb60f2711d1806be2e7b8de16c23d952440a838f57acd50294a16114d34eeee988902fb90c099404c7942
 EBUILD swagger-spec-validator-2.7.3.ebuild 629 BLAKE2B 9b8f01c0567dbfdca9f19c65f6518c48e5a0383a215827831e2f3f99da73ffaa35d0f0d53ba687ca874c5a6b50bc6c52a3a4916700377a0a309ee1fa2b0be12e SHA512 b70b75812f8e928097cca4231883995022b1e5d4f65b79a48dbed5b72f2ca0bd7f46f8a308ee7c591ffcc1258acb829ac181afc4d378087b85cf04b141e39342
-MISC metadata.xml 253 BLAKE2B 53bfdd128826551552c15317ce55ad4915d2d5c2dd8c8811ec923052248ac00b432141003d8b2a3dfe21b9c831519d9329e2e727a89307129319e2c438cfdf34 SHA512 0f0b4669f4680ba1750b507eb44ec589a32989146486068ddd88b0dc163b8a813a6448e64f42662099bb9f6a1d1d3ecead0129ca0d99910c15fdc0ad8c91a886
+EBUILD swagger-spec-validator-2.7.4.ebuild 711 BLAKE2B f4b1c76d7ea34c9d34a2697db1aef95689ceb304dbaa53f39e8635b403763d004eb6c565e08782fca02b4a4665511a5a67ab9d01c9bea2021295d1bc932ff208 SHA512 191864e00edeadfaacc5c01dc76d5cb7ed8b1800f4b191a4bdb0f511c79bada4e06a534a16b10487cafb38cc5f610d721226057c6c9200b5a689dcc56d61df64
+MISC metadata.xml 344 BLAKE2B 0516900540a559b18ec79bde50143ca58ebc7876d15e62967fc7a26405bf8151bd375c8d6e14e89377073969e339cc79481c1361f5ef55727777001a99380b08 SHA512 75f643fd37620ed95d47d68eb53b4f439074788a5a748451cc42625e588c956e22742d3c4563eddc84440d71b3eace1559bd2a8e82e8292448c600d1aa1202e5
diff --git a/dev-python/swagger-spec-validator/metadata.xml b/dev-python/swagger-spec-validator/metadata.xml
index 809a49444e60..e8e3a986eb0d 100644
--- a/dev-python/swagger-spec-validator/metadata.xml
+++ b/dev-python/swagger-spec-validator/metadata.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">swagger-spec-validator</remote-id>
+		<remote-id type="github">Yelp/swagger_spec_validator</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/swagger-spec-validator/swagger-spec-validator-2.7.4.ebuild b/dev-python/swagger-spec-validator/swagger-spec-validator-2.7.4.ebuild
new file mode 100644
index 000000000000..e78ec11c2bdc
--- /dev/null
+++ b/dev-python/swagger-spec-validator/swagger-spec-validator-2.7.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="validate Swagger specs against Swagger 1.1 or 2.0 specification"
+HOMEPAGE="https://github.com/Yelp/swagger_spec_validator"
+SRC_URI="
+	https://github.com/Yelp/swagger_spec_validator/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN//-/_}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index d3ec7db31430..eb6ff0bcb30f 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,3 +1,3 @@
 DIST uranium-4.9.1.tar.gz 1038046 BLAKE2B 3304e89e0a22fbda0e9e57aaf88f6f11979eb5273d6c8a69f5ec9f050741561f67667a76e2136148808862026e2330f3b5043141ed8d69d255632a8c3c869def SHA512 e665a1ff8ebfc629e4bc2253533a3332d8f8804155432af921ad2e7251d5725daf9346cc5f110595914ac6f0d194db6d7e06dfcd3795b57e35b3d5e6dae594a7
-EBUILD uranium-4.9.1.ebuild 2461 BLAKE2B 395ab5c2174d353c5947fccce37b079d42b315ae33168c84256ea4046583e552f5764f4c0d589f856327c7747d8735f06c054c206f0f714215db617d84fe9c99 SHA512 c361ca8125f0350f0c245a093d0123c80a319267e22ede7a6c9d2ca6416714610afbb28856f4b0adfbb75cef555f74f5a959bd53d2e32c2532bb994f4265f038
+EBUILD uranium-4.9.1.ebuild 2492 BLAKE2B 80700ae8a8fed9c16ef3744acaa25efd311a24b663f2dd68fe2f99fcfe12c6028d640382f950c7e17d6095d762981024d2b543ed2de1cb5385ae462867d967d2 SHA512 0aac58b430b90601247feffb2a2f99bc31812f5f3228b511966f5b64aeb6a7a4eecaa2f2fcf0d3b6656b8f2add396bc231aa41aa5f13c35ac029ad19f0612cfc
 MISC metadata.xml 1209 BLAKE2B 00fe2e9f2183b7b5e3f3e59207077e56bbc9fc1f74a1634a9770ec558f0bf066502194f077b65814d99bed2758f4fa5986531815c1bd6cb4f307713c796ad2d2 SHA512 e6309b56239464c64c9ce52b7e483167b0812088b822ccb5ffe6f2d49b5cd1ee1e2ac115747dd53851de8267a0b97c020f38b4d051f40ccd44730ecc98f4cbf6
diff --git a/dev-python/uranium/uranium-4.9.1.ebuild b/dev-python/uranium/uranium-4.9.1.ebuild
index 066a9e021074..6743e295a230 100644
--- a/dev-python/uranium/uranium-4.9.1.ebuild
+++ b/dev-python/uranium/uranium-4.9.1.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=(python3_{7..9})
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake distutils-r1
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 7f1f683d82e3..3ca3442a74bc 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,8 +1,10 @@
 AUX virtualenv-20.8.1-pypy38.patch 4808 BLAKE2B e1d2ef42f0cf4098ba6e9fa20367defb0eda41952beddcd7c321863f72e19a553faeb4e543a60455141ca4b13690a69906bafc158e1d502f21cbd5bfb2a84a51 SHA512 7683d1a59d357fef28d31cfff26a11d08c5759aba482b04f01559afd1c36f81d349f8ecc2361ff1e0055d08108bdbf742006208ce0859e8f5da1a3f6f51610c0
+DIST virtualenv-20.10.0.tar.gz 9007218 BLAKE2B 1fd37b38679b7375c1eb6e9644418b1653cb6a8dab194c8553fa113cf4a801a7c1d5e6490067767cfb198a0ef2b5ab9cf166783b9c6fac0b2c8b538949c11804 SHA512 df940aa29801a39d39be46d3518a99e93efb2113650abf81d00b4545183ec6806823ce8b754c5a3c951cb64e941944421046c709ed3de6a925489e5ac1988d48
 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
 DIST virtualenv-20.7.2.tar.gz 8715517 BLAKE2B 306de1bb6e4aa1c888c28161abb33f7016da47a82bba7181687b99127998e82a67e24961610bcbea8a3cad8e7f218e7c76d62de26a74e2bbdf163ab76021bc41 SHA512 6ae91a0cd5cd4da000d0175762515b1b9af80e273d56293d9d57b3faf63ff72001c8d1b3326c1f9dfcea8a4a157c1f62332a2a02b84e25ac4bd3850b0d39aebc
 DIST virtualenv-20.8.1.tar.gz 8708080 BLAKE2B 703e3e8e07105e4a7154d0e91a13ec2c6b7e37be92e73733a6850c7c1a96711c19b4974bc4f6d3816ea78095b2af807183f53cbc579acad9a7ec6815ea547294 SHA512 db373bdb68efce0ce26cefe508e452b62d4336ccf74f08a51aa61272127c8cd43639443342f42cacb62d7bfd1381bc1204211218c486dfcdb165d8486a2e728b
 DIST virtualenv-20.9.0.tar.gz 9005930 BLAKE2B fb3875c34d282f030d06ad3e6f57d4d8ba9be9f9f40602b0129c5ae68e869a4b64cb5fb7935242518e09fd47294a8d87d6eec6db8f8e78947126564428aff07a SHA512 bfcf60946e2fcc0c4ac2dc9ad48187097961280dbd2353a23cb0aaab97aa63a247637d8f41ed6e6de9d30262978495ebb9519f932ebbb636cf81bb699beeab4d
+EBUILD virtualenv-20.10.0.ebuild 4599 BLAKE2B 825112b6e94eaaacab405607faa6bbdbda3f729b3316826f376da5409dc59482e8ce8d78f81c135f983d3703829ba6650cb354efec36c3e7707a145ea477d390 SHA512 4fff29e9288cfaa94c3bb69b1420914110d4b515316608f4ee0fc4e9d131fdb932d89911a20bfd920ff27d577a773d12256169eceb899d976f3b208d08096f4e
 EBUILD virtualenv-20.4.7.ebuild 4177 BLAKE2B bf376450c121d476752301a909152a465de7646a712509dc11709baf7a997440aa7b9e09d0823e8bb08255f913aad7133765d524c7e99615eedaad2dfecd63e5 SHA512 e252764fe0c907dd8e6d1ba8c5fba977f48700a829373bae6cae34be2142fa40b1563f1d797c9ca63947897a786b1983ae6b3590ecc3ce58d98c2e4d73457bbe
 EBUILD virtualenv-20.7.2-r1.ebuild 4645 BLAKE2B ff89f8dbb08ad75a3129ba0113271f30342fa18a406c3595d8ab1b4482e3be9b62e8a73554d31f53d72b7bf5afc76975d8d580e1b4afd5657c3b496d26c91e93 SHA512 b43da9f650fd92469a0d539fb076c892aa6f1856977970e0f8234684ebdf18559b03ad860b69c398aa47d9ad0ffc6268a1d8ef231647ba2d35d1329d4c6caf66
 EBUILD virtualenv-20.8.1-r1.ebuild 4638 BLAKE2B 4fe03697ee065050e95e7eda036406318701076a18c38dc17a9dc3b013f0e7efc2985593cb06d0aed046592b01aa32e7619d8818d3ff743f19321c77de2942ab SHA512 d072e2d561feee33cacaea62ae3f7aab326bbe37122dca8c01052ab21439f4886533768058748dcf1c6cd3fd234f53584157d06915e255b24bced03c5c8b166f
diff --git a/dev-python/virtualenv/virtualenv-20.10.0.ebuild b/dev-python/virtualenv/virtualenv-20.10.0.ebuild
new file mode 100644
index 000000000000..49b7be5d7c71
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.10.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index b7699641e6ef..d4408ad5b73e 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1,5 @@
 DIST XlsxWriter-RELEASE_3.0.1.tar.gz 34350396 BLAKE2B 441d9969df932ebe636474ca10eb260cea160b71b8bc46a78964ffcb752acdaeccd69703ca80a2af4c5284c5555f49c62cfefeb5fb8cdb9f0c305be44848815d SHA512 425e86acd8e54e89393931e5c698c244721ad16fe4bcb13aa9038ad7ba279803f8cf5c3b35170b274a0386ada03ba94ac385d039b3b8aa97c86f0abff4a20e58
+DIST XlsxWriter-RELEASE_3.0.2.tar.gz 34433041 BLAKE2B 748d710d3f953ae22154022a75f3a67898846914cab67302167ba34ba5e449041a95dbc984883e4ff58c078b940ebd429898109abb7a39f57ea499e5fcff83fa SHA512 790eb7fb93d25987adf5d30bfa28e0fa137f809dc9a293edfe86105e0a948263759df85b5a0f9fb19b89c256a33b5b68179d95a210964b6f82345972ee9e6108
 EBUILD xlsxwriter-3.0.1.ebuild 588 BLAKE2B e9f9323add3abe43984810be82ec0f669a45bbbcde293a7344d155f7ca1efc92d2373837c7cc22a2ff3b240328e811a9a04db9edc97f018eaa30ff6cd696d0eb SHA512 a5db084c48e56ed11d3873fa16b2ebe81c3f1011ae884fdf20e80da67625eb29b158c9c50aa37f3ef8d4c85f157caec300f9aa5beae91a3e1cca7a72cd9e681f
+EBUILD xlsxwriter-3.0.2.ebuild 592 BLAKE2B 0137eb0f311f831a57aea43090a2ff5a13ae769d3ea9f84da74a5e17ad63e3a0409af6e6d6117cf51c58e561650d87d62670b781a077beacc67bf910cbfecef2 SHA512 94dc821eac85e21336a5d7b730b9ef00ff70cea6594a985d921e9d68932f0e0f16b1af2cfbda754dd2ef8cd5199c0481bec2806c1f88ca7ef1494f4e247ab25f
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.2.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.2.ebuild
new file mode 100644
index 000000000000..c677523642a3
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index d0921a21baaf..fb68c651137f 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,6 +1,8 @@
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
 DIST yarl-1.6.3.tar.gz 176823 BLAKE2B 58d36c6d18ef661cb08074153081f541fc98968107d71e7b501297f45f38de092804bba2ae89ddcf0da79b5d4fca62292a4c460bc9dff9d723d3958bc64ff84b SHA512 4c76b94198b8e334f4b4e71d92b0fe23f752d35e0c29bc68df99648b3f48fbb6e3dd8d7339138544e5dc8fbf64c15cb61678052670ac47edc5be958df819d42e
 DIST yarl-1.7.0.tar.gz 168325 BLAKE2B 25d708935c8b97142ee729827bb70955458d8ea8212d2a6e59dfe899f2cff41a8cfd93581f8e0f80a3ce194707068ad968f1ae8ee0434e11ac8f7909abda246f SHA512 581b786710c334a8f3d2259678f2bb22c40a0c2b125a786c81a9dc9e4e637e3eb80f11194835f58ada17b346b840ae1a539beba37a52e59b648340cc93f65d5c
+DIST yarl-1.7.2.tar.gz 168562 BLAKE2B 7da82193e9fa0d317bd4ba46d63ce04a36c95fc3a389d6800d12e0ddecaacb41c07a665db9e731a9112d98a0f3133861b174dc62523da202d0d06f4cb995c354 SHA512 ac5b630dd592ffa8b095e4d7eee2facaeac8ab578e55fd8856c6a6349f514081020c707cd0b33f250c0e78133e92ed6156835660f14c5ae54d60b4fdf6ea50ea
 EBUILD yarl-1.6.3.ebuild 927 BLAKE2B 86f90493dc43c951fb824c3e1f9c1ce789c376bd92646ac314e7fb6ebe9e1d88554cc05e3a85fced290251ce12645565c0ad343c2b2a87b4d5046f31512c5881 SHA512 376fceeb9f260ca9444aada5fb4fe080f0a9eb0ab7740b7b05243c0ae1a0bd63144d503e1e893af6403da02243f95afb9aa00ef7e19d640af3fac52a7df556a3
 EBUILD yarl-1.7.0.ebuild 783 BLAKE2B 9c88ad8875d1d24531e960b9fb4e353c8b235ec4aed37d911e857241cc9b89c636eb93032398e5ba903edd8d3eee1745841d1feeec04aa489a95a746d955533b SHA512 7db615ae4ab1184dcc607c77806d79a17f8941474ca46d49c7981720f1f8a95f25be9f2dbf2df30f590c3aa73d8b084a0ea5d9b93b4d12da8b871c3922bacf4e
+EBUILD yarl-1.7.2.ebuild 783 BLAKE2B 9c88ad8875d1d24531e960b9fb4e353c8b235ec4aed37d911e857241cc9b89c636eb93032398e5ba903edd8d3eee1745841d1feeec04aa489a95a746d955533b SHA512 7db615ae4ab1184dcc607c77806d79a17f8941474ca46d49c7981720f1f8a95f25be9f2dbf2df30f590c3aa73d8b084a0ea5d9b93b4d12da8b871c3922bacf4e
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.7.2.ebuild b/dev-python/yarl/yarl-1.7.2.ebuild
new file mode 100644
index 000000000000..c30d1180c9bf
--- /dev/null
+++ b/dev-python/yarl/yarl-1.7.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+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 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	' pypy3)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 373a95640345..46c82f498cc2 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index c958a3615d8b..eb1b5683a6ca 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,5 +1,4 @@
-DIST cri-2.15.10.gem 35328 BLAKE2B fe5618f86300381232f071e552020da6186e1908ded3703e645fc6067080a215cfff8d4f468f522ff801d6608cc7560379db2b18eaefb5509ed0db1eacb9342d SHA512 577ee6ba07f08d46e67420fb2e579647857207a2d88f1782545b28e6f26cd6b93d554c904e00af38d7f87eb0fd476c66552ec6b1469fa268faad1ff5d1ab8f15
 DIST cri-2.15.11.gem 35328 BLAKE2B 774ebbd74ccd8f328d15a65515ed6c350d6bd00c9b757912c37a01aa71b745a3443755b8b59e7a8e6ac07c67f21d69dc4f96f972850e011d7b72d639c471d636 SHA512 a16d35a5e83401dda4e50bbb8a52b8a192e2876a708c516445559599f1e7c007d2f943efc662f43226bfd177356272dc7802fc01c8fdca543d4146bc537cae82
-EBUILD cri-2.15.10.ebuild 714 BLAKE2B 20e3ef38ecd9e55d315a14e2b172865aa4bed0416643fbccff969903960e47f7753041183406bf1433cb020ba1f0dbda875d28aae49902a48b1fab200cb5f3ab SHA512 afdf3dde73d1daac144e75c6c7caf46646c91373bdc72e618e64bff1fd0e1408b580722b86b0b3b769af45e9f29fdade4dce43119cad42eee44797ca945d1dde
+EBUILD cri-2.15.11-r1.ebuild 714 BLAKE2B 5fd9f80748cf653470c184ba2bbee1b0b79effc5fc93e5ce390ef3fda1d0bb511fd0e5520bcc442371f9cc4599ffb5f877f658c779012c4d9f908fe0a77693a6 SHA512 2bec8ddb38ecb2d131545852e2c6fdd6de8396ce3c8d37be8248d749b2160322930e02d628542ce85845cbaf0357831bc9ad8624d957811974f2b63160aaa3d2
 EBUILD cri-2.15.11.ebuild 714 BLAKE2B cc18a0a0440238968c8ea414e71b0d6e06d7a734f392a7ab0d299d2b90c0b04bacfc927ca32099708994b8c410de9c71d4920b13d95fe35d738b6f55f87229ca SHA512 f75af6fac2b947f8f17e5850877121a8c709fe7c784545c33129a54eaee5dc3df36250d11d802f3f809b911850e9fdb22b0f862bbc8bd6eeadfc78b9d20e32cb
 MISC metadata.xml 322 BLAKE2B 0d6279e8f60e12f7ffc1e1b87523423fb175e7104e41ad4911f4513f530f9275670d2988401b2040d0e0ba4abe9dc9f3721d77d1f57865cdaf40efcaee1ee0e1 SHA512 d108f8a03dea998704eda69a3e06bc5e062774b2cb2f0c01c53e88085b144ce05724b922abe829b9cec921d056aa90483d3ab052688a3ced13f17ebb3a9d689b
diff --git a/dev-ruby/cri/cri-2.15.10.ebuild b/dev-ruby/cri/cri-2.15.11-r1.ebuild
similarity index 89%
rename from dev-ruby/cri/cri-2.15.10.ebuild
rename to dev-ruby/cri/cri-2.15.11-r1.ebuild
index 8790711293b1..b1a8c99b4b68 100644
--- a/dev-ruby/cri/cri-2.15.10.ebuild
+++ b/dev-ruby/cri/cri-2.15.11-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
diff --git a/dev-ruby/idn-ruby/Manifest b/dev-ruby/idn-ruby/Manifest
index 450824abd974..d630c206975c 100644
--- a/dev-ruby/idn-ruby/Manifest
+++ b/dev-ruby/idn-ruby/Manifest
@@ -1,3 +1,5 @@
 DIST idn-ruby-0.1.2.gem 18432 BLAKE2B 9bd1a280c76195a84bc996cfb68550c759a466fca4f5c88167c1e395652088b746831f3cd92a197af25d649ec18ce19ddf78402714432976c612ae38c6c64289 SHA512 404025918ca8fb49580d726b9972dbbde987bebc7fa1e42b0e7f091cd8fba38871258c18c933e49a6ee3c11a21cdd388342beb72c6ce46d8c034156eb9064ac5
+DIST idn-ruby-0.1.4.gem 18432 BLAKE2B 7c530e0d24ce515337a1810fbbc33c7598d91c9b82ed19de196aedd47a71edb50c3d6481e62d11e893418b579c58d167a24e1cdd5d9eaa99757b48a88f1943aa SHA512 b06ed738a488493aa843acd1122e40e039ebaeeb5873fc9f935edc5ee52a1f86eb0b2cb5460d211bee9d42d05491b0ee6e4a707b0840a07bc3f3174648435124
 EBUILD idn-ruby-0.1.2.ebuild 721 BLAKE2B 1f7d021f6d3ec3ff3cb1d4a72138a473c01ad68929f300e9e394784c162b56ee52820241e8950b3bd2375565ec7a8665f1228e8a29d8e62408c9658c0b046f82 SHA512 766b115f3276ecce59d1612382156c94ede34670fc6726ad2c6ae1b3e3d002b0bcf9f8d631142991ea4f8b109633307997e41dcbe281f2150aab323975e067ad
+EBUILD idn-ruby-0.1.4.ebuild 714 BLAKE2B 2fcb141d3da1d398777d28a7d0c51af6bd9c7c1cc566e3787464e3ae1d9fede6083a5d7d888e2dea13977d793237049076fdab5adf89fc3653368515cded7ed0 SHA512 688aec4d275dbd511100d49b81570645f369c9bd518f556cf7dbd93d93fa5f75ab89d74606d919c22932947790481f32ea66032546b4b05e4ea8a63b6ed3d08f
 MISC metadata.xml 345 BLAKE2B 7dd31322b5046ae951e97c109fb38c88c29552a2d1a9fb91c7b26ecf7c1b3a0ad5e340dbfc292e2a0a01c5782c62900fcbcfffccbcaf76e676d067ac86b7a2c6 SHA512 ddc5273ab86823ae3c91b96d3982ea80ea94ff140ab04eb15febe786d7f39222589a6f27c5a963fb3c20c908d19c0db588711f9e51e48db6b189d56d6f0b79af
diff --git a/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild b/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild
new file mode 100644
index 000000000000..ffafe14cab84
--- /dev/null
+++ b/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="LibIDN Ruby Bindings"
+HOMEPAGE="https://github.com/deepfryed/idn-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" net-dns/libidn:0"
+DEPEND+=" net-dns/libidn:0"
+
+all_ruby_prepare() {
+	# Avoid UTF-8 tests since we cannot guarantee a UTF-8 environment
+	rm -f test/tc_Stringprep.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir lib || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index feb9f5b56a7d..f5f8b80160c1 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,3 +1,4 @@
 DIST net-telnet-0.2.0.tar.gz 13299 BLAKE2B 6b87974281b4e1857a1e05efdfc751a5149f9057598c89b8b288219b95268955ee3f80e21cc787ac767ef3126c9ee23d9b62e29ebcb8c317def703f0e0dc1fe6 SHA512 a4473c42d33c10594c4445c29db73f4d611555710228cce263f7fc273e71140423dcbc2e89eec2a26f35f98de48aa72eca9f44cf0cd4626d702709963ce7b02d
+EBUILD net-telnet-0.2.0-r1.ebuild 1047 BLAKE2B 41034253598686c7a3d8f5410c10589b857959fb5f5a9dd65803d54aafdd3a14137290e52bfb66c467405daaed96676fc9a1f9df7540627a05558af8023d97a4 SHA512 f794ce667bafd51efbd7deefc98e67c227c18e12476631e13ab0c585364526af8d68f925d6853ada0a3eab2ee03bf105ce828eed39e887d3535e729e29b3c757
 EBUILD net-telnet-0.2.0.ebuild 956 BLAKE2B 60aa4eb2b4278c9dcb83217f1bd47c7c0924ce21b45092f27579e9bb4b7258fd3c3c683f199a3627e7fb159a132eb350e7274416c7d6a5e23b203df9cec4fc9b SHA512 f27adc1c97108669ed91cc14c3e4249548f86a18bf4aa40d77bba69495305f4cfc245179efcd8d46d023f4b2adb4598fb38fcdbbafc9b7652b88118fba292ef9
 MISC metadata.xml 342 BLAKE2B 9a659f3d0c58ea00e32e060c2188f6b38821ffc8225788b707d21a1071024c87bdc17b394ac654c70c8830c7f88b9ccd08aeb26d8bc859a53d29bebb2c3868ff SHA512 adffb5054de27a4371669b6e373548c941e7f7398fd964e8150ce13604adbdf806c463950c5f50d3b7dad17f30c06c5342bf950ca5c8433ae3c830cc8dc3ab02
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..24bfd3876fc3
--- /dev/null
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-telnet.gemspec"
+
+# Don't install the binaries since they don't seem to be intended for
+# general use and they have very generic names leading to collisions,
+# e.g. bug 571186
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides telnet client functionality"
+HOMEPAGE="https://github.com/ruby/net-telnet"
+SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/sassc/Manifest b/dev-ruby/sassc/Manifest
index 2d3d74fca354..1ac8650f5f93 100644
--- a/dev-ruby/sassc/Manifest
+++ b/dev-ruby/sassc/Manifest
@@ -1,3 +1,3 @@
 DIST sassc-2.4.0.gem 304640 BLAKE2B a4cd96859855cfd26e78a35becba30af8b7ee52d8ba67f7dcbc6354786f26e60a312be4e773f515f6edda6623142249a4a470f418d9fae3db734f8ae11498dc8 SHA512 835ba03d0fc5a791b2d620367f63202973f778bd8ebaa87c27f6a1de75b5895270205e8746fbb242d2739c9830a27d72453a75c1b536090840de581c52caade6
-EBUILD sassc-2.4.0.ebuild 1070 BLAKE2B 13be0bc5b8c721ed3960643e3d43449a85d893eaaed3e417c75ee7b6ef2d39659b485714a990f57826dd2598dfc091c286a8f4277a64a3c817504415afc906ce SHA512 18c7a919303b1ca02d50d1b7cb54314a6e7e3a52f95f48dbd9184e95ff2a0f5408a83b3668b8a18326512688993e1e9fa159361ee85d4d179d6dd71728097d69
+EBUILD sassc-2.4.0.ebuild 1076 BLAKE2B e1ce2b19ec073dba68e92b031ecef41a5708eb242a083ac1a508c29c7c6f99e3d01a3524cce4a8c5125d717d62307324a84f1fb6c3f96665ba83c23bf9005a1f SHA512 0c92f32f225c9812b06d09781948851df5616c4bd6f8ea01abb70f31071f94395e57b20128981ca8b9cf32336e2f67dfb3f2004f3de5fda8ad33bcdd46bb0331
 MISC metadata.xml 342 BLAKE2B e142db9aa3fbeca45133f091bff39a3452a51917779f21f78928295cd69bed7e12fb68de1e1d432d5765fe1560b5841a6c12be62487375b206170052c8aacd2e SHA512 39e8f3ff146ac9ee2b06246a6277b9abf3b5466dde0820ffe309f0303923310610dced252f33ed5ac342bea64f8bc3941d71d5d57b7c36bd8d302f415b32e10d
diff --git a/dev-ruby/sassc/sassc-2.4.0.ebuild b/dev-ruby/sassc/sassc-2.4.0.ebuild
index 0ab3fe4130e3..b105bc7e71b1 100644
--- a/dev-ruby/sassc/sassc-2.4.0.ebuild
+++ b/dev-ruby/sassc/sassc-2.4.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Use libsass with Ruby"
 HOMEPAGE="https://github.com/sass/sassc-ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/serialport/Manifest b/dev-ruby/serialport/Manifest
index 2e886e8d4ab5..af008b850441 100644
--- a/dev-ruby/serialport/Manifest
+++ b/dev-ruby/serialport/Manifest
@@ -1,5 +1,5 @@
 DIST serialport-1.3.1.gem 25088 BLAKE2B 391188ff8a78f3998c82b17668a1aebad737643739c8087c4f32ce719dbf7bbf5f29cdc0717ab16f196020a227afc4fcfc29409331b2aabf5c6bf3382ef3496b SHA512 cdce9e13065cecf6d090d716626abb399bcc2a079be7bf1fe7755a20360218550f2f31980d62d8aae1fcc62fc62d6f7549685f865e30d2a5f40a617f5f197ed9
 DIST serialport-1.3.2.gem 25088 BLAKE2B 035e7bdb8ef321fb67ec63283c0e4c8fbf8f909ea3495994716b95cc55f212561a09a87352aed67290d96b54bb26b7802e5ed37c27e67291d768d7eb6d30850e SHA512 ff78fa04183108c2e9c5eb4f0caa9f8072a693a2a120ca084476b4125ca32ec67a6fb268bedda3ca142a9a397dbc585dffaab88f339fccc12e5ad03a09d4c28c
 EBUILD serialport-1.3.1.ebuild 992 BLAKE2B 15d5890577655e93615c40d4552c8a4b66b28ec4a9cf48e02629d43e6baf0d5ad85da3108bb82989796dba27b741a373b5957526ad1504e97afac499cbd3cc47 SHA512 7f8f3868b2be64d531a596acfc0ef4f6e22bf2449d03d74680eec2ef906bb4bbf146907a1592c21065658e7738e11e74ff4dd25bd752630ec44ed30294ae3031
-EBUILD serialport-1.3.2.ebuild 755 BLAKE2B 3ca7df386e0b39150e960cc2d5165dd91c398a89de35daa49b4d8840c3c8dd17f6211462adf9f49d32ef2987042a989e043232ec6c856cfd625fae851afa434a SHA512 d27bafa2670f3644d1f76df868fff51180af9dde9f0d4bd0aa3dece32ae62b119d44fff98cd002053f2e845c354984dc41f574d995ec41bdf80987260e7c14a7
+EBUILD serialport-1.3.2.ebuild 754 BLAKE2B 3c8697c1f66a100173f63ecfed33caa2771b2211cf3fdf79487be0dc5849ee7016830e39478d65f14d60ea40831a1561b6e523adfaa5b45670fbeb65151ee61a SHA512 02e0dc07ed2039e61eab0c89b26ab5e9e955d67d216e0756dfee47e1214ee33f0c95457d5a63c65e0db62d809ed0977af87c901104049a2be3ccf2933d173907
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/serialport/serialport-1.3.2.ebuild b/dev-ruby/serialport/serialport-1.3.2.ebuild
index 324f14a6f47c..994ac57e0394 100644
--- a/dev-ruby/serialport/serialport-1.3.2.ebuild
+++ b/dev-ruby/serialport/serialport-1.3.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/hparra/ruby-serialport/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 749c024d7dd7..89537c8e0efd 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 3b0f97666c98..5ad0880e1db2 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -11,6 +11,6 @@ EBUILD ccache-4.3-r2.ebuild 2039 BLAKE2B 52f3830cb8451b66871732aa64aec3a8e42bc17
 EBUILD ccache-4.3-r3.ebuild 2117 BLAKE2B 89b501e9327a050b60413b4fbeb87416ca9337aefc2b27b0e6baef9747505ce42a4a6c54f3e6bfa01ce60069bf69bc212e0eeecd047fe5c413de9228cd0edeaf SHA512 7a46c9d7ffd461044335a0133859256eec7ff0d315aaad507563edf84b670256a6a3470bef430abfdafca35e4f0df58e836204a6ee6fd6f4fd3ae2a94a976412
 EBUILD ccache-4.3.ebuild 1655 BLAKE2B b3cc038828f86dbd2d8060f5d13a197c399e7b99d0c0fcf4a82fbb498c212a9624fcb023f481c628a123fd1e2237689b1b094187c5fa1caa98aeca38c9c870d7 SHA512 0adb9fe19611bd373870e85d889b2bdaecb0fe6b11c40f3d48add1ecdca99c4b6beed5b151c685eaf13f0b11b0988bf870525ac23e3f78c865565f84e1aba156
 EBUILD ccache-4.4.1.ebuild 2303 BLAKE2B cc369c3130135f847b011f6fb567fbaf6fd82b52db8076dd3744c71e732dd38d81a3a1e98539fc9782d45b36d2ab8d9cad71ead8a36ab31d1299124b51ed8e56 SHA512 22df449dc9c538b312786441ce8069e100c38de3aa392872aba6c875f0fdcb45c625066f061f213cb8d778d536106e1bf660fbbcd552cdb50e1c1b7ae8a6ccce
-EBUILD ccache-4.4.2.ebuild 2297 BLAKE2B dfb27a54fcd21b3928847580d8a9cd57cab5d1c22d73e6053ac8246947881f70b503477404c5695d4e008c502e226b74c6e6a2804ba5eb597c61acc5c00de2ec SHA512 de8dfbea82229651876f154611efd4acf68e20dbc4e4547524ef6d84ef4f5167b95895e9fac39e3d7e8bdd7ae43b3bd9c17eb2f2a442d83e29c9c5272c4390aa
+EBUILD ccache-4.4.2.ebuild 2296 BLAKE2B b87c6e484ddfcc7f2e71eeb6534d3cfacc3b8489456a830c4a9028b76dda047b242eb03bde744f3e8870822f4f77efff8b8ec8b48f1eb00263c3b60e4d15cc2b SHA512 dab1507b69bc05bfe9d69fae1e5530db86836dd6bf42f1f5a65d214941e725abe5ed58797d6951f93feb25014a8e831d0fc75cd8d2ff805566af4fedfbbe6aa6
 EBUILD ccache-4.4.ebuild 2204 BLAKE2B a6ae2e76ed4fe98970eeda1e36da986ccfedf80cc35b74414a7dba16853b3663908621c5b00029def4031c3324edbe44283c60ca353899d778e9d8e8e1f8d193 SHA512 5d7ccb58cea38b208092b87c954bfd029007b84cd09bc05fc79c3f6164a9ddde15321998c074436e3d2065edd104d27e32f067f811867407c743c82e34a5fb10
 MISC metadata.xml 632 BLAKE2B 54a81f78ca7731afb01f2ca1d377d9aa722a368d4177c8cd34a505c1ceaec28539718da6665ffcb5a06af544d518d7806c8db4338b0ab473d56cfff39fbac9bb SHA512 bc9037810d55b532289cad47b2249efb9cb81a9acd48466461efba65487ffade1269ff00f271a4cf1ee8625906c1b3abca6e5244224c55a527aea75cc6eb5922
diff --git a/dev-util/ccache/ccache-4.4.2.ebuild b/dev-util/ccache/ccache-4.4.2.ebuild
index 71ac812ee6f5..e3d01ec3fcc6 100644
--- a/dev-util/ccache/ccache-4.4.2.ebuild
+++ b/dev-util/ccache/ccache-4.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 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"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 7b08e2869c5c..2289166f467c 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -15,5 +15,6 @@ EBUILD codeblocks-17.12-r304.ebuild 2294 BLAKE2B f6f79076b52eea3a1c1230e3fcee422
 EBUILD codeblocks-20.03-r1.ebuild 1811 BLAKE2B 9a62643660fa3a3f365fb66cab17a0f9bed43aecf0472809bdc968c7d6950819020e1f21d1d4d377c1717c34c547814b941b19ab12f37138d17158ff4ad83b84 SHA512 adbf6c9798619695333751ce85e43affe2d74eb923728895ec58acdd268513d05db10a96718ed69af91ce1ab8318148cd717308776c307533fac02c3b740ddbf
 EBUILD codeblocks-20.03-r2.ebuild 1855 BLAKE2B d6c4104baa3bacde4ec517e18dc168d75c2a023b087e1496727501aa3bcecdb23f9e9168dff7a0f0662a32a58418454c5b836d24c80d6ae85713a557ca35d46c SHA512 da341a5f98a4d92016acb6ad996e894044926c2ec1eb77fd535b9463f823f99c3952798a0c8b4c59479efba4676fb51eeb364f76f02a31f54658355fa83eff6e
 EBUILD codeblocks-20.03-r3.ebuild 1819 BLAKE2B ac5eacadd466c160cc2fcbd82b8e95c1bbafd0f7b10477202506cc0e92b6e70fa4fa2028968ed6f05cc906c89c594d6c0bf98e49df6b9dd3a0e11c47c62ca609 SHA512 01e91fd11037868e1e60198f1979248099b02c16a58eb624dc09bf8ab4f3bf443a16aa9b4d96baf75b05964fb8b00ecdce5f6813de7b81a2b42067aae0cb0baf
+EBUILD codeblocks-20.03-r4.ebuild 1888 BLAKE2B 0c20473aedd8143ae5259e13f1ecffd9ef6675e3d2338ff4c26060092ec814f8978080fbaeb3b1da2559d738d3a89b5d5c880b6df15fe6b33f881c62bb4b5b79 SHA512 94ec1ef815f1243888c7c606b51c911e7836c59c75f874daf5ddd9a196e8b55c0092d0d02f8e40b5a87f2eeffcda4dff2d8abe3fe715bd58af318be17e85b3e4
 EBUILD codeblocks-9999.ebuild 1459 BLAKE2B 3add391f132cde04b2e936cd9b014d7ee091f0ce6105356ae1716d1a2a026bbd689c3959e5925c5add922e4d22878bd921fa44688b7aeae7e589911edee482a7 SHA512 0e00e64f4d3c7045b21015970e0c30551865d34439129ddaa3c41221d1414e45e68626d9a686b5e36fe6f46df2483bcb978aaaecb49a64d38da5853cb0c70ed5
 MISC metadata.xml 845 BLAKE2B f7b882b01dd425c6eb56c164a95e7e635ba59591ec1839a9b925496e4c40bf03497ec4134eb38b47f9eb54b765773890896ba243b5936cf7bc3b71f7e7ce41d4 SHA512 ae0650c5218f8e18422926bb11daa9cc89804221b9958963da484464668e99f6049ef099fc6a63f3a0800fa15238ecf0607da0a495c42d5029a94ed15ef4c985
diff --git a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
new file mode 100644
index 000000000000..2a412fb830c1
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
+"
+
+# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 [r230])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# https://cbfortran.sourceforge.io
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.1-r2:0/3.1
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-admin/gamin
+		app-text/hunspell
+		dev-libs/boost:=
+	)"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-env.patch
+	"${WORKDIR}"/patches/
+	)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	# USE="contrib -fortran" setup:
+	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+	# USE="contrib fortran" setup:
+	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+	# USE="-contrib fortran" setup:
+	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+	econf \
+		--disable-static \
+		$(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)") \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 7a5a0a4e2e04..f98b57a8f605 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -5,7 +5,7 @@ DIST ninja-1.10.1.tar.gz 211216 BLAKE2B cb27beeef903ff7c5a00f2ac85b36e66d9c41bcb
 DIST ninja-1.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496
 EBUILD ninja-1.10.0.ebuild 2675 BLAKE2B f8958f60c6c20dd27a3870d298e7ff858e8fa13c1cdc0a2196a6bdc40f8c8916e64f58b477a96c039589adabdbc5f32ac13341b369a3d46df2074856ff2ccec8 SHA512 a041b7a8ed0af8d2baecb24eb65ccb733a8e8b470c797a928ad19d4b60c69dd602a70f72e0cdc3e629ccd00babdb5d28c905095d4afc2f35527c42e8a2447775
 EBUILD ninja-1.10.1.ebuild 2636 BLAKE2B 4690234896f3da8077c563cd9de1aa116e2d7f0574a35d29cb0ec199643666033a69de8d391fa50d80ff1f7f908dd634492c9ba21bc246efec97e38b916dd65f SHA512 f8b0f36e19ba2d8da5928daa752ff81d8d39ae39a0ce88b48298839726b166007df76caa64942fe48029b367b52d38b724b4f870dda50c050583cb262a8abb45
-EBUILD ninja-1.10.2-r1.ebuild 2793 BLAKE2B 2aee867beb9c692b39fd28f5852370de0566c17e4466066436d009c5dbf0dd801776cdb26ce876c6ece8e127e230e6c3a2c049f87f4b39b7f8f159fd60d661b1 SHA512 652a1c858cdff9053ab3c03e83d3448c284bf03c4ab69d15d1bfef6dc6fe83faf2275e8c6d428ba054c906ba1b2626052d2784270dc1ba054ceb05c270d7275d
+EBUILD ninja-1.10.2-r1.ebuild 2792 BLAKE2B e12ce750afffc95679e63b7dc5bd1dae0cdcda9f02d6dac80a1e3e5c9c1249184c0b928e3a29d8ab9c6646b648d686dbf2de0f4ecea0b8747f5e7ee4e7ce71d5 SHA512 b6b6fefca3b1b4dd3023e6c9411bfcdd9e7e6e9bba8357e4aacde4aa516f13f4e7aed5830107bff3c8b4f28f44f26df821a6ebbb645aa1c26a5dbc3ffb401a9b
 EBUILD ninja-1.10.2.ebuild 2644 BLAKE2B e81698718e910451373000b38961579120228c39d0e586275423591975bee009731e7c8eb66d246a44acaf307c8a9976caa130a71c952db73c6c31bb451fe2ae SHA512 edfcd252fe80865c573e0f0f85aca151a3152bd46d06dc5bf7d162d56c1ab637e5d942437ba40cdd4d27f29402b6acf71dd0be4b5a3955b25134a84b31786abe
 EBUILD ninja-9999.ebuild 2593 BLAKE2B 7dc734e7ff64046e9eb0bf73b5e7455f3452bc35c9dc5288cd70c290211649956e7dbb0654b72aecbae9e0413a2e24716c362282a2ebf22db7e94bc7f9cdb1a8 SHA512 ba8bc261502d3395d3f1a8c8f136565365d1731fa94c15664a1accaaa68c7ec36ae7f2c971a1344c2256c0e73329d2625a0043f0695eb24d43c648bb935ce99e
 MISC metadata.xml 341 BLAKE2B 4bceedc688b9b13ad2abb63a709c72d4f814ce502342d2b6059143d0bc9672dfd7a0734eba4fdbc6efd1859adf2f2c9f654d756af73ab22b0d8c51329a42388b SHA512 f440b2242abf1fe2e41be8fd80542899bbfa5265c2b424058f0ed89ffedf6c6ea890a2ca3bec5f1313ba4222b21a82aedde9fbd0870a6348dcae8d7013e537a6
diff --git a/dev-util/ninja/ninja-1.10.2-r1.ebuild b/dev-util/ninja/ninja-1.10.2-r1.ebuild
index a02aa7f2f18f..2fd15adf8f96 100644
--- a/dev-util/ninja/ninja-1.10.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.10.2-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index 01a9218c23e9..07d24016abbf 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,4 +1,5 @@
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
+DIST shadowman-3.tar.gz 3256 BLAKE2B b4e1ac2ee8576feac3d33fafa9540ad150a635d8a3f3d186265039fa62612176a67a7bb6e39d86dafc7d96dc40ed34db66a819af01dc8590288181f17725547b SHA512 2061bb03a23bc8981dd137afa52e0a78535032326ce07ce43f2c51cc115673a4a626e9cf431497fac1d9983cef2a4fd4defe1340ed46140adce0fe7ceabe6448
 EBUILD shadowman-2.ebuild 671 BLAKE2B 2174ee3172d4a4a21344915fe180d6726ffb601e9cf712b42da88c151901c75bd487e821f8c594d928c3bea651da7064a60a4a81a434a9172d15f9e9b95d3204 SHA512 8de2ab283abb84f135a478ee435a12386adda2192f7ffe45a4ff0b01a4160d9a61282e6cd1424575d2457c2f35d6c004d75a78a5fe592fd550c097ad861af4a0
-EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
+EBUILD shadowman-3.ebuild 679 BLAKE2B 424c42937424e174e688036238ae382f8e8e89571b4806bcbe3d8af2703ff0d0f26c783e5740a1e03146f26619342836489107c7c826600e0f104afa51d8f48c SHA512 a43a863065cf64aa68966a1f6ba52e015353a8309f61879364c509daad944ff0242d50ba904bc1b9c07c4cf0c51c994c007a1ad2179077f0d3cdf4feb01914a3
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/dev-util/shadowman/shadowman-9999.ebuild b/dev-util/shadowman/shadowman-3.ebuild
similarity index 58%
rename from dev-util/shadowman/shadowman-9999.ebuild
rename to dev-util/shadowman/shadowman-3.ebuild
index 816a0bfd21f7..f7b929689cf0 100644
--- a/dev-util/shadowman/shadowman-9999.ebuild
+++ b/dev-util/shadowman/shadowman-3.ebuild
@@ -1,18 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/mgorny/shadowman"
-inherit git-r3
+EAPI=8
 
 DESCRIPTION="Unified compiler shadow link directory updater"
 HOMEPAGE="https://github.com/mgorny/shadowman"
-SRC_URI=""
+SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
@@ -20,7 +17,7 @@ DEPEND="${RDEPEND}"
 
 src_install() {
 	# tool modules are split into their respective packages
-	emake DESTDIR="${D}" install \
+	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install \
 		INSTALL_MODULES_TOOL=""
 	keepdir /usr/share/shadowman/tools
 }
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index d71b21424eb5..15f27e210064 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 70fb06cc813d..411a824c89f6 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,4 +1,3 @@
-AUX supertuxkart-1.1-fix-buildsystem.patch 761 BLAKE2B 6a3ca6329851b3ad22b4b7617d7d6b7668ac50a7aebaf8a2cb41f5e8036af03f669dab6cd803de2e7315196aa2c6f8698bf3d65280fb90446e7b64d22d7eabd1 SHA512 b15729cc2aea6286ecc55927a26c5e667c1ac51e8ea505622373fe8b6c51ae3a9dc8d57334d3a9ab1bd968c6107bc5a315963731a3b3ad9d89a8839981abfc11
 AUX supertuxkart-1.1-irrlicht-arch-support.patch 1520 BLAKE2B 14c6fc7615e44c5007eb5828ac7e157f69a41343d6f5affb1c6b5af5afdca4c123bd1fe238c90495c097a5eafed976f557212f1e8d89c787069473cf63218fc0 SHA512 7cdb9582248937a9a48aeb1d66cee565fe1bb3255d58ec5dcfd735ee807fa51d7fc0ba661b74156ca12b036af3aefe7cabdf386e71fef98617d24268da2d0c0e
 AUX supertuxkart-1.2-irrlicht-system-libs.patch 1706 BLAKE2B a3007cbcf9a01b44e385b9fe30183811a7cb2183ea8560b904271bd1df6ed02c827d4d02ee914691fa2fa9c39ecaf5cc2933318563c9ad0f40614adcf0298076 SHA512 b616bfe18d990f881a703c4c7a545f49d47cbf3bb42f0d4d657fa6a837667a316a48aec0bdf0e1ae803abdf536a66c6c8bbf39f9ec5c6008db7030b67337530a
 AUX supertuxkart-1.2-new-sdl.patch 5394 BLAKE2B 67893f5fb29a954205aeaff2d10029d9f98eacb9b67368a0783bf4a0c84a3d14fb7438e87b8f4925f43757782a48606957aaaea569f98a7b9c3665738fa13bf4 SHA512 e3e70f79168e8de5047d5a7fdb5c96815d8cdf19a010c0110ac90a72fa71abd811577ca80db46f08765b5bb53b77a38ef708d153eb76f7d41f627ebc46deb920
diff --git a/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch
deleted file mode 100644
index 394a1963199d..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
-index 92a881c81..1371fdf11 100644
---- a/lib/irrlicht/CMakeLists.txt
-+++ b/lib/irrlicht/CMakeLists.txt
-@@ -94,15 +94,6 @@
- if(WIN32)
-     add_definitions(-D_IRR_STATIC_LIB_)
-     add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
--else()
--    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fstrict-aliasing")
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3 -fstrict-aliasing")
--    if(CMAKE_COMPILER_IS_GNUCC)
--        set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
--    endif()
--    if(CMAKE_COMPILER_IS_GNUCXX)
--        set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
--    endif()
- endif()
-
- if(USE_GLES2)
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 02e778d9ea3f..c36ec2161174 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 5de637d43d32..e047c593ef2d 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,4 +1,7 @@
 DIST angband-4.2.2-man.tar.gz 105892 BLAKE2B 226210bd45f463e2b6bc099f889393832b5ce9bf5f95b5de1bc38fbcef61287515435ceef83a717bd62220fe01d5acf33e3fe240c08e3cf7d04e9d59fee132f1 SHA512 f373ea55c5f2349c615c47207c1dbbcc6a77246fbb0615d00a1fcb2a2a0cdf839bb5d57c2e29a2f2698f2d6b72698fbaec6bb221994566be04046ce03ea6253a
 DIST angband-4.2.2.tar.gz 24992436 BLAKE2B 6beab7d0481167538714f540e9825e930d57457c923b77e2a9be71e8a6e382b70f375e85e68f0ebf9a65b61b835d62df0a5958a21198d9049088cdbe32c81efc SHA512 07a9b6a10a47afafde8f5db1e463c70198d386e07737666e044de291eab4b425d76bc8124153b7c371248f0c9aedc01578a90e513d744e3f30d26ab22c940698
+DIST angband-4.2.3-man-r1.tar.gz 112117 BLAKE2B 2d90660cf0784435c4a8fbb04505e5ed47f79ebfcb0215e779b2d8b54ae5b556f820919c27f1d410d92b94476772e23a3a7fe15aaf6c2e56d5c9ceb723359bba SHA512 d85c0b2f0808ba8ee1f979bd9b51ffe2aaff4332471533f93478bf3853aa92eb326b57f195fa2f47d2163486c5005cf4e0865bca2bc3a75fc6005eb93e5d2dec
+DIST angband-4.2.3.tar.gz 25175745 BLAKE2B ee9878bb93fd268c5fdd8535750d6446ebf8e30a4bc794170b60cf6a77fc0470f91261f4963dda8865c95ead1b522210c8536da36866adeb084689fcf2bc7e5c SHA512 f80a16c40d877c50194be370795acb437778ca88a658a8c95bef637625ab8a88ceb98f45d742e698709b6c81e8b5de6f563f88e957cd71eca208673bb4179e88
 EBUILD angband-4.2.2-r2.ebuild 2221 BLAKE2B edb26551867d6fc5f95637ba1a6d48b2e57e294332132eca2efbf67fb54dd6b2fe6b24fd3e00e2e9ca07d606caf0147e3bc6b5bda5326bd7451ec4f4029bcdae SHA512 c37c85800853d0b70d4e05afdf908d864079a312af2a088ab80e7a630a0e7b3574a2406fd218564bd088550cde558dba63ea30d459b5e8654b7e0ff3cb3b7b12
+EBUILD angband-4.2.3-r1.ebuild 2224 BLAKE2B 0267dc5528982fec1c3be283120ba2617d58f410e0ef08ce27452c06e1ffbe0754f8f02c58daaa7cffa95b0f3908a62448723309332a2d307f0de700991e172d SHA512 0f791dc1244595ea7c7b7d87c146609fd84aa6384cabc0d4cebcf3209927e7305a75f236b3cba1c169b957a1eef5bb8c1daaabcda5730d7a425b405073aeaf4e
 MISC metadata.xml 431 BLAKE2B 5b6bb43490c97c194a1f2bb5da7e6f215659778811ba52ba5b8351bffd14eacfeec96a48ebc029b799617d4a3216803518a2d3b4710cdac923feaf57c5a74ef8 SHA512 ef75f9e354f3f11219c64c8d35ba5a12ef30b0a4b77f4399287883990e6675e4160f58b43a3fc46822a363a8a8b63c67c06de6474a293d15c666e60dc2c90847
diff --git a/games-roguelike/angband/angband-4.2.3-r1.ebuild b/games-roguelike/angband/angband-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..a281466f56af
--- /dev/null
+++ b/games-roguelike/angband/angband-4.2.3-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
+HOMEPAGE="https://rephial.org/"
+SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~steils/distfiles/${P}-man-r1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="+ncurses sdl sound +X"
+
+REQUIRED_USE="sound? ( sdl )
+	|| ( X ncurses )"
+
+RDEPEND="X? (
+		media-fonts/font-misc-misc
+		x11-libs/libX11
+	)
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+	sdl? (
+		media-libs/libsdl2[video,X]
+		media-libs/sdl2-image[png]
+		media-libs/sdl2-ttf
+		sound? (
+			media-libs/libsdl2[sound]
+			media-libs/sdl2-mixer[mp3]
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
+	sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
+
+	if use !sound ; then
+		sed -i -e 's/sounds//' lib/Makefile || die
+	fi
+
+	# Game constant files are now system config files in Angband, but
+	# users will be hidden from applying updates by default
+	{
+		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/customize/\""
+		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/gamedata/\""
+	} > "${T}"/99${PN} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--bindir="${EPREFIX}"/usr/bin
+		--with-private-dirs
+		$(use_enable X x11)
+		$(use_enable ncurses curses)
+	)
+	if use sdl; then
+		myconf+=(
+			--enable-sdl2
+			$(use_enable sound sdl2-mixer)
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc changes.txt README.md
+	doman "${WORKDIR}"/${PN}.1
+	doenvd "${T}"/99${PN}
+
+	if use X || use sdl; then
+		use X && make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}"
+		use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" "${PN}"
+
+		local s
+		for s in 16 32 128 256 512; do
+			newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+		done
+		newicon -s scalable lib/icons/att.svg "${PN}.svg"
+	fi
+}
+
+pkg_postinst() {
+	if use X || use sdl; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use X || use sdl; then
+		xdg_icon_cache_update
+	fi
+}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 8206b174fb24..c21397dee90a 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index e035a81bf4ba..876a7785e348 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,8 +1,6 @@
 DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
 DIST plasma-desktop-5.23.2.1.tar.xz 15787420 BLAKE2B ca4e55cde0f27f44fb55ecb473c30d4667a9512163d2be61d82bc15fb97aa6aef5459590c2e80e6b6218d1b85e5326a0cb2e5aa5507ea1cfe4eee30561477cf9 SHA512 610b5693e1a56f05c4421c496909960e679035521822c94a180d8ed8656f7995fd9dba5adb92cb18c7c1b4d0c9760b7df5d64fe67e6603538b7ea8a7276ea07d
-DIST plasma-desktop-5.23.2.tar.xz 15783620 BLAKE2B 5d8445c97eb429186866e44f5737b84037e58a91fc81021b1753c12fb1566f3e0047b1074cd1e0e72b677d3610c65cfca36b80991e2b27834e35845f65112030 SHA512 510c6d98b227c40f004388d18b863aaeed2063f9ca9a9c63bcc4eed7ea665c05e23e82092af86953195e9463bdea77e1121f39a8f0b8a6cf05299a12c477da65
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
 EBUILD plasma-desktop-5.22.5.ebuild 5429 BLAKE2B 979ca198a875cc14e82a5f1acc21f5c61b595febefae0ae63f107498f7267919dfb4c7d8821aeccf615c2d39ddacd2f17b0bce1bb5c1cc0fb3fdb0edbcc792b0 SHA512 cb2212107565b78a19b580178e4b9c7dfff84cc095d0ac6d291c9003de86d0adc7def98378e3a07a7d4106e5c83f62690baa5075592bbecae2b1d523f17dd98b
 EBUILD plasma-desktop-5.23.2.1.ebuild 5432 BLAKE2B 8e7005a94b9a7eba8e9e85ad94d234116d7d1ec1be685ecbe1f35a7ea8cc28532e6739a3284ca3b5fd230f3a4183d0d34d8606de91dd50d30f78305b4f9598cc SHA512 e7638797533bbeccf0a6f49ac64b31f34b0b241ee2f6e8c295b08e3f0b4d8c0450095e3191eef0a966c3abbe078e0d3eaa2c42282fa3e3c43d9f2ef70cfc1c35
-EBUILD plasma-desktop-5.23.2.ebuild 5432 BLAKE2B 8e7005a94b9a7eba8e9e85ad94d234116d7d1ec1be685ecbe1f35a7ea8cc28532e6739a3284ca3b5fd230f3a4183d0d34d8606de91dd50d30f78305b4f9598cc SHA512 e7638797533bbeccf0a6f49ac64b31f34b0b241ee2f6e8c295b08e3f0b4d8c0450095e3191eef0a966c3abbe078e0d3eaa2c42282fa3e3c43d9f2ef70cfc1c35
 MISC metadata.xml 807 BLAKE2B 50ef818039bb95543085a7c18aa1b60bd4a9b235380e594ff1cbef8a30c571d93de5c8e82974b03de706818bf5b01657dc8f0db12ff36e665e4aecf4b922566a SHA512 f209621d214fdfd9c6bbf2c67b8453c45a3a7d645077d7b2827021648d74c4e449b8c64d1f5ebff100bc9141f341f4ca0aa5dfc884a4081001dec30ba1b2d724
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.2.ebuild
deleted file mode 100644
index 1de5918b5983..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-1"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	virtual/libcrypt:=
-	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-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	kaccounts? (
-		kde-apps/kaccounts-integration:5
-		net-libs/accounts-qt
-	)
-	policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/user-manager
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	x11-misc/xdg-user-dirs
-	kaccounts? ( net-libs/signon-oauth2 )
-	policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use policykit; then
-		ecm_punt_bogus_dep KF5 Wallet
-		cmake_run_in kcms cmake_comment_add_subdirectory users
-	fi
-
-	if ! use ibus; then
-		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-
-	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
-		cmake_comment_add_subdirectory emojier
-
-	# TODO: try to get a build switch upstreamed
-	if ! use scim; then
-		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
-		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
-	fi
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "screen reader support" app-accessibility/orca
-	fi
-	ecm_pkg_postinst
-}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 388ec48b0a4a..9dbaccb54caa 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 550a6feedce5..7fd77f42c8b1 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -6,8 +6,9 @@ AUX freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch 842 BLAKE2B d1eef0
 AUX freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch 1959 BLAKE2B 3863f4f311a4fba648d4503c6b3daecb87d233caea4ce7f22dff47f69435995ff422cd2ee97e8a491ddf85527b325d63543e041ccc91e5c844fede750c6764ef SHA512 b9af575349498393ee78e1c75247e736412d331fb872475c180c4828a6007f9a34ccd379eed8fe2551e53b88eee0b400202c63a1365df8b6069ce3b0727b2056
 AUX freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch 1054 BLAKE2B d6a67b22390b64ed566c49af6117de2f34e0f57094a069ccae6cd15da5fa3a53a4cd71d94bd65a201c60042893da713a2d397890c7b072b197e101697cd388fd SHA512 beecd51a4b59890cd162eb76b726bd1e82a32da387ed67d886293930175deaf014445afd4db93e262daa06ced5b6c267218e4d777bd32c940fbc8b057b077fa1
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
+AUX freecad-9999-Add-memory-header-for-std-shared_ptr.patch 687 BLAKE2B e1b1273b5c98f52539d2788469f49e1b5c57ea06ef1b136e82ddd4655f0a585dd5eee0104dfa1539aeaf1c82b673d681337482b4c9b7ae4d4d9a951637f1f16e SHA512 a15b0b2c49057de39a8efe45ee3460681611b6acf0b53e77ed278af58a0c97f296ca6e5ac1e2efdab39d77d06461c71bde9cf146784b094f2941caf1b0a76914
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-EBUILD freecad-0.19.2-r3.ebuild 12318 BLAKE2B 42007a647c90b2c2f2584e663dbb2dfe1a7378067e03fadd42bd5f2fa7196e3669f1dd6a061e5379b279af3162da6c5cf8ea5cdb597341598d9339c4fd3b9991 SHA512 0a0eaf83098b180772d23468fc494838b6e4f8360bbddacbd6f4c86b3b1d414a1f10918d8e9c17d37478e1a2710092c10e58d7143ad0a1ef8b55af026a833b2b
-EBUILD freecad-9999.ebuild 12072 BLAKE2B 72c3a32d41b24f8a074f9c839cec133c964e428588c19ce02a60b079caee2534b674438e96f44b1c8754709b70befc52af48cde3e2b982b19e421cf7687c7fd2 SHA512 494ae6bde08c2092831f4d65dfe979afb80bd806af63fb3c56c326a2bd3998918d4183c82d5bba5c065ee652086ca3d800c273aebad413a100a161afa923995f
+EBUILD freecad-0.19.2-r4.ebuild 12191 BLAKE2B 5b38525d8621a2b95b7f1ab150d2cc21eb26e30aa3c467a869a8cf027ac47c96008e94b3287786c8e3a529d78fad627700135ee82aff948e8dcc68b038e0c66a SHA512 8afe20234ccc6f6b7dc55aa7f0044fbd6ccda1fee6d031c9ff8ca750d87ad93ec038953265775bd305a1cf5c36af4dc3043c66ba3f6765e588d113091322b9d1
+EBUILD freecad-9999.ebuild 11967 BLAKE2B 43ca123f606f45df6026725b4a220aab723631feb95e485902963b4044704d76589f11e4e374a9bd9d8e31fdff58f3f70cb6ecaeb0329940bb2ee200e19af6c9 SHA512 24bde5e135ff1966171964f5ffc9ea8a31a978ad79dece2a33f3099a2899fb52fc741fc9938471f4f155532eb08a29681f4d842ec1b75b14d69ff487b796d91b
 MISC metadata.xml 3268 BLAKE2B 4e99f8237c96f96500ec15a0e175684f445c9a68e1080f6f61538ae4e99cb2afccc14d50c626c44764ea4362ed82cc2ccf74f8ae53d713d70b21860eeb39650d SHA512 fbc87f4a401c33de8033b54213026631a9f956918cc256eb9a10cec88b316f71fd98959c79f58acc3d4a75d28117097ea0cc4ee33f333923d4387e9d3af43bb5
diff --git a/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch b/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch
new file mode 100644
index 000000000000..81a8f22d8937
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch
@@ -0,0 +1,31 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 16 Oct 2021 17:02:19 +0200
+Subject: [PATCH] Add memory header for std::shared_ptr
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/App/Metadata.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/App/Metadata.h b/src/App/Metadata.h
+index de8be3ea8e..2c5fd8f417 100644
+--- a/src/App/Metadata.h
++++ b/src/App/Metadata.h
+@@ -30,6 +30,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <memory>
+ 
+ #include <xercesc/dom/DOM.hpp>
+ #include <xercesc/parsers/XercesDOMParser.hpp>
+@@ -296,4 +297,4 @@ namespace App {
+ 
+ }
+ 
+-#endif
+\ No newline at end of file
++#endif
+-- 
+2.33.1
+
diff --git a/media-gfx/freecad/freecad-0.19.2-r3.ebuild b/media-gfx/freecad/freecad-0.19.2-r4.ebuild
similarity index 96%
rename from media-gfx/freecad/freecad-0.19.2-r3.ebuild
rename to media-gfx/freecad/freecad-0.19.2-r4.ebuild
index 70fb0270fb59..24dc6a703399 100644
--- a/media-gfx/freecad/freecad-0.19.2-r3.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 
-inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
+inherit check-reqs cmake optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
@@ -174,7 +174,7 @@ src_configure() {
 		-DBUILD_COMPLETE=OFF					# deprecated
 		-DBUILD_DRAFT=ON
 		-DBUILD_DRAWING=ON
-		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
+		-DBUILD_ENABLE_CXX_STD:STRING="C++17"	# needed for >=boost-1.77.0
 		-DBUILD_FEM=$(usex fem)
 		-DBUILD_FEM_NETGEN=OFF
 		-DBUILD_FLAT_MESH=ON
@@ -230,13 +230,14 @@ src_configure() {
 		-DFREECAD_USE_QT_FILEDIALOG=ON
 		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
-		# Use the version of shiboken2 that matches the selected python version
-		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-
 		# install python modules to site-packages' dir. True only for the main package,
 		# sub-packages will still be installed inside /usr/lib64/freecad
 		-DINSTALL_TO_SITEPACKAGES=ON
 
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		-DPython3_EXECUTABLE=${PYTHON}
+
 		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
 	)
 
@@ -292,11 +293,13 @@ src_test() {
 src_install() {
 	cmake_src_install
 
+	dobin src/Tools/freecad-thumbnailer
+
 	if ! use headless; then
-		dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
 		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
 	fi
-	dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
 	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 	# compile main package in python site-packages as well
@@ -329,14 +332,11 @@ pkg_postinst() {
 	einfo "support. Some of them are available in Gentoo. Take a look at"
 	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
 	optfeature_header "Computational utilities"
-	optfeature "Numerical computations with Python" dev-python/numpy
 	optfeature "BLAS library" sci-libs/openblas
 	optfeature "Statistical computation with Python" dev-python/pandas
-	optfeature "Use Point Clouds" sci-libs/pcl
 	optfeature "Use scientific computation with Python" dev-python/scipy
 	optfeature "Use symbolic math with Python" dev-python/sympy
 	optfeature_header "Imaging, Plotting and Rendering utilities"
-	optfeature "Function plotting with Python" dev-python/matplotlib
 	optfeature "Dependency graphs" media-gfx/graphviz
 	optfeature "PBR Rendering" media-gfx/povray
 	optfeature_header "Import / Export"
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 8c0caca6adc6..cef63f28477e 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 
-inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
+inherit check-reqs cmake optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
@@ -81,7 +81,7 @@ RDEPEND="
 	)
 	fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
 	openscad? ( media-gfx/openscad )
-	pcl? ( ~sci-libs/pcl-${PV}:=[opengl,openni2(+),qt5(+),vtk(+)] )
+	pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] )
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -120,6 +120,7 @@ REQUIRED_USE="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
 	"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+	"${FILESDIR}"/${P}-Add-memory-header-for-std-shared_ptr.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
@@ -168,7 +169,7 @@ src_configure() {
 		-DBUILD_COMPLETE=OFF					# deprecated
 		-DBUILD_DRAFT=ON
 		-DBUILD_DRAWING=ON
-		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
+		-DBUILD_ENABLE_CXX_STD:STRING="C++17"	# needed for current git master
 		-DBUILD_FEM=$(usex fem)
 		-DBUILD_FEM_NETGEN=OFF
 		-DBUILD_FLAT_MESH=ON
@@ -224,14 +225,14 @@ src_configure() {
 		-DFREECAD_USE_QT_FILEDIALOG=ON
 		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
-		# Use the version of shiboken2 that matches the selected python version
-		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-
 		# install python modules to site-packages' dir. True only for the main package,
 		# sub-packages will still be installed inside /usr/lib64/freecad
 		-DINSTALL_TO_SITEPACKAGES=ON
 
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
 		-DPython3_EXECUTABLE=${PYTHON}
+
 		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
 	)
 
@@ -289,11 +290,13 @@ src_test() {
 src_install() {
 	cmake_src_install
 
+	dobin src/Tools/freecad-thumbnailer
+
 	if ! use headless; then
-		dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
 		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
 	fi
-	dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
 	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 	# compile main package in python site-packages as well
@@ -326,14 +329,11 @@ pkg_postinst() {
 	einfo "support. Some of them are available in Gentoo. Take a look at"
 	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
 	optfeature_header "Computational utilities"
-	optfeature "numerical computations with Python" dev-python/numpy
 	optfeature "BLAS library" sci-libs/openblas
 	optfeature "statistical computation with Python" dev-python/pandas
-	optfeature "usage of Point Clouds" sci-libs/pcl
 	optfeature "scientific computation with Python" dev-python/scipy
 	optfeature "symbolic math with Python" dev-python/sympy
 	optfeature_header "Imaging, Plotting and Rendering utilities"
-	optfeature "function plotting with Python" dev-python/matplotlib
 	optfeature "dependency graphs" media-gfx/graphviz
 	optfeature "PBR Rendering" media-gfx/povray
 	optfeature_header "Import / Export"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 866b50721614..32c5c0de7dcb 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index eba77abd579f..608915955849 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -2,8 +2,6 @@ AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a
 AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d46a2671a1af65a3e2bf666c383b0b85387a337c268eb8e1217d17b6dd8e5eabd66e2cb3e8dafcbe0959cfe4574a SHA512 b809b547822acb486baa33038771aef4a66930a3bfe495dde815d1f551e15f1543484efffe30bb6faf2f21e309c8b6956b4479ac1edf19933af32ff5517867e3
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
 DIST alsa-lib-1.2.5.1.tar.bz2 1069073 BLAKE2B 5464cc7f263bdf7b10aa7e1f542ad6dbc55bf300156fd1bded00375c41a518d4b14f96e28eb1c60a6ce7cc6e27da4b2e8598cd867f15417f260fc23513f93e11 SHA512 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
-DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
 EBUILD alsa-lib-1.2.4.ebuild 2183 BLAKE2B 0ae13b0987dc0f55b08b2cc7e6bf565acc782469e7502512b4bafc6cd7ebf80ce54dbbd492cd3d11e8bac04f00d3df50777f92504bf482a8bd03086162d58459 SHA512 68e17a8e334f955cc403386f0e430d07ea9c116c21450fbdf4d071e68e260bfe6189ae612fa4b5efd88d4562885ab84824faa210d5736b7879e36e0dcb9de979
 EBUILD alsa-lib-1.2.5.1.ebuild 2511 BLAKE2B 431c692b5ae0ffca98f1100e34abfb64bc93a38a0faba2486c676a21482d156834d766252283f7f689ca8ceda3dc7294f7acc7ef52e4eafe983a7bdbc5cad5d6 SHA512 762f28d5fb7e082f0c3117532aa88f4da0f60a939514ca441cbcb6c48026572a7b85a934eccb27058dbd412356a5a66f615328c4b13fe759c3f9ac46107937d8
-EBUILD alsa-lib-1.2.5_p20210604.ebuild 2977 BLAKE2B e0434a80ecf3694f1d5d483f55e6983db087e804027f2896cd98ca1f11f429f4cf29c6caa80ac1f937f6c26e86e23a13acc2dac48b4103935d077adb19c8288c SHA512 349716f1956ad1a37de3283347d83808232fe7bdd2dcdf13a6105c5d5901a4d54ef298684d4efada4b7c90cb7ca707b8e3c7c6466add7fc59716ae17390752a7
 MISC metadata.xml 503 BLAKE2B 89b5c41a55784ff388766f60c106e719edd59a3bd47a1f2c240ad185ce750b1dc1a2efec704361b09c5e6e30d965514955f32fffa304200db7ff031a27d7fd85 SHA512 43f3a7e18f13ac58b4cbf31a92bd809c0618be1dd34a6a47d03e00ededd66343c3082bddac98cc286683ba32436b62aa2d61102de832f5fb21925ecfb2b54755
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
deleted file mode 100644
index 88c9ad860cf8..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools multilib-minimal python-single-r1
-
-# When COMMIT is defined, this ebuild turns from a release into a snapshot ebuild:
-COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-# Also set SNAPSHOT_PV to match the correct PV, so that the ebuild can detect a naive rename:
-SNAPSHOT_PV="1.2.5_p20210604"
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-if [[ -n ${COMMIT} ]]; then
-	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
-else
-	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
-	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	media-libs/alsa-topology-conf
-	media-libs/alsa-ucm-conf
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
-)
-
-pkg_pretend() {
-	if [[ -n ${COMMIT} && -z ${SNAPSHOT_PV} || -z ${COMMIT} && -n ${SNAPSHOT_PV} ]]; then
-		eerror "Please either set both COMMIT and SNAPSHOT_PV or neither!"
-	elif [[ -n ${SNAPSHOT_PV} && ${PV} != ${SNAPSHOT_PV} ]]; then
-		eerror "Rename of snapshot ebuild detected - please check COMMIT & SNAPSHOT_PV!"
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	if use elibc_uclibc ; then
-		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
-	fi
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-		# enable Python only on final ABI
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_enable thread-safety)
-		$(use_with debug)
-		$(usex elibc_uclibc --without-versioned '')
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::" || die
-	fi
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
-	default
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index 946155597f79..38b9cd9b2cb8 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,7 +1,5 @@
 DIST alsa-topology-conf-1.2.4.tar.bz2 11631 BLAKE2B 57df107b255e598e2fb79b56dc34d84130a023050db42e7925082ce5efb7048658ed6a8cd1854d2d9e23e8a833dbe90d7aa11ca7c1874f39caf392b292147ab7 SHA512 e5b367a23f42ed2c2a83f3dd9df264b4e054f5ba7c4be98520418598f0b06a11627498a8a6ef943522b209951645f83bbbbfb32db7c9c8260aa5db08358970cb
 DIST alsa-topology-conf-1.2.5.1.tar.bz2 11697 BLAKE2B 1f8bb172510d86bd0530f2ba437dd1132401c0bd436085c07c61e5ef296a6da6a1c24fb8d585572186fc0073172c82d40948c5c39fd293a01762d49c9c393662 SHA512 b34176b213e1afcb61fee19b569d6422a7692b62cf08b0ef651f2fbb1eefe49f25ca6386d0bfcec7152d4b5ed3daa84edb900181d40169e777751ae033125374
-DIST alsa-topology-conf-1.2.5.tar.bz2 11657 BLAKE2B 0870aa5db05d7b82e5312ac5bd3c2d887f0cafc25a317cbc416ce0ac6982ce296620833c4459ccb357b4b014d300329fc3d0028d3ec2024495cc21f9cc122e1f SHA512 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51
 EBUILD alsa-topology-conf-1.2.4.ebuild 510 BLAKE2B 0f2292e5e8932f6ef2fca2ab17a8d6548653d859d45ecf639b9d40ab74ba4c23a1fe86e4877448852378e16ce9b0c161de8b135e980014b53ce75259adabd9a9 SHA512 bbf4c4e5d11101f50bdf331f416657222cc290fe8af4d14a845ad60454f531beab9f1b0357705c9d6443f6d6d23f6e6e0367322019dd2f602ad837fd950baac2
 EBUILD alsa-topology-conf-1.2.5.1.ebuild 524 BLAKE2B eceaa5eaf04d1de79032c6da45f6f9ce0d3f8dfcc63819d3a3621c8a08bc69e1f6751a322ef13d848fd851a1a46e4c5a89871b71594da291a0da35d84a58888b SHA512 d7e751ba791f143ea9870f7e77b806e3c8f3be83264eb027520df1d8602272033303c9a71cf50451a28bf68a868cc16ec08c33dc6a39dfb8cd9c052b843a3a37
-EBUILD alsa-topology-conf-1.2.5.ebuild 569 BLAKE2B 031df6bdb91155682e5fcf7b7ccc0dc5280850b5db1d6e37a9abb9dd68c570b176a3479e11a782ced1c0d38758d720c11c18d42545b83b30c50b3318f43653f0 SHA512 e187ed4d6ce42d5be288cfd94d19915245063096ffc1ea36814f2403460292f1ece6ee2bec2e937dfc39a4eff8b30b34f0dad542cd5aa4739cfcf05454a52400
 MISC metadata.xml 330 BLAKE2B 483666d5c3505dbe28c41bb0484959a794c67e56b1581cd00ceb96cfc17a77e4f4426a528c225ad65d23b73e0bdd3a6609438d4686da64f0be9ea1fc600cab37 SHA512 198a3560c3e2458d2947ea934457ff7d04df9277146f3c6ccdc06ed0043950dad30200986c7dece3a5620c495365ef835bd38bf3608e0b3c69cb6b127ce5602c
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
deleted file mode 100644
index 421ef5520192..000000000000
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-MY_P="${PN}-1.2.4.2.g15998"
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r topology
-}
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index c6c48756bba5..890785f95950 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,8 +1,6 @@
 AUX alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch 646 BLAKE2B 271b720dbcfe5d32794b38125c0d947b62623a8f24b9cbe8a215281cd0586c65de805be2c5192f855f46744fda9b21a5fd463df7d540bf42f9c3035aedcda374 SHA512 aea5277bd5aa68680e31ffb09cd8853e13b9417bf8070480d450873f2864eb4037eabc8c23fafaa7fc482b5b2605ad1b9e45ff13b2b15ad8cb504b2d940d8bfa
 DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
 DIST alsa-ucm-conf-1.2.5.1.tar.bz2 24124 BLAKE2B 317bcb8e866a68fe467047c67bd15fc88dc1e745e9bbe05f7b091ea1febdac6bd0fd512c2ce410970eb2593c0f8500c28c8405098de2bc56e1438e5b33b00d4a SHA512 774d6da1a0ee6fb1fcd764c1d4b3eb5812a35508cf27db71f6c82784f125eca207992da9081d25783fecb31e548d8b34124d4b3b3d506e33215b76ea48f71012
-DIST alsa-ucm-conf-1.2.5.tar.bz2 23992 BLAKE2B 8ecd5adee6c9f429ab2791dfd57b0f9b1d58272b04d2c6cd3ad9aba36b53b380cfe626cae1e5c40f703eb7f891fb53b0bf70a78f9e5d2d8ae6b2dfb30fd6f659 SHA512 f16e8f04018c65de5e24f2a3eb0b3edff26cbce78cc1820c42c46907c903913c571797b59e803ae36b8ec3136487d0a5aacd034e2a8df3e15ed998b7a70152b7
 EBUILD alsa-ucm-conf-1.2.4.ebuild 504 BLAKE2B 84cbca14794d2060a35db13528fd65f694508771bce1c9e75bafe50e437472f2f3bd33365286526b9f3dc2c4ae70fa199fb08f8d37ef0f9fb2bb9d031763fff3 SHA512 1a3f3b2189b0a198720b84fe730386f285abd8b628ff52dc682813d55f375ee4e37cde4e164bc82738c4b15585e113ffcff29307f0dd057fc6bef2d6c4e09d5b
-EBUILD alsa-ucm-conf-1.2.5-r1.ebuild 673 BLAKE2B 1e2b6c7a59bb27e2a0c97a4fea11250a2d51c5c3ad927fb6ac9a1b7229ef892fb8aa1d023cd215387a7446db873ba88d1be37794a40f1692066683298784f164 SHA512 ee6e0d1ee59f3f83bcfe4c7b815c408753bef852a0370d42f01b1c0f5bf44c02cac46a4c53d30256df08e79db14d52e94dd92446ee61196384b8eb4bd7c775dc
 EBUILD alsa-ucm-conf-1.2.5.1.ebuild 518 BLAKE2B ec4d80331565113f921b711d4a1d501ff189b614d92989eaa120c480dbbf2e1ad181eeaea6fb696a4d184e20b2602fc7122b1e4e1d4a135f97b4b0b3abb93712 SHA512 76d07e86b7d9af05646ff92ceddce0e10c8cf3bf0c1a0cb6a3645db259c5c2c93c9fe330278a0b6d4dbf8faf40aea31abe7a8c2f50d8dc0723c4f52bc5651944
 MISC metadata.xml 325 BLAKE2B 02b18895e880cd1da866d0290d992a060c3a6fb797df776ea270be86b0c32e9c712536efb1ef91c0a69e78238cf5898ef1b737826cf7e9f9ac57cdd8dfba5162 SHA512 f444b018e6d93287bcbc7d886e0962ab3e0fb67b387fe4f0f31f2ba7cc6706d760a2e9db0f29318ca2211cb14cadf2ff4b8e0fa0bb72ff5e238c81996cbd29e2
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
deleted file mode 100644
index 444cc259d28b..000000000000
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-MY_P="${PN}-1.2.4.81.g4884e"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch" ) # bug #793410
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r ucm{,2}
-}
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 6a398741fe90..7c1e11bcc936 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -9,4 +9,5 @@ DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb5
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 EBUILD freeimage-3.18.0-r2.ebuild 3174 BLAKE2B fb299df99374303edc9f38dd38effe2a2aeff342446a4f2b44cb8878b393308cc1611801d32e23a892ffbf879616ee03f5216f75545e712a8c4211f5bce90858 SHA512 252093fc344316203110f98c1eca639e1834a8d5196f7cf86d6e6b0fe3adbbfdbc891b6d3d63ac4f08e2496e37b3fb82959794f3e7a9f83858a1306ebae0d21b
+EBUILD freeimage-3.18.0-r3.ebuild 3177 BLAKE2B 1eb95c0748aadbfaa5db564df945cd1dfb09d73b069f085b52635a537e583f295a815cf2f5cb83b1739be4881ae7c6eae8cdd097dbce16853d608857e6676860 SHA512 f74db9c5a20a4868a6f7544c917665e7b05bd9944d92822aa1e19a1a89231c2037901c91edcf5a183957ba71388873a923eb7403fc149dd72dc9fb394075f24e
 MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
new file mode 100644
index 000000000000..f172fa6a2216
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix toolchain-funcs
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="https://freeimage.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	mirror://sourceforge/${PN}/${MY_P}.pdf
+	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
+
+# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( media-libs/openexr:0= )
+	png? ( media-libs/libpng:0= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		media-libs/ilmbase:=
+		media-libs/tiff:0
+	)
+	webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+PATCHES=(
+	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
+	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
+	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+	"${FILESDIR}"/${PN}-3.18.0-raw.patch
+	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
+	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
+)
+
+src_prepare() {
+	pushd Source >/dev/null || die
+	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+	popd >/dev/null || die
+
+	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+	sed -i \
+		-e "s:/./:/:g" \
+		-e "s: ./: :g" \
+		-e 's: Source: \\\n\tSource:g' \
+		-e 's: Wrapper: \\\n\tWrapper:g' \
+		-e 's: Examples: \\\n\tExamples:g' \
+		-e 's: TestAPI: \\\n\tTestAPI:g' \
+		-e 's: -ISource: \\\n\t-ISource:g' \
+		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
+		-e 's:INCLS:\nINCLS:g' \
+		Makefile.srcs fipMakefile.srcs || die
+	sed -i \
+		-e "/LibJPEG/d" \
+		-e "/LibJXR/d" \
+		-e "/LibPNG/d" \
+		-e "/LibTIFF/d" \
+		-e "/Source\/ZLib/d" \
+		-e "/LibOpenJPEG/d" \
+		-e "/OpenEXR/d" \
+		-e "/LibRawLite/d" \
+		-e "/LibMNG/d" \
+		-e "/LibWebP/d" \
+		-e "/LibJXR/d" \
+		Makefile.srcs fipMakefile.srcs || die
+
+	default
+}
+
+foreach_make() {
+	local m
+	for m in Makefile.{gnu,fip} ; do
+		emake -f ${m} \
+			USE_EXR=$(usex openexr) \
+			USE_JPEG=$(usex jpeg) \
+			USE_JPEG2K=$(usex jpeg2k) \
+			USE_MNG=$(usex mng) \
+			USE_PNG=$(usex png) \
+			USE_TIFF=$(usex tiff) \
+			USE_RAW=$(usex raw) \
+			USE_WEBP=$(usex webp) \
+			$(usex static-libs '' STATICLIB=) \
+			"$@"
+	done
+}
+
+src_compile() {
+	tc-export AR PKG_CONFIG
+	foreach_make \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN}
+}
+
+src_install() {
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
+	einstalldocs
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9cec7c8dfc09..9dc2a052aef9 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 0fcc457ba91b..b2ed075b3b97 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -6,8 +6,6 @@ AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
 DIST alsa-utils-1.2.5.1.tar.bz2 1326965 BLAKE2B 79f96fd3ba1d92e72dc634dc01439acd3ccd02555c39cc1714c52bbd1e4bc8b68ec7bf5d219a704533e4a61587c3528504ef9cd7c652924d74daafa90f74e42a SHA512 bbafeb9189ec5802965c4e69cf6e7cd4c132ffb77b57f164d6585649890f96edd052c72697171fd629b39e12f78648fea634468df34c1a80255227ca397907bf
-DIST alsa-utils-1.2.5.tar.bz2 1326676 BLAKE2B 52cbe978390e1b5600bf7422e67ece1d24a946d99acddbc059bf6eb3a0b8dfe37cc573167013296e923bf1597973eb55b2580eaf849e088822ba7b2afc14279f SHA512 0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1
 EBUILD alsa-utils-1.2.4.ebuild 2347 BLAKE2B e88315e90b294ccdb23be786b62441b4dc8a962512253a585b52eb20c0198e6c5b19105f2f379829002afa5f04c1ffd6a4646a4c413585bf07eccb7bc7b13343 SHA512 aa4a8d1783e8ccc6ac18a1143fcb8200a24132cbe12d547ff22c77634fd05b212dfec2aeb6d72bf8f2a2526707e7898d9daba01f5673245b3d6bae59b733a19c
-EBUILD alsa-utils-1.2.5-r1.ebuild 2513 BLAKE2B 8ed803654a0a5918ae83774e65f07159ff0ea14324c937c3f6452ab526241db10dc5c5c3486b9ad9f33b765fcebea6eaeb9324f5f0d5fe14be30677969322250 SHA512 ac76c3dbef7dca7fb2da0ad8c93a862393712bb5ce638083adb7c2eea9e63167981117f5a91193b0b6cc5aeb66590ddf9b0d91b752e3792812608f2cb18a001f
 EBUILD alsa-utils-1.2.5.1.ebuild 2362 BLAKE2B 7acbdbc09430867420509a8d1eec1bfe99384e7c063d5409844ff320a784a7a1621799c78f5c0368f41eb0b17438d6389f4fbe6d581955f4dff6e45920f467f7 SHA512 5089297682395c41c7aec121853425d0c5acf9232e4cbd6b83a0b4bedc6ca3e6e3ebd4b5a8926fd0d22e1a4d5b3f5d2fb858b5a30aab3ca144416e1c17cfafa8
 MISC metadata.xml 480 BLAKE2B 1017b3f508632b0a56786a3b1e46304e4f4cbfd78335f07894ea0d4200e743a22ff0f4803f38314d0fc10dab6d35c40dd1af69e1d5aad3d36034a1cd504c4862 SHA512 c8440f0dc84c3e0d5459c07b975fc723ab346c5b817aaa1ae113964af9678d89d00692fb58494a1c88324a5cfbc9d2bede644362b34e97405c6add51730e943e
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
deleted file mode 100644
index 2c95a68cb144..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.5-fix-the-nested-iteration.patch # bug #793410
-	"${FILESDIR}"/${PN}-1.2.5-fix-potential-null-pointer-from-strchr.patch # bug #793410
-	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-		--disable-alsaconf
-		--disable-maintainer-mode
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(use_enable bat)
-		$(use_enable libsamplerate alsaloop)
-		$(use_enable ncurses alsamixer)
-		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 23f463d94f12..d7c5d4ea712c 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 0a3f09593484..9282a68305a3 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,9 @@
 AUX makemkv-flags.patch 481 BLAKE2B 26ea134bddf0c1168944bc76de20cf1b860178a990dab88ee61f3656495ea125d97e929e0626b6626f2fa12e1219e3dcfb80067e9f682311bb75d8750dc7eddb SHA512 c43c28774e9750f79624ff682bbcd8566aadf18bf4c44692d214e80f654eecf63f26bcaa8c7292d4d8e3969350f50f0b720982099e0114866630a8c0828088a7
 AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed
 DIST makemkv-bin-1.16.4.tar.gz 15455839 BLAKE2B 5d29416beeb06f5fc66db39e5323de4d3491b120ec1b734183c9aaf937baf8a63a277ddb378b668d9659c34449c474e2ab9a7bb82a448f33de85abf82e5e791b SHA512 d2d12a18ef64e77d7a47e1e68ced265fbd2071fd60fb8118085c2b8c892132e9ef81f1a54c09e5f45be6f880a91cef3bb25ed5e86e3735f5b449c6b7fb88a72f
+DIST makemkv-bin-1.16.5.tar.gz 15585124 BLAKE2B c006b47af571089de5a3283f0f4094556b3fbd9b67d26f7fc57e05e6feb0b3a6875742d8eb5536c561dbd8e6914b9255e38b97eb0b9acaba761daa28e532c3af SHA512 4e0ee2f2d9036a46dc3d3bdf13048c17f7efe886ddf808911d7694c319b0b887439907a0d5f47a7ff3824ef7bfb036d5900a66d3f500dc1b57223012479a0609
 DIST makemkv-oss-1.16.4.tar.gz 6536730 BLAKE2B 8f5167c6b5056f9ea38a47b60875aac8394c130b40f08ef7a102f00937c34feb58e6436a9140509da9fc2d2b835956dede6bd8485827f3037b2026b0421a7094 SHA512 e25b41cbc348a49f13914af6b2dd040376c7517273dd4f49dc68fe9e363e28e336fb6d3d525b190c11d70e7c9b7127ffabdd89b3130cd1aab55a6a6f708d7452
+DIST makemkv-oss-1.16.5.tar.gz 6541723 BLAKE2B e628fa65a883e69b51a84bdc0d46da5628c1981017f2e64a31e36e3b7bc45e16d2a94831a6e0fd405676d8385ce11afb9db7d5fc81f2cb174e9ca44dde775f1d SHA512 865f621fb326541dcc05231667510895cb20e3bccb4705d67533aefec57b043d6fd33f0541290428f45226123f2dc419f7d0f2c071518f6f7a548c5aeea8978e
 EBUILD makemkv-1.16.4.ebuild 3062 BLAKE2B dedd22e64d56f81d71ddc1a1485775929e50f0eec961c6d54e8cd28cbdd069ce1cf2ffff5b2fad82940df8f3d43d33557788e9eb74c4e4917037fa955069eb69 SHA512 7a59ec5d41b7d99b43bb2f2d9d023d9129d179d5573b054eafad16b56fc89f384d19dd7e1a9cbc048d395cd73e83cf7689821185646195e8eac18ff47d357d03
+EBUILD makemkv-1.16.5.ebuild 3062 BLAKE2B da5bfc8f074694402ad05878fcec5590a64e520a2793a509d28ce91cc5e63be150ab551bf0f9adb9d7bb0a2afd75cd3f72da9a2c68c6bd55ff80ccf080312ede SHA512 f64291ca19f83a2a32401376c93be2129a52146234d4d8185af9b6cae6081a5fb79e23c4be70abd250bd0b1c0a17fb0d4450c20f0aca7530e3f34b7306461405
 MISC metadata.xml 1272 BLAKE2B 7c02bfcb2638d2f33c6fbee2d0e79b6d7d270b8209f7ec82ec51d7cf0e19b94936ee599b618f9a6b9df280fc403b0890b2c8e2323525f6d50b79fc19d26c8756 SHA512 8de92a5802b26a98984be7b5e3c0868b249c14a77a690a186dc4361db1508b79c7ebccd261e7fe9251b2d4abbbe2b93aec8a91efeafc00baada2839020a9207f
diff --git a/media-video/makemkv/makemkv-1.16.5.ebuild b/media-video/makemkv/makemkv-1.16.5.ebuild
new file mode 100644
index 000000000000..23a32955e746
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.16.5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info xdg
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/"
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+	http://www.makemkv.com/download/${MY_PB}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui +java"
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+	dev-libs/expat
+	dev-libs/openssl:0=[-bindist(-)]
+	>=media-video/ffmpeg-1.0.0:0=
+	sys-libs/glibc
+	sys-libs/zlib
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="
+	${DEPEND}
+	net-misc/wget
+	java? ( >=virtual/jre-1.8 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	gui? ( dev-qt/qtcore:5 )
+"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-path.patch
+	"${FILESDIR}"/${PN}-flags.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use java; then
+		rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
+	fi
+}
+
+src_configure() {
+	# See bug #439380.
+	replace-flags -O* -Os
+
+	econf \
+		--enable-debug \
+		--disable-noec \
+		$(use_enable gui) \
+		$(use_enable gui qt5)
+}
+
+src_install() {
+	local myarch
+	case "${ARCH}" in
+		arm) myarch=armel ;;
+		x86) myarch=i386 ;;
+		*) myarch=${ARCH} ;;
+	esac
+
+	default
+
+	# add missing symlinks for QA
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+	cd "${WORKDIR}"/${MY_PB} || die
+
+	# install prebuilt bin
+	dobin bin/"${myarch}"/makemkvcon
+
+	# additional tool is actually part of makemkvcon
+	dosym makemkvcon /usr/bin/sdftool
+
+	# install profiles and locales
+	insinto /usr/share/MakeMKV
+	doins src/share/*
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "While MakeMKV is in beta mode, upstream has provided a license"
+	elog "to use if you do not want to purchase one."
+	elog ""
+	elog "See this forum thread for more information, including the key:"
+	elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053"
+	elog ""
+	elog "Note that beta license may have an expiration date and you will"
+	elog "need to check for newer licenses/releases. "
+	elog ""
+	elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
+	elog "is no longer necessary and you should delete it from there to"
+	elog "avoid warning messages."
+	elog ""
+	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
+	elog "libbdplus, allowing transparent decryption of a wider range of"
+	elog "titles under players like VLC and mplayer. To enable this, set"
+	elog "the following variables when launching the player:"
+	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f716ec696972..d7ab1d48a7a5 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 296b5895887b..c804de900358 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Nov 2021 14:09:15 +0000
+Tue, 02 Nov 2021 12:09:13 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 2a9c0b646d94..28a9d420ea56 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 517807 BLAKE2B 2ecdb63e9cfe1a1b71d23ab4fe58b057928be5a410ab9012b87ec1e7c917af227099229248e5b2c7dc5b25edb96e4adad920259d956349d0ecbb204178f8da2c SHA512 4ca9cc06a8ae7d4eefdd8a435b92f1f4e675295b618afdb11cf1d7f45b49f0fd5137f7f0c81b60933a8b942fe25de9928a9f4ffe0d5968bae8eae39c95a7da50
-TIMESTAMP 2021-11-01T14:09:18Z
+TIMESTAMP 2021-11-02T12:09:17Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmF/9Q5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGBKm1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBwEQ//YfBSh6X72ojeCucmBPsWFgsAdzjkHU0wC0T96yM2Mp+sA9aNqDTJ+/vP
-dIhaWG7JBRZOrVpOVNJs2nZZJ10Zcez6ozsQprcvYZ2wGxsqIMIDE5/QEGrje5bq
-f5gm3YxekjqKNAufLPBXv1D072urNayfXrcv7bWKCJsYYBDFl7VuXxQ0NsdX/yRM
-XOiRJtMB3gJp3Q6Q8+PkL5E4Uoeg0T9zDUUltHOCMGOI3zZaWADR3G+xvQUiU2K4
-EsoHw6GhIfNtGdtsSrTvNIXewAvXHSO1Q6YWqDbFB1iw4xHpAcG0Y7FxiDkcdUV3
-ArFPVJPyyONyQkyQ5UzTXJ0brXADh/z+n803PmJxBk8AnyibUd9brdLgv11X/5Co
-h6gx0G5HOEbeizyVqCyBwiR3NWQR52g/b/mZDBbfPBsiYi1MZAChfEQP+r/3OD82
-fgKQRlI4sDNHlC4HZLilQ7vJrm50FL6uIZMTVBidS3C9Z2WdjvnOEghhuW0R9K7c
-+kJTXVv3nwjuJ6exmnNdJoXZPBFB6RbFRb3u7NmDaDh94EOa8w06/hAG5NV6pfZJ
-RLFyeovdR4pDpidvrfmo9OP62qKH1jO9vQhg/saI47OiT5mmppdru14Y494JIjRE
-zq+tzGMQar5f+7Fihkg2E7aa4fcn9P2cwslCdMXXlH5/K148fIY=
-=9cPL
+klCucBAAlchofSEbGcG7ZJbRljsZD4x0StumA3pzLOgTpxDHdpLwG3qswJT7s0sI
+OOcMHKXknfxbjXAdmFs9Ab2ii4lWBfOO5/s3p1En1LfelhGGPTkIrH7R/FZ36Mml
+f2oQEut2IrY/cdRaQRwQklbv5XCdlNDXl9If8FpsIC5wI7XyH9Tp7yIFCJa8FrPH
+JFAwaYix608cdIejhXJkEOgguIX6auIUMj/G4+fRRDnH6qjUISa4iF5kmvderV5o
+4+C3qswHVMp/NpLLunntKWSd/RanJ/oNvii+NdddVYchJf80ydPi8/j2gnBmZ0CP
+KiptkWkLYzGiWYvMVf2DgiWvc3pvyzParOocLblxQx8UlLhKWVnFwbGVAmDxbWZD
+O/7fXsqUgXfqzq/1oSrtQuIXUQW89zJet5Aw6Sirh9KKhnQ6X+8nWgeKiiwTxjwf
+1Wum6BN3UJ4IavahX2LHcPeTr0QXmnUFcyMxPSchwD7tAO7K2jErMsnFLqo+xLRQ
+we198C0b3qtHbxDMuO2PE9WxX4ZdiBexHJBTL6zqjHvfB3vVc0NtAZfg3ND1vqSg
+iBvORrRXywxcvWnV+9pdqo75EHE6ktdbyeRMxD6fFY+YTOMSfyo1UK+bFSbmgwrm
+eZpXmAP1KUjSc20V1+RevYklWJqliQNOtXnRbOb4zOdzBFEBmfg=
+=tniM
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 296b5895887b..c804de900358 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Nov 2021 14:09:15 +0000
+Tue, 02 Nov 2021 12:09:13 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e5596a88c617..db08430840c9 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index aa07cb4cee70..92b18bc7c8dc 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/awscli-1.21.8 b/metadata/md5-cache/app-admin/awscli-1.21.8
new file mode 100644
index 000000000000..3eebb3085ca3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.21.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.22.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.22.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.21.8.tar.gz -> awscli-1.21.8.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 0f6db241af05..5d44c6e392b3 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.5 b/metadata/md5-cache/app-benchmarks/stress-1.0.5
index 44dc6d51e193..cbad84ae3f2b 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.5
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.5
@@ -4,9 +4,9 @@ DESCRIPTION=A deliberately simple workload generator for POSIX systems
 EAPI=8
 HOMEPAGE=https://salsa.debian.org/debian/stress
 IUSE=static
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/stress/stress_1.0.5.orig.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=89556fddeb7da528ffc17e5e7d767254
+_md5_=1a36e2e0c59ad3dd03c53e54771227be
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 700a2eb5980f..7967b3106ae4 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/broot-1.7.0 b/metadata/md5-cache/app-misc/broot-1.7.0
index cac3ee52b46c..8b177e45f06f 100644
--- a/metadata/md5-cache/app-misc/broot-1.7.0
+++ b/metadata/md5-cache/app-misc/broot-1.7.0
@@ -1,4 +1,4 @@
-BDEPEND=>=virtual/rust-1.53
+BDEPEND=>=virtual/rust-1.56 >=virtual/rust-1.53
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-libs/libgit2:= X? ( x11-libs/libxcb:= )
 DESCRIPTION=A new way to see and navigate directory trees
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/libgit2:= X? ( x11-libs/libxcb:= )
 SLOT=0
 SRC_URI=https://github.com/Canop/broot/archive/v1.7.0.tar.gz -> broot-1.7.0.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/ahash/0.7.4/download -> ahash-0.7.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_colours/1.0.4/download -> ansi_colours-1.0.4.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/anyhow/1.0.42/download -> anyhow-1.0.42.crate https://crates.io/api/v1/crates/argh/0.1.5/download -> argh-0.1.5.crate https://crates.io/api/v1/crates/argh_derive/0.1.5/download -> argh_derive-0.1.5.crate https://crates.io/api/v1/crates/argh_shared/0.1.5/download -> argh_shared-0.1.5.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bet/1.0.0/download -> bet-1.0.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/bytemuck/1.7.2/download -> bytemuck-1.7.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.69/download -> cc-1.0.69.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/char_reader/0.1.0/download -> char_reader-0.1.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cli-log/0.1.0/download -> cli-log-0.1.0.crate https://crates.io/api/v1/crates/cli-log/2.0.0/download -> cli-log-2.0.0.crate https://crates.io/api/v1/crates/clipboard-win/4.2.1/download -> clipboard-win-4.2.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam/0.8.1/download -> crossbeam-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.5/download -> crossbeam-epoch-0.9.5.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.2/download -> crossbeam-queue-0.3.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crossterm/0.19.0/download -> crossterm-0.19.0.crate https://crates.io/api/v1/crates/crossterm/0.21.0/download -> crossterm-0.21.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.7.0/download -> crossterm_winapi-0.7.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.8.0/download -> crossterm_winapi-0.8.0.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv2svg/0.1.5/download -> csv2svg-0.1.5.crate https://crates.io/api/v1/crates/custom_error/1.9.2/download -> custom_error-1.9.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/deser-hjson/1.0.2/download -> deser-hjson-1.0.2.crate https://crates.io/api/v1/crates/directories/3.0.2/download -> directories-3.0.2.crate https://crates.io/api/v1/crates/directories-next/2.0.0/download -> directories-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/error-code/2.3.0/download -> error-code-2.3.0.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/file-size/1.0.3/download -> file-size-1.0.3.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gif/0.11.2/download -> gif-0.11.2.crate https://crates.io/api/v1/crates/git2/0.13.20/download -> git2-0.13.20.crate https://crates.io/api/v1/crates/glassbench/0.3.0/download -> glassbench-0.3.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashlink/0.6.0/download -> hashlink-0.6.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/id-arena/2.2.1/download -> id-arena-2.2.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/image/0.23.14/download -> image-0.23.14.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/instant/0.1.10/download -> instant-0.1.10.crate https://crates.io/api/v1/crates/is_executable/1.0.1/download -> is_executable-1.0.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.22/download -> jpeg-decoder-0.1.22.crate https://crates.io/api/v1/crates/lazy-regex/2.2.2/download -> lazy-regex-2.2.2.crate https://crates.io/api/v1/crates/lazy-regex-proc_macros/2.2.2/download -> lazy-regex-proc_macros-2.2.2.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/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lfs-core/0.4.2/download -> lfs-core-0.4.2.crate https://crates.io/api/v1/crates/libc/0.2.98/download -> libc-0.2.98.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.21+1.1.0/download -> libgit2-sys-0.12.21+1.1.0.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.20.1/download -> libsqlite3-sys-0.20.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.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.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/minimad/0.7.1/download -> minimad-0.7.1.crate https://crates.io/api/v1/crates/minimad/0.9.0/download -> minimad-0.9.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/onig/6.2.0/download -> onig-6.2.0.crate https://crates.io/api/v1/crates/onig_sys/69.7.0/download -> onig_sys-69.7.0.crate https://crates.io/api/v1/crates/open/1.7.1/download -> open-1.7.1.crate https://crates.io/api/v1/crates/open/2.0.0/download -> open-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/pathdiff/0.2.0/download -> pathdiff-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.9.0/download -> phf-0.9.0.crate https://crates.io/api/v1/crates/phf_generator/0.9.0/download -> phf_generator-0.9.0.crate https://crates.io/api/v1/crates/phf_macros/0.9.0/download -> phf_macros-0.9.0.crate https://crates.io/api/v1/crates/phf_shared/0.9.0/download -> phf_shared-0.9.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.2.0/download -> plist-1.2.0.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/proc-status/0.1.1/download -> proc-status-0.1.1.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rusqlite/0.24.2/download -> rusqlite-0.24.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.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/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/secular/1.0.1/download -> secular-1.0.1.crate https://crates.io/api/v1/crates/serde/1.0.127/download -> serde-1.0.127.crate https://crates.io/api/v1/crates/serde_derive/1.0.127/download -> serde_derive-1.0.127.crate https://crates.io/api/v1/crates/serde_json/1.0.66/download -> serde_json-1.0.66.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook/0.3.9/download -> signal-hook-0.3.9.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.1/download -> signal-hook-mio-0.2.1.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/siphasher/0.3.6/download -> siphasher-0.3.6.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/splitty/0.1.0/download -> splitty-0.1.0.crate https://crates.io/api/v1/crates/str-buf/1.0.5/download -> str-buf-1.0.5.crate https://crates.io/api/v1/crates/strict/0.1.4/download -> strict-0.1.4.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/svg/0.8.2/download -> svg-0.8.2.crate https://crates.io/api/v1/crates/syn/1.0.74/download -> syn-1.0.74.crate https://crates.io/api/v1/crates/syntect/4.6.0/download -> syntect-4.6.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termimad/0.10.3/download -> termimad-0.10.3.crate https://crates.io/api/v1/crates/termimad/0.17.0/download -> termimad-0.17.0.crate https://crates.io/api/v1/crates/terminal-clipboard/0.3.0/download -> terminal-clipboard-0.3.0.crate https://crates.io/api/v1/crates/termux-clipboard/0.1.0/download -> termux-clipboard-0.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/thiserror/1.0.26/download -> thiserror-1.0.26.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.26/download -> thiserror-impl-1.0.26.crate https://crates.io/api/v1/crates/tiff/0.6.1/download -> tiff-0.6.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.3.1/download -> tinyvec-1.3.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/umask/1.0.0/download -> umask-1.0.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.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.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/weezl/0.1.5/download -> weezl-0.1.5.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/x11-clipboard/0.5.3/download -> x11-clipboard-0.5.3.crate https://crates.io/api/v1/crates/xcb/0.10.1/download -> xcb-0.10.1.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=747174deee3ee2d36dca9f300aff038c
+_md5_=e7c500209d50a86c0d7ad00711b1bf27
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 4c177990a98d..0cec6b6cdc6c 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/inform-6.33.1_p2 b/metadata/md5-cache/dev-lang/inform-6.33.1_p2
index ecfca362858d..80247456dd79 100644
--- a/metadata/md5-cache/dev-lang/inform-6.33.1_p2
+++ b/metadata/md5-cache/dev-lang/inform-6.33.1_p2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-DESCRIPTION=design system for interactive fiction
-EAPI=5
-HOMEPAGE=http://www.inform-fiction.org/
+DESCRIPTION=Design system for interactive fiction
+EAPI=8
+HOMEPAGE=https://www.inform-fiction.org/
 IUSE=emacs
 KEYWORDS=amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Artistic-2 Inform
 PDEPEND=emacs? ( app-emacs/inform-mode )
 SLOT=0
-SRC_URI=http://mirror.ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-6.33.1-b2.tar.gz
-_md5_=924ca06dee495d15a564bbee6019532e
+SRC_URI=mirror://gentoo/inform-6.33.1-b2.tar.gz
+_md5_=d5a82a2ee7a2aa05e56e715c62f7b90a
diff --git a/metadata/md5-cache/dev-lang/inform-6.35_p4 b/metadata/md5-cache/dev-lang/inform-6.35_p4
new file mode 100644
index 000000000000..df01fbaf8bcb
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/inform-6.35_p4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Design system for interactive fiction
+EAPI=8
+HOMEPAGE=https://www.inform-fiction.org/
+IUSE=emacs tools
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=Artistic-2 Inform
+PDEPEND=emacs? ( app-emacs/inform-mode )
+RDEPEND=tools? ( dev-lang/perl dev-perl/DateTime )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-6.35-r4.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2254643d8f663781485ff6ec797a1b9e
diff --git a/metadata/md5-cache/dev-lang/rust-1.56.1 b/metadata/md5-cache/dev-lang/rust-1.56.1
new file mode 100644
index 000000000000..ee201f0baa1f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.56.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.55* =dev-lang/rust-bin-1.55* =dev-lang/rust-1.56* =dev-lang/rust-bin-1.56* ) ) !system-llvm? ( >=dev-util/cmake-3.13.4 dev-util/ninja ) test? ( sys-devel/gdb ) verify-sig? ( app-crypt/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:13[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:13[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:13[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:13[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:13[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:13[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:13[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:13[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:13[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:13[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:13[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:13[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:13[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:13[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:13[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:13[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:13[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-14:= wasm? ( sys-devel/lld ) ) !!sys-devel/llvm:0
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:13[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:13[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:13[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:13[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:13[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:13[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:13[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:13[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:13[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:13[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:13[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:13[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:13[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:13[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:13[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:13[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:13[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-14:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust !<dev-lang/rust-1.47.0-r1 !<dev-lang/rust-bin-1.47.0-r1
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
+RESTRICT=test
+SLOT=stable/1.56
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.56.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.56.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.55.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.55.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.55.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.55.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.55.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=83db52b2c07a0ac6be31bc664b046639
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.56.1 b/metadata/md5-cache/dev-lang/rust-bin-1.56.1
new file mode 100644
index 000000000000..1d55c51d8de6
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.56.1
@@ -0,0 +1,14 @@
+BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( app-crypt/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 doc prefix rls rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-20190311
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.56.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.56.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.56.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.56.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.56.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.56.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.56.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.56.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.56.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.56.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.56.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.56.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=fcaad7976ab71daa82a1d9964cf629a8
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b63f95816c8b..0a2de7752f9e 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/libarcus-4.9.1 b/metadata/md5-cache/dev-libs/libarcus-4.9.1
index 0e1b544a6f70..1b6331592b71 100644
--- a/metadata/md5-cache/dev-libs/libarcus-4.9.1
+++ b/metadata/md5-cache/dev-libs/libarcus-4.9.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/protobuf:= python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] python? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] python? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/protobuf:= python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] python? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] python? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] python? ( dev-python/protobuf-python[python_targets_python3_10(-)] ) )
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples +python static-libs python_single_target_python3_8 python_single_target_python3_9
+IUSE=examples +python static-libs python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/protobuf:= python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] python? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] python? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/protobuf:= python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] python? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] python? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] python? ( dev-python/protobuf-python[python_targets_python3_10(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.9.1.tar.gz -> libarcus-4.9.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=dd8233dbb3368f6f0e57831a792c3b49
+_md5_=8c3c4cde38e44c63fb2a7b31208f6191
diff --git a/metadata/md5-cache/dev-libs/libcec-6.0.2 b/metadata/md5-cache/dev-libs/libcec-6.0.2
index c8d97d404f7c..2f96b635dd80 100644
--- a/metadata/md5-cache/dev-libs/libcec-6.0.2
+++ b/metadata/md5-cache/dev-libs/libcec-6.0.2
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libplatform-2.0.0 python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) tools? ( sys-libs/ncurses:= ) udev? ( virtual/udev ) xrandr? ( x11-libs/libXrandr ) python? ( dev-lang/swig )
+DEPEND=>=dev-libs/libplatform-2.0.0 python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) tools? ( sys-libs/ncurses:= ) udev? ( virtual/udev ) xrandr? ( x11-libs/libXrandr ) python? ( dev-lang/swig )
 DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
 EAPI=7
 HOMEPAGE=http://libcec.pulse-eight.com
-IUSE=cubox exynos python raspberry-pi kernel-cec tools +xrandr udev kernel_linux python_single_target_python3_8 python_single_target_python3_9
+IUSE=cubox exynos python raspberry-pi kernel-cec tools +xrandr udev kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libplatform-2.0.0 python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) tools? ( sys-libs/ncurses:= ) udev? ( virtual/udev ) xrandr? ( x11-libs/libXrandr )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=>=dev-libs/libplatform-2.0.0 python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) tools? ( sys-libs/ncurses:= ) udev? ( virtual/udev ) xrandr? ( x11-libs/libXrandr )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-6.0.2.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=0fbe0087428e0b8547693ee95ee2340f
+_md5_=054a1f756cbe7ded37a3d2a96b78344a
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1 b/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
index 53c85117c396..a30651577c23 100644
--- a/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
+++ b/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] ) )
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+client +dbus test python_single_target_python3_8 python_single_target_python3_9
+IUSE=+client +dbus test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dbus? ( acct-group/ultimaker acct-user/ultimaker sys-apps/dbus )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dbus? ( acct-group/ultimaker acct-user/ultimaker sys-apps/dbus )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.9.1.tar.gz -> libcharon-4.9.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=37e9469efcdc7b80441103d609ac9a1f
+_md5_=f589bf3bacbf517c22d7f37519505d88
diff --git a/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r2 b/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r2
deleted file mode 100644
index 50a5db8b9f41..000000000000
--- a/metadata/md5-cache/dev-libs/libmowgli-2.1.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=ssl? ( dev-libs/openssl:0= ) !~dev-libs/libmowgli-2.1.0
-DESCRIPTION=Useful set of performance and usability-oriented extensions to C
-EAPI=7
-HOMEPAGE=https://github.com/atheme/libmowgli-2
-IUSE=ssl
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=ssl? ( dev-libs/openssl:0= ) !~dev-libs/libmowgli-2.1.0
-SLOT=2
-SRC_URI=https://github.com/atheme/libmowgli-2/archive/v2.1.3.tar.gz -> libmowgli-2.1.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e513602ad92adfe767c9f10c03902f2
diff --git a/metadata/md5-cache/dev-libs/libsass-3.6.5 b/metadata/md5-cache/dev-libs/libsass-3.6.5
index 73cef2bee3c9..a6df71b517da 100644
--- a/metadata/md5-cache/dev-libs/libsass-3.6.5
+++ b/metadata/md5-cache/dev-libs/libsass-3.6.5
@@ -4,9 +4,9 @@ DESCRIPTION=A C/C++ implementation of a Sass CSS compiler
 EAPI=7
 HOMEPAGE=https://github.com/sass/libsass
 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 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=https://github.com/sass/libsass/archive/3.6.5.tar.gz -> libsass-3.6.5.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4ccbd7c5ef1a38b3e01a91eb70853131
+_md5_=1b7af987c7327a3500624573d3951a51
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.9.1 b/metadata/md5-cache/dev-libs/libsavitar-4.9.1
index afc8e33ec985..5b405f577ef5 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-4.9.1
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.9.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/pugixml python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] ) test? ( dev-cpp/gtest dev-cpp/tbb )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/pugixml python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] ) test? ( dev-cpp/gtest dev-cpp/tbb )
 DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs test python_single_target_python3_8 python_single_target_python3_9
+IUSE=+python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/pugixml python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/pugixml python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.9.1.tar.gz -> libsavitar-4.9.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=e149451f9dc9bc946d73b85576d54d11
+_md5_=2ae52cd5faecef35ee0cb0c166ec9160
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 49d7c7aefeef..25e6f7157f3c 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/ppx_sexp_conv-0.14.3 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
index b24df2ad3069..d07707e9dc7f 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
@@ -5,10 +5,10 @@ DESCRIPTION=Support Library for type-driven code generators
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.3
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.3.tar.gz -> ppx_sexp_conv-0.14.3.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=5f8faeb3af57f35b560cc72224e47015
+_md5_=6e13d00bea1b23095835dd6926d46fe1
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
index 1897391a9c23..c351e83ddf0a 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
@@ -5,10 +5,10 @@ DESCRIPTION=Generation of runtime types from type declarations
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.2.tar.gz -> ppx_typerep_conv-0.14.2.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=153c88ce88a81fd53c6f1a861088829e
+_md5_=014df05f1a440d3e37c6083836cb51a0
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2 b/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
index 9d400201dc57..9d29db2536a8 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Base library and tools for ppx rewriters
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
 IUSE=+ocamlopt test
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.2.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.22.2
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.22.2.tar.gz -> ppxlib-0.22.2.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=d19c8e7760485155d1809b6841e2790a
+_md5_=3a4a6406d24eb11685362280911346f6
diff --git a/metadata/md5-cache/dev-perl/Gtk3-ImageView-10.0.0 b/metadata/md5-cache/dev-perl/Gtk3-ImageView-10.0.0
index 24902dac546e..48d6fd182596 100644
--- a/metadata/md5-cache/dev-perl/Gtk3-ImageView-10.0.0
+++ b/metadata/md5-cache/dev-perl/Gtk3-ImageView-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Image viewer widget for Gtk3
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Gtk3-ImageView
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Cairo >=dev-perl/glib-perl-1.210.0 dev-perl/Gtk3 dev-perl/Readonly dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-10.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=be5dced6b8614d8dd75a9d26afb61736
+_md5_=1dc3d79fecd933befad22976e266a791
diff --git a/metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0 b/metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0-r1
similarity index 70%
rename from metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0
rename to metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0-r1
index a7e799dcd147..8e3a356cdd99 100644
--- a/metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0
+++ b/metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0-r1
@@ -1,7 +1,8 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=Strip scripting constructs out of HTML
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTML-StripScripts
 IUSE=test
 KEYWORDS=~amd64 ~x86
@@ -10,5 +11,5 @@ RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-1.06.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f84ebdccccbdc639f8319e5deb938610
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=7edb6b9a2f9da68432f74e14c2e19e91
diff --git a/metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0 b/metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0-r1
similarity index 62%
rename from metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0
rename to metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0-r1
index bb87e912a275..7247a132a621 100644
--- a/metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0
+++ b/metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0-r1
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-perl/HTML-Parser-3.560.0 >=dev-perl/HTML-StripScripts-1.50.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/HTML-Parser-3.560.0 >=dev-perl/HTML-StripScripts-1.50.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=XSS filter using HTML::Parser
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTML-StripScripts-Parser
 IUSE=test
 KEYWORDS=~amd64 ~x86
@@ -10,5 +11,5 @@ RDEPEND=>=dev-perl/HTML-Parser-3.560.0 >=dev-perl/HTML-StripScripts-1.50.0 dev-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-Parser-1.03.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=7702ef1f686427d39e9a681d7dd37c57
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=251b58bfaef471e75aef7d8982e2b6c4
diff --git a/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1 b/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
deleted file mode 100644
index b943f4fedda8..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=produces HTML tables
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/HTML-Table
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AJ/AJPEACOCK/HTML-Table-2.08a.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=15f2fed659c2712ea9532bf95c47aee9
diff --git a/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r2 b/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r2
new file mode 100644
index 000000000000..df51e028603c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=produces HTML tables
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/HTML-Table
+IUSE=test
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AJ/AJPEACOCK/HTML-Table-2.08a.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=033357e1a9786afd2719d292d9d4533e
diff --git a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0 b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
deleted file mode 100644
index f5798e1ba94f..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/HTML-Parser dev-lang/perl:=[-build(-)]
-DESCRIPTION=Parse the content of tables in HTML
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/HTML-TableContentParser
-KEYWORDS=~amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/HTML-Parser dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SD/SDRABBLE/HTML-TableContentParser-0.13.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=adf8e25d0d495e713ba64c4f0072b608
diff --git a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.305.0 b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.305.0
new file mode 100644
index 000000000000..8a1397ad53ed
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.305.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp dev-perl/HTML-Parser virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Do interesting things with the contents of tables
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/HTML-TableContentParser
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/HTML-Parser dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/HTML-TableContentParser-0.305.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=be2aca7efb7e797514564c9afaab31cd
diff --git a/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0 b/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0-r1
similarity index 61%
rename from metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0
rename to metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0-r1
index fa36ba58a9a1..46bd9a36ed1e 100644
--- a/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0
+++ b/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0-r1
@@ -1,12 +1,15 @@
+BDEPEND=>=dev-perl/HTML-Element-Extended-1.160.0 dev-perl/HTML-Parser virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/HTML-Element-Extended-1.160.0 dev-perl/HTML-Parser virtual/perl-ExtUtils-MakeMaker dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=The Perl Table-Extract Module
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTML-TableExtract
+IUSE=test
 KEYWORDS=~alpha amd64 ~arm64 ppc ppc64 x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Element-Extended-1.160.0 dev-perl/HTML-Parser dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.15.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=bab0d87590729ac7f2bb9e170a3f7a85
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=20ebf67ea857ca09c9805aaf5af0f849
diff --git a/metadata/md5-cache/dev-perl/HTML-TableParser-0.420.0 b/metadata/md5-cache/dev-perl/HTML-TableParser-0.420.0
deleted file mode 100644
index 1cc5867bc490..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-TableParser-0.420.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/HTML-Parser-3.260.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 virtual/perl-CPAN-Meta test? ( >=virtual/perl-Test-Simple-0.320.0 ) dev-lang/perl
-DESCRIPTION=Extract data from an HTML table
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/HTML-TableParser
-IUSE=test
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-perl/HTML-Parser-3.260.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DJ/DJERIUS/HTML-TableParser-0.42.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=0bff77e28bac9bd5af2ad341ede7c14c
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-2.970.0 b/metadata/md5-cache/dev-perl/HTML-Template-2.970.0-r1
similarity index 60%
rename from metadata/md5-cache/dev-perl/HTML-Template-2.970.0
rename to metadata/md5-cache/dev-perl/HTML-Template-2.970.0-r1
index d6711c37971d..6571608acb83 100644
--- a/metadata/md5-cache/dev-perl/HTML-Template-2.970.0
+++ b/metadata/md5-cache/dev-perl/HTML-Template-2.970.0-r1
@@ -1,7 +1,8 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 >=virtual/perl-File-Spec-0.820.0 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/CGI virtual/perl-File-Temp virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 >=virtual/perl-File-Spec-0.820.0 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/CGI virtual/perl-File-Temp virtual/perl-Test-Simple ) dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=A Perl module to use HTML Templates
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTML-Template
 IUSE=test examples
 KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86
@@ -10,5 +11,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 >=virtual/perl-File-Spec-0.820
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-2.97.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=011b4e3afbd1f8e090ea8024f1ba2765
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=7a5a25d8c6a01e2fb3f0bfb787b84020
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1 b/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
deleted file mode 100644
index e857a7078bde..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/HTML-Template-2.8 dev-perl/Parse-RecDescent dev-lang/perl:=[-build(-)]
-DESCRIPTION=HTML::Template extension adding expression support
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/HTML-Template-Expr
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/HTML-Template-2.8 dev-perl/Parse-RecDescent dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-Expr-0.07.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a9eb3baf0a80f61dee8b3fc3358604fa
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r2 b/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r2
new file mode 100644
index 000000000000..16e39f778b0c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/HTML-Template-2.800.0 dev-perl/Parse-RecDescent dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=HTML::Template extension adding expression support
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/HTML-Template-Expr
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/HTML-Template-2.800.0 dev-perl/Parse-RecDescent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-Expr-0.07.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=b4c4618cd57d220e3142a57a139d7154
diff --git a/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0 b/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0-r1
similarity index 61%
rename from metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
rename to metadata/md5-cache/dev-perl/HTML-Tree-5.70.0-r1
index d0d1b5789fd2..7bad57d3125d 100644
--- a/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0-r1
@@ -1,7 +1,8 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/HTML-Tagset-3.20.0 >=dev-perl/HTML-Parser-3.460.0 virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.280.800 test? ( virtual/perl-Encode dev-perl/Test-Fatal dev-perl/Test-LeakTrace virtual/perl-Test-Simple dev-perl/URI ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/HTML-Tagset-3.20.0 >=dev-perl/HTML-Parser-3.460.0 virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.280.800 test? ( virtual/perl-Encode dev-perl/Test-Fatal dev-perl/Test-LeakTrace virtual/perl-Test-Simple dev-perl/URI ) dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=A library to manage HTML-Tree in PERL
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTML-Tree
 IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -10,5 +11,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/HTML-Tagset-3.20.0 >=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=27a27af4c20f6845d03b25869277e02f
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=a61c4132c29e99a6f90980e1d8029ca1
diff --git a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0 b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0
deleted file mode 100644
index 2b1c4bd11098..000000000000
--- a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Module-Build-0.280.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-JSON-PP dev-perl/Path-Tiny dev-perl/Test-FailWarnings virtual/perl-Test-Simple dev-perl/Test-Most dev-perl/Test-NoWarnings ) dev-lang/perl
-DESCRIPTION=Determine Web browser, version, and platform from an HTTP user agent string
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/HTTP-BrowserDetect
-IUSE=test
-KEYWORDS=amd64 ~hppa ~mips ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-BrowserDetect-3.14.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=201c9eaeb46faeebd3b13cad2fa2c382
diff --git a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.350.0 b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.350.0
new file mode 100644
index 000000000000..f8e451a19fe7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.350.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec dev-perl/Hash-Merge >=virtual/perl-JSON-PP-4.40.0 >=virtual/perl-Scalar-List-Utils-1.490.0 dev-perl/Path-Tiny dev-perl/Test-Differences >=virtual/perl-Test-Simple-0.960.0 dev-perl/Test-NoWarnings dev-perl/Test-Warnings ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Determine Web browser, version, and platform from an HTTP user agent string
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/HTTP-BrowserDetect
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-BrowserDetect-3.35.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=1ef3c4e7723b8f21c721f866bcf2a61e
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0 b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0-r1
similarity index 65%
rename from metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
rename to metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0-r1
index 5b64b7d2a88b..a853093a18de 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0-r1
@@ -1,7 +1,8 @@
+BDEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable test? ( dev-perl/Test-RequiresInternet virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable test? ( dev-perl/Test-RequiresInternet virtual/perl-Test-Simple ) dev-lang/perl
+DEPEND=dev-lang/perl
 DESCRIPTION=Cache the result of http get-requests persistently
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTTP-Cache-Transparent
 IUSE=test examples
 KEYWORDS=amd64 arm arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
@@ -10,5 +11,5 @@ RDEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable dev-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTIASH/HTTP-Cache-Transparent-1.4.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=4c849d7742c08b90f1c93a9021fe120f
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=3fa2644eabf498651be3897cee7cc826
diff --git a/metadata/md5-cache/dev-perl/HTTP-CookieJar-0.12.0 b/metadata/md5-cache/dev-perl/HTTP-CookieJar-0.12.0
new file mode 100644
index 000000000000..7d5b87c85be2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTTP-CookieJar-0.12.0
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( dev-perl/Mozilla-PublicSuffix ) virtual/perl-Carp dev-perl/HTTP-Date >=virtual/perl-Time-Local-1.190.100 virtual/perl-parent >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 dev-perl/HTTP-Message ) virtual/perl-File-Spec dev-perl/Test-Deep dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.960.0 dev-perl/URI ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A minimalist HTTP user agent cookie jar
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/HTTP-CookieJar
+IUSE=minimal test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( dev-perl/Mozilla-PublicSuffix ) virtual/perl-Carp dev-perl/HTTP-Date >=virtual/perl-Time-Local-1.190.100 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.012.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=7f1801d60a786690546140fa0cd97f4e
diff --git a/metadata/md5-cache/dev-perl/HTTP-CookieJar-0.8.0 b/metadata/md5-cache/dev-perl/HTTP-CookieJar-0.8.0
deleted file mode 100644
index 8ab6d03913cc..000000000000
--- a/metadata/md5-cache/dev-perl/HTTP-CookieJar-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( dev-perl/Mozilla-PublicSuffix ) virtual/perl-Carp dev-perl/HTTP-Date >=virtual/perl-Time-Local-1.190.100 virtual/perl-parent >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 dev-perl/HTTP-Message ) virtual/perl-File-Spec dev-perl/Test-Deep dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.960.0 dev-perl/URI ) dev-lang/perl
-DESCRIPTION=A minimalist HTTP user agent cookie jar
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/HTTP-CookieJar
-IUSE=test minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!minimal? ( dev-perl/Mozilla-PublicSuffix ) virtual/perl-Carp dev-perl/HTTP-Date >=virtual/perl-Time-Local-1.190.100 virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.008.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=37466327fe27a14d4ea0c2d1305870e1
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0 b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0
deleted file mode 100644
index 802996029835..000000000000
--- a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=dev-perl/HTTP-Date-6.0.0 virtual/perl-Time-Local >=dev-perl/HTTP-Message-6.0.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test virtual/perl-Test-Simple dev-perl/URI ) dev-lang/perl
-DESCRIPTION=Storage of cookies
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/HTTP-Cookies
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=dev-perl/HTTP-Date-6.0.0 virtual/perl-Time-Local >=dev-perl/HTTP-Message-6.0.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=6a0baa1c03a0417bfc5385fc7116b8fa
diff --git a/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0 b/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
deleted file mode 100644
index 64985734359a..000000000000
--- a/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/libwww-perl dev-perl/URI dev-perl/XML-DOM dev-lang/perl:=[-build(-)]
-DESCRIPTION=A WebDAV client library for Perl5
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/HTTP-DAV
-KEYWORDS=amd64 ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/libwww-perl dev-perl/URI dev-perl/XML-DOM dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.48.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fdbaf278a4bc7f1aae06297587831a87
diff --git a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.60.0 b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.60.0
deleted file mode 100644
index 486d1dbbc0a3..000000000000
--- a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.60.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Message-6.0.0 virtual/perl-IO-Socket-IP >=dev-perl/LWP-MediaTypes-6.0.0 virtual/perl-Socket virtual/perl-ExtUtils-MakeMaker >=dev-perl/Module-Build-Tiny-0.34.0 test? ( virtual/perl-File-Spec virtual/perl-Module-Metadata virtual/perl-Test-Simple dev-perl/Test-Needs dev-perl/URI ) dev-lang/perl
-DESCRIPTION=Base class for simple HTTP servers
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/HTTP-Daemon
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Message-6.0.0 virtual/perl-IO-Socket-IP >=dev-perl/LWP-MediaTypes-6.0.0 virtual/perl-Socket dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.06.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=b4b30ffb08ca4c573be90ccf0587dd3c
diff --git a/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
deleted file mode 100644
index 473d77a1a013..000000000000
--- a/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
-DESCRIPTION=Date conversion for HTTP date formats
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/HTTP-Date
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be510ac3035070d0e6fa2b51aefbe144
diff --git a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0 b/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0
deleted file mode 100644
index 76b9a4fc56e1..000000000000
--- a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Encode virtual/perl-File-Temp dev-perl/HTTP-MultiPartParser dev-perl/Hash-MultiValue >=dev-perl/JSON-MaybeXS-1.3.7 virtual/perl-Module-Load dev-perl/Stream-Buffered >=dev-perl/WWW-Form-UrlEncoded-0.230.0 xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 ) >=dev-perl/Module-Build-Tiny-0.35.0 test? ( virtual/perl-File-Spec >=dev-perl/HTTP-Message-6 >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl
-DESCRIPTION=PSGI compliant HTTP Entity Parser
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/HTTP-Entity-Parser
-IUSE=test +xs examples
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode virtual/perl-File-Temp dev-perl/HTTP-MultiPartParser dev-perl/Hash-MultiValue >=dev-perl/JSON-MaybeXS-1.3.7 virtual/perl-Module-Load dev-perl/Stream-Buffered >=dev-perl/WWW-Form-UrlEncoded-0.230.0 xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 ) dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.20.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=114d1d4d4cbbc26333de4f780ddd7966
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index bf2d26908872..d253cca9852d 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Params-Validate-1.300.0 b/metadata/md5-cache/dev-perl/Params-Validate-1.300.0
index b9f735494fe6..9f49ace4183f 100644
--- a/metadata/md5-cache/dev-perl/Params-Validate-1.300.0
+++ b/metadata/md5-cache/dev-perl/Params-Validate-1.300.0
@@ -5,11 +5,11 @@ DESCRIPTION=Flexible system for validation of method/function call parameters
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Params-Validate
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/Module-Implementation >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=6e1f1cfa4af9a159aac047c1000c83f4
+_md5_=32e8fb34adf13606418d708ca02eb594
diff --git a/metadata/md5-cache/dev-perl/Specio-0.470.0 b/metadata/md5-cache/dev-perl/Specio-0.470.0
index fce88a1ea5ae..4e2221c6dbe7 100644
--- a/metadata/md5-cache/dev-perl/Specio-0.470.0
+++ b/metadata/md5-cache/dev-perl/Specio-0.470.0
@@ -5,11 +5,11 @@ DESCRIPTION=Type constraints and coercions for Perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Specio
 IUSE=minimal test
-KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/Ref-Util-0.112.0 ) virtual/perl-Carp dev-perl/Devel-StackTrace dev-perl/Eval-Closure virtual/perl-Exporter virtual/perl-IO dev-perl/MRO-Compat dev-perl/Module-Runtime >=dev-perl/Role-Tiny-1.3.3 >=virtual/perl-Scalar-List-Utils-1.330.0 virtual/perl-Storable dev-perl/Sub-Quote dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Try-Tiny dev-perl/XString virtual/perl-parent >=virtual/perl-version-0.830.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.47.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=694065d05fc67c71324a528fe636abaa
+_md5_=9ff762eeff4ab12d1a8f98b73a7cdaad
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0-r2 b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0-r2
index 25c3c02acc99..6978c22046a7 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0-r2
+++ b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Convert between most 8bit encodings
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Unicode-Map8
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Unicode-String-2.60.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Unicode-Map8-0.13.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=783edab3724c3bc668301606f51b7c1e
+_md5_=75ef054da8e2cdd9395af2111f80dd55
diff --git a/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.4 b/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.4
deleted file mode 100644
index f85608cda4a4..000000000000
--- a/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Mojolicious-7.130.0 >=dev-perl/Module-Build-0.420.0 dev-lang/perl
-DESCRIPTION=Web service API to MusicBrainz database
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/WebService-MusicBrainz
-KEYWORDS=amd64 ppc ppc64 ~riscv x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Mojolicious-7.130.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.4.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=e778376aa45e0bb5bb208f586d054d89
diff --git a/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.5 b/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.5
index 3b260a7547d3..96e3d271f16b 100644
--- a/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.5
+++ b/metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.5
@@ -5,11 +5,11 @@ DESCRIPTION=Web service API to MusicBrainz database
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/WebService-MusicBrainz
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Mojolicious-7.130.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.5.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=193c1f817f0173746bce6d58d67805b2
+_md5_=e57a3baab6e5b547bdccecc8a50f45e9
diff --git a/metadata/md5-cache/dev-perl/XString-0.5.0 b/metadata/md5-cache/dev-perl/XString-0.5.0
index d3a91fd2675e..8516ac561417 100644
--- a/metadata/md5-cache/dev-perl/XString-0.5.0
+++ b/metadata/md5-cache/dev-perl/XString-0.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Isolated String helpers from B
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/XString
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/XString-0.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=879e24392377fc84dd51747c6b7225c6
+_md5_=6dafd5b1df456eaeea7e5b05d7a61189
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 0826a79213f8..0ec5dbdc7740 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/async_timeout-4.0.0 b/metadata/md5-cache/dev-python/async_timeout-4.0.0
new file mode 100644
index 000000000000..01f37c4e92ab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/async_timeout-4.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-aiohttp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Timeout context manager for asyncio programs
+EAPI=8
+HOMEPAGE=https://github.com/aio-libs/async-timeout
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/async_timeout/async-timeout-4.0.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8907ab98d035709db107f8a8640775f2
diff --git a/metadata/md5-cache/dev-python/autopage-0.4.0 b/metadata/md5-cache/dev-python/autopage-0.4.0
index ec1304b11314..3690eb3e4081 100644
--- a/metadata/md5-cache/dev-python/autopage-0.4.0
+++ b/metadata/md5-cache/dev-python/autopage-0.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=A library to provide automatic paging for console output
 EAPI=8
 HOMEPAGE=https://pypi.org/project/autopage/ https://github.com/zaneb/autopage/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~s390 sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zaneb/autopage/archive/v0.4.0.tar.gz -> autopage-0.4.0.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b9dc053da0381ab93e4e7306ef05798e
+_md5_=46704eb84ca806bbbf2bbc2a02e1228e
diff --git a/metadata/md5-cache/dev-python/backcall-0.2.0 b/metadata/md5-cache/dev-python/backcall-0.2.0
index 131050c8d454..c04022d1a7f0 100644
--- a/metadata/md5-cache/dev-python/backcall-0.2.0
+++ b/metadata/md5-cache/dev-python/backcall-0.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Specifications for callback functions passed in to an API
 EAPI=7
 HOMEPAGE=https://pypi.org/project/backcall/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backcall/backcall-0.2.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58724240cba1f6a0bde206c8915fbf53
+_md5_=0fef64ab0b6e1ee20baa678c5a7766ca
diff --git a/metadata/md5-cache/dev-python/berkeleydb-18.1.4 b/metadata/md5-cache/dev-python/berkeleydb-18.1.4
index 3eb047842409..b9f6f096492c 100644
--- a/metadata/md5-cache/dev-python/berkeleydb-18.1.4
+++ b/metadata/md5-cache/dev-python/berkeleydb-18.1.4
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for Oracle Berkeley DB
 EAPI=7
 HOMEPAGE=https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/berkeleydb/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=|| ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~arthurzam/distfiles/dev-python/berkeleydb/berkeleydb-18.1.4.tar.xz
 _eclasses_=db-use	063d3e7add942762a8203b52ec3066c2	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a19552a70e389eb4ef9f5dd86c819bab
+_md5_=a0bbff65cecde451df54cbcc9b08f60c
diff --git a/metadata/md5-cache/dev-python/boto3-1.19.8 b/metadata/md5-cache/dev-python/boto3-1.19.8
new file mode 100644
index 000000000000..0e193a41024e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.19.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.22.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.22.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.19.8.tar.gz -> boto3-1.19.8.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/botocore-1.22.8 b/metadata/md5-cache/dev-python/botocore-1.22.8
new file mode 100644
index 000000000000..dbf5b67265b4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.22.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.22.8.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/cliff-3.9.0 b/metadata/md5-cache/dev-python/cliff-3.9.0
index 5da38da8a46d..9d4ed6ad227b 100644
--- a/metadata/md5-cache/dev-python/cliff-3.9.0
+++ b/metadata/md5-cache/dev-python/cliff-3.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=Command Line Interface Formulation Framework
 EAPI=8
 HOMEPAGE=https://github.com/openstack/cliff
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~s390 sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/autopage-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-3.9.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d819ebb836c200f43d3633213dae2de3
+_md5_=5f705da864414a85c47536dccf014aca
diff --git a/metadata/md5-cache/dev-python/django-3.2.9 b/metadata/md5-cache/dev-python/django-3.2.9
new file mode 100644
index 000000000000..0880120ddf94
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.2.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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=8
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.9.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.9.checksum.txt )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=76acda9683d22dbd877f3a4f56c5d46a
diff --git a/metadata/md5-cache/dev-python/google-auth-2.3.3 b/metadata/md5-cache/dev-python/google-auth-2.3.3
new file mode 100644
index 000000000000..6e644c0bcb75
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-2.3.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/google-auth/google-auth-2.3.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58e9e1cdfa684d5e785cda0bf3b92794
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.2.3 b/metadata/md5-cache/dev-python/miniupnpc-2.2.3
index 849e532f0eef..360de65f8c99 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.2.3
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.2.3
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for UPnP client library
 EAPI=8
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=net-libs/miniupnpc-2.2.3:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.3.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.3.tar.gz.sig )
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=523022c6eb4620bd44159d79490c15f9
+_md5_=00e80a7798eed6c9d5bffc32463d4f5d
diff --git a/metadata/md5-cache/dev-python/numpy-1.21.2-r1 b/metadata/md5-cache/dev-python/numpy-1.21.2-r1
index 10da62d54d32..c475d41e95e7 100644
--- a/metadata/md5-cache/dev-python/numpy-1.21.2-r1
+++ b/metadata/md5-cache/dev-python/numpy-1.21.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://numpy.org/
 IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.21.2.zip doc? ( https://numpy.org/doc/1.21/numpy-html.zip -> numpy-html-1.21.2.zip https://numpy.org/doc/1.21/numpy-ref.pdf -> numpy-ref-1.21.2.pdf https://numpy.org/doc/1.21/numpy-user.pdf -> numpy-user-1.21.2.pdf )
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=03a4713a3f7b80643e2d0c876a215f28
+_md5_=09b38417ce873307506d82a131a9d886
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 6363ba4867db..3e43ed4342db 100644
--- a/metadata/md5-cache/dev-python/opt-einsum-3.3.0
+++ b/metadata/md5-cache/dev-python/opt-einsum-3.3.0
@@ -1,14 +1,15 @@
-BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Optimized Einsum: A tensor contraction order optimizer
 EAPI=7
 HOMEPAGE=https://pypi.org/project/opt-einsum/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/opt-einsum/opt_einsum-3.3.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ad7d7154f8985c85bf57aa69aaba89fb
+_md5_=a7e97237b0b1be981f2ead7b0ae6f158
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.5 b/metadata/md5-cache/dev-python/pickleshare-0.7.5
index a783bfdefb8a..37b1d3aac362 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.5
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.5
@@ -4,7 +4,7 @@ DESCRIPTION=A small 'shelve' like datastore with concurrency support
 EAPI=7
 HOMEPAGE=https://github.com/pickleshare/pickleshare
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/path-py-6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pickleshare/pickleshare-0.7.5.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a893cbeff367dea2e0df7435b216c3ed
+_md5_=c57027dd5898af4fe2adecba3c6bbe05
diff --git a/metadata/md5-cache/dev-python/prettytable-2.3.0 b/metadata/md5-cache/dev-python/prettytable-2.3.0
new file mode 100644
index 000000000000..bc901c13e719
--- /dev/null
+++ b/metadata/md5-cache/dev-python/prettytable-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) dev-python/pytest-lazy-fixture[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easily displaying tabular data in a visually appealing ASCII table format
+EAPI=8
+HOMEPAGE=https://github.com/jazzband/prettytable/ https://pypi.org/project/prettytable/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/prettytable/prettytable-2.3.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=42a3a17a5c8ab0e0ccac5d7c4ed7bf38
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.21 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.21
index d670bec2b934..eca37da62cf2 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.21
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.21
@@ -4,7 +4,7 @@ DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-3.0.21.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b5fbcbfa57d167d8232cb848ccf71b70
+_md5_=9d61c914897e0aa7d9329a0dd3b255b5
diff --git a/metadata/md5-cache/dev-python/pynest2d-4.9.1 b/metadata/md5-cache/dev-python/pynest2d-4.9.1
index c4287046cb59..5429f4c8a0b0 100644
--- a/metadata/md5-cache/dev-python/pynest2d-4.9.1
+++ b/metadata/md5-cache/dev-python/pynest2d-4.9.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/libnest2d python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/libnest2d python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] )
 DESCRIPTION=Python bindings for libnest2d
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/pynest2d
-IUSE=python_single_target_python3_8 python_single_target_python3_9
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/libnest2d python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/libnest2d python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/sip-5[python_targets_python3_10(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/pynest2d/archive/4.9.1.tar.gz -> pynest2d-4.9.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=0f667afd4ba0591eba345a650c920af4
+_md5_=6bccd2f9c42a56ea5f0c69535d073572
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 a6abf2923a9a..52ac04a6d72e 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
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=It helps to use fixtures in pytest.mark.parametrize
 EAPI=8
 HOMEPAGE=https://github.com/tvorog/pytest-lazy-fixture
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=be19f0ad3e61b4aba9cf234b9813e4ef
+_md5_=ca562bbd4c1dbe9c171a3c2a82a6846f
diff --git a/metadata/md5-cache/dev-python/pytools-2021.2.9 b/metadata/md5-cache/dev-python/pytools-2021.2.9
new file mode 100644
index 000000000000..93df31beb658
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytools-2021.2.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of tools missing from the Python standard library
+EAPI=8
+HOMEPAGE=https://mathema.tician.de/software/pytools/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytools/pytools-2021.2.9.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e7f6eff0aab612c08f25f6eda1dc1c3d
diff --git a/metadata/md5-cache/dev-python/rdflib-6.0.2 b/metadata/md5-cache/dev-python/rdflib-6.0.2
index d9f55eafed3a..187c28aaed7a 100644
--- a/metadata/md5-cache/dev-python/rdflib-6.0.2
+++ b/metadata/md5-cache/dev-python/rdflib-6.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=RDF library containing a triple store and parser/serializer
 EAPI=8
 HOMEPAGE=https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/
 IUSE=examples sqlite test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-6.0.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=68d488490f568d0ec690bf216262385e
+_md5_=21649cd748b9f3b6b2a46804b5dcbd8c
diff --git a/metadata/md5-cache/dev-python/regex-2021.11.1 b/metadata/md5-cache/dev-python/regex-2021.11.1
new file mode 100644
index 000000000000..6a7284230405
--- /dev/null
+++ b/metadata/md5-cache/dev-python/regex-2021.11.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Alternative regular expression module to replace re
+EAPI=8
+HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/regex/regex-2021.11.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3a7bb1f7b2c56ab1b3e920e496d2acf2
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.26 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.26
index 6ba460dbe0b8..12d756012cdf 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.26
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.26
@@ -4,7 +4,7 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=8
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.26.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4f5044eed1b3c24f7e636a97a8a2d0b3
+_md5_=25a48d0525971a392c07a2e50a780c8a
diff --git a/metadata/md5-cache/dev-python/swagger-spec-validator-2.7.4 b/metadata/md5-cache/dev-python/swagger-spec-validator-2.7.4
new file mode 100644
index 000000000000..cf841705fb3d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/swagger-spec-validator-2.7.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=validate Swagger specs against Swagger 1.1 or 2.0 specification
+EAPI=8
+HOMEPAGE=https://github.com/Yelp/swagger_spec_validator
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Yelp/swagger_spec_validator/archive/v2.7.4.tar.gz -> swagger-spec-validator-2.7.4.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=30edc52e90f39f05abf0855dd8227fc6
diff --git a/metadata/md5-cache/dev-python/uranium-4.9.1 b/metadata/md5-cache/dev-python/uranium-4.9.1
index 15c22c5018f0..7d89295e34d4 100644
--- a/metadata/md5-cache/dev-python/uranium-4.9.1
+++ b/metadata/md5-cache/dev-python/uranium-4.9.1
@@ -1,16 +1,16 @@
-BDEPEND=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] ) sys-devel/gettext doc? ( app-doc/doxygen[dot] ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] dev-python/mypy[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/mypy[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] ) ) test? ( 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/libarcus-4.9.1:=[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/cryptography[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),declarative,network,svg] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/scipy-1.1[python_targets_python3_8(-)] sci-libs/shapely[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cryptography[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),declarative,network,svg] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_9(-)] sci-libs/shapely[python_targets_python3_9(-)] ) dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) sys-devel/gettext doc? ( app-doc/doxygen[dot] ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] dev-python/mypy[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/mypy[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] dev-python/mypy[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ~dev-libs/libarcus-4.9.1:=[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/cryptography[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),declarative,network,svg] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/scipy-1.1[python_targets_python3_8(-)] sci-libs/shapely[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cryptography[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),declarative,network,svg] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_9(-)] sci-libs/shapely[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cryptography[python_targets_python3_10(-)] dev-python/PyQt5[python_targets_python3_10(-),declarative,network,svg] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/scipy-1.1[python_targets_python3_10(-)] sci-libs/shapely[python_targets_python3_10(-)] ) dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ~dev-libs/libarcus-4.9.1:=[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/cryptography[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),declarative,network,svg] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/scipy-1.1[python_targets_python3_8(-)] sci-libs/shapely[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cryptography[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),declarative,network,svg] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_9(-)] sci-libs/shapely[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ~dev-libs/libarcus-4.9.1:=[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/cryptography[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),declarative,network,svg] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/scipy-1.1[python_targets_python3_8(-)] sci-libs/shapely[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cryptography[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),declarative,network,svg] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_9(-)] sci-libs/shapely[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cryptography[python_targets_python3_10(-)] dev-python/PyQt5[python_targets_python3_10(-),declarative,network,svg] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/scipy-1.1[python_targets_python3_10(-)] sci-libs/shapely[python_targets_python3_10(-)] )
 DESCRIPTION=A Python framework for building 3D printing related applications
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/Uranium
-IUSE=debug doc test test python_single_target_python3_8 python_single_target_python3_9
+IUSE=debug doc test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ~dev-libs/libarcus-4.9.1:=[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/cryptography[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),declarative,network,svg] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/scipy-1.1[python_targets_python3_8(-)] sci-libs/shapely[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cryptography[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),declarative,network,svg] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_9(-)] sci-libs/shapely[python_targets_python3_9(-)] ) dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 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_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ~dev-libs/libarcus-4.9.1:=[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/cryptography[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),declarative,network,svg] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/scipy-1.1[python_targets_python3_8(-)] sci-libs/shapely[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cryptography[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),declarative,network,svg] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_9(-)] sci-libs/shapely[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cryptography[python_targets_python3_10(-)] dev-python/PyQt5[python_targets_python3_10(-),declarative,network,svg] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/scipy-1.1[python_targets_python3_10(-)] sci-libs/shapely[python_targets_python3_10(-)] ) dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.9.1.tar.gz -> uranium-4.9.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=b0cf7d02bcece805c2e49353003059f6
+_md5_=0b3f98d94494c80cc81878a7df202601
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.10.0 b/metadata/md5-cache/dev-python/virtualenv-20.10.0
new file mode 100644
index 000000000000..77dc6aa5967d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.10.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pip-20.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-freezegun-0.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-mock-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/backports-entry_points_selectable-1.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=8
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/backports-entry_points_selectable-1.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.10.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0bb8acc2264336441c7af4636bbd1213
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.0.2 b/metadata/md5-cache/dev-python/xlsxwriter-3.0.2
new file mode 100644
index 000000000000..fae845cf96fd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xlsxwriter-3.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module for creating Excel XLSX files
+EAPI=8
+HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_3.0.2.tar.gz -> XlsxWriter-RELEASE_3.0.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3843af884d9acbe181fb9a96f2ca5c82
diff --git a/metadata/md5-cache/dev-python/yarl-1.7.2 b/metadata/md5-cache/dev-python/yarl-1.7.2
new file mode 100644
index 000000000000..c7d6c1e8e864
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yarl-1.7.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Yet another URL library
+EAPI=8
+HOMEPAGE=https://github.com/aio-libs/yarl/
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/y/yarl/yarl-1.7.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=be84284781b2486fb7fce0578f466549
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index dadd7ff247df..22372f399384 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/cri-2.15.10 b/metadata/md5-cache/dev-ruby/cri-2.15.10
deleted file mode 100644
index 14f737b305e3..000000000000
--- a/metadata/md5-cache/dev-ruby/cri-2.15.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/yard[ruby_targets_ruby26(-)] dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/yard[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) 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_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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Cri is a library for building easy-to-use commandline tools
-EAPI=7
-HOMEPAGE=https://rubygems.org/gems/cri
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/cri-2.15.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=59a8acc51518c5b466c25cd9f334a888
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.11-r1 b/metadata/md5-cache/dev-ruby/cri-2.15.11-r1
new file mode 100644
index 000000000000..15eb18738a6b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/cri-2.15.11-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/yard[ruby_targets_ruby26(-)] dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/yard[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) test? ( dev-ruby/yard[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) 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(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Cri is a library for building easy-to-use commandline tools
+EAPI=8
+HOMEPAGE=https://rubygems.org/gems/cri
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/cri-2.15.11.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3b9f64c9a4024f75d513de6c1a96ab2c
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
new file mode 100644
index 000000000000..901eca297875
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) 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(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=net-dns/libidn:0 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=LibIDN Ruby Bindings
+EAPI=8
+HOMEPAGE=https://github.com/deepfryed/idn-ruby
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=net-dns/libidn:0 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.4.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c4792e3e55e73607f8bc25e9ecdb0ffa
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1 b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
new file mode 100644
index 000000000000..0fced598fead
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) 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(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Provides telnet client functionality
+EAPI=8
+HOMEPAGE=https://github.com/ruby/net-telnet
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/ruby/net-telnet/archive/v0.2.0.tar.gz -> net-telnet-0.2.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d6f8d6eacd00f6b5e284813e20e45d67
diff --git a/metadata/md5-cache/dev-ruby/sassc-2.4.0 b/metadata/md5-cache/dev-ruby/sassc-2.4.0
index 7a2cdc5ecba2..fd8500ec5b4f 100644
--- a/metadata/md5-cache/dev-ruby/sassc-2.4.0
+++ b/metadata/md5-cache/dev-ruby/sassc-2.4.0
@@ -5,7 +5,7 @@ DESCRIPTION=Use libsass with Ruby
 EAPI=7
 HOMEPAGE=https://github.com/sass/sassc-ruby
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libsass-3.6.1 ruby_targets_ruby26? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-2.4.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f6467fc6af08a45e2baee17db640e05
+_md5_=ccb61245d847042412dd74821ccedbce
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.2 b/metadata/md5-cache/dev-ruby/serialport-1.3.2
index 0d6840f8197f..bc911df53dda 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.2
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.2
@@ -5,7 +5,7 @@ DESCRIPTION=a library for serial port (rs232) access in ruby
 EAPI=8
 HOMEPAGE=https://github.com/hparra/ruby-serialport/
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serialport-1.3.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d3a6e066035e89471cdab97e53033652
+_md5_=6d619754feda3461a4135e966cadc14f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index d928f368b8bb..66f22b760d29 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/ccache-4.4.2 b/metadata/md5-cache/dev-util/ccache-4.4.2
index 7abe6c6301ca..91ad79784bd9 100644
--- a/metadata/md5-cache/dev-util/ccache-4.4.2
+++ b/metadata/md5-cache/dev-util/ccache-4.4.2
@@ -5,11 +5,11 @@ DESCRIPTION=Fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.dev/
 IUSE=doc redis +static-c++ test
-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=GPL-3 LGPL-3
 RDEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) dev-util/shadowman sys-apps/gentoo-functions
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v4.4.2/ccache-4.4.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ba9ca927a1fc4a096b7737b6c6b7540c
+_md5_=8d8edcc8b7acb9e99655193c47cd3105
diff --git a/metadata/md5-cache/dev-util/codeblocks-20.03-r4 b/metadata/md5-cache/dev-util/codeblocks-20.03-r4
new file mode 100644
index 000000000000..1df770841398
--- /dev/null
+++ b/metadata/md5-cache/dev-util/codeblocks-20.03-r4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=app-arch/zip >=dev-libs/tinyxml-2.6.2-r3 >=dev-util/astyle-3.1-r2:0/3.1 x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-admin/gamin app-text/hunspell dev-libs/boost:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The open source, cross platform, free C, C++ and Fortran IDE
+EAPI=7
+HOMEPAGE=https://codeblocks.org/
+IUSE=contrib debug fortran pch
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/zip >=dev-libs/tinyxml-2.6.2-r3 >=dev-util/astyle-3.1-r2:0/3.1 x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-admin/gamin app-text/hunspell dev-libs/boost:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/codeblocks/codeblocks-20.03.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran-update-v1.7.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran-update-v1.8.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-codecompletion-symbolbrowser-update.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=5f75f11bfbdb751d60af5b6fd006e5de
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.2-r1 b/metadata/md5-cache/dev-util/ninja-1.10.2-r1
index b61121927963..9bb5d53732e1 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.2-r1
+++ b/metadata/md5-cache/dev-util/ninja-1.10.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A small build system similar to make
 EAPI=7
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.2.tar.gz -> ninja-1.10.2.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1ebf9a7266c0efc75ac9c13a7f165743
+_md5_=93c9cab06f0b48b20c2a833200c26e76
diff --git a/metadata/md5-cache/dev-util/shadowman-3 b/metadata/md5-cache/dev-util/shadowman-3
new file mode 100644
index 000000000000..c7333c2db908
--- /dev/null
+++ b/metadata/md5-cache/dev-util/shadowman-3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-admin/eselect
+DESCRIPTION=Unified compiler shadow link directory updater
+EAPI=8
+HOMEPAGE=https://github.com/mgorny/shadowman
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-admin/eselect
+SLOT=0
+SRC_URI=https://github.com/mgorny/shadowman/archive/v3.tar.gz -> shadowman-3.tar.gz
+_md5_=40a1108d614c33895c881efd744a5fb3
diff --git a/metadata/md5-cache/dev-util/shadowman-9999 b/metadata/md5-cache/dev-util/shadowman-9999
deleted file mode 100644
index f4a96dec4746..000000000000
--- a/metadata/md5-cache/dev-util/shadowman-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-admin/eselect >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Unified compiler shadow link directory updater
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/shadowman
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=app-admin/eselect
-SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=c1e230bbbbb4ce15e2415e377f9e44b5
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 629036104da4..8cb672625e91 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/angband-4.2.3-r1 b/metadata/md5-cache/games-roguelike/angband-4.2.3-r1
new file mode 100644
index 000000000000..893d91f09006
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/angband-4.2.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=X? ( media-fonts/font-misc-misc x11-libs/libX11 ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) sdl? ( media-libs/libsdl2[video,X] media-libs/sdl2-image[png] media-libs/sdl2-ttf sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[mp3] ) )
+DESCRIPTION=A roguelike dungeon exploration game based on the books of J.R.R. Tolkien
+EAPI=8
+HOMEPAGE=https://rephial.org/
+IUSE=+ncurses sdl sound +X
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=X? ( media-fonts/font-misc-misc x11-libs/libX11 ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) sdl? ( media-libs/libsdl2[video,X] media-libs/sdl2-image[png] media-libs/sdl2-ttf sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[mp3] ) )
+REQUIRED_USE=sound? ( sdl ) || ( X ncurses )
+SLOT=0
+SRC_URI=https://github.com/angband/angband/archive/refs/tags/4.2.3.tar.gz -> angband-4.2.3.tar.gz https://dev.gentoo.org/~steils/distfiles/angband-4.2.3-man-r1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=e0fb1cd585a22985ef44267470e84c65
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 73dea59ce646..1422671cad72 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/plasma-desktop-5.23.2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.23.2
deleted file mode 100644
index 688d8801a6e1..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.23.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.23.2:5 >=kde-plasma/libksysguard-5.23.2:5 >=kde-plasma/libkworkspace-5.23.2:5 >=kde-plasma/plasma-workspace-5.23.2:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= 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.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.23.2:5 >=kde-plasma/libksysguard-5.23.2:5 >=kde-plasma/libkworkspace-5.23.2:5 >=kde-plasma/plasma-workspace-5.23.2:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= 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.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/qqc2-desktop-style-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.2:5 >=kde-plasma/oxygen-5.23.2:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs 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.23.2/plasma-desktop-5.23.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=968b842dc2efc32e9328afe1ebc3a13e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 3bc5a72834df..6545a227702f 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/freecad-0.19.2-r3 b/metadata/md5-cache/media-gfx/freecad-0.19.2-r4
similarity index 86%
rename from metadata/md5-cache/media-gfx/freecad-0.19.2-r3
rename to metadata/md5-cache/media-gfx/freecad-0.19.2-r4
index bd6ab7b685f4..054663e2862b 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.19.2-r3
+++ b/metadata/md5-cache/media-gfx/freecad-0.19.2-r4
@@ -1,8 +1,8 @@
 BDEPEND=dev-lang/swig dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads(+),python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-libs/boost:=[python,threads(+),python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads(+),python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-libs/boost:=[python,threads(+),python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) )
 DESCRIPTION=QT based Computer Aided Design application
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD
 IUSE=debug headless pcl test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud plot ship python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.19.2.tar.gz -> freecad-0.19.2.tar.gz https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ad9ede25b5de64f01f972eeff7a50b64
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=3b64bf3be066831f3f132b0280e94693
diff --git a/metadata/md5-cache/media-gfx/freecad-9999 b/metadata/md5-cache/media-gfx/freecad-9999
index 12309791ba73..d6b55a4d1e71 100644
--- a/metadata/md5-cache/media-gfx/freecad-9999
+++ b/metadata/md5-cache/media-gfx/freecad-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/swig dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( ~sci-libs/pcl-9999:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads(+),python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-libs/boost:=[python,threads(+),python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads(+),python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-libs/boost:=[python,threads(+),python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) )
 DESCRIPTION=QT based Computer Aided Design application
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD
 IUSE=debug headless pcl test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud plot ship python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2 CC-BY-SA-4.0
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( ~sci-libs/pcl-9999:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads(+),python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-libs/boost:=[python,threads(+),python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/opencascade:=[vtk(+)] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,threads(+),python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pivy-0.6.5[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] dev-python/pyside2[gui,svg,python_targets_python3_8(-)] dev-python/shiboken2[python_targets_python3_8(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_8(-)] ) fem? ( dev-python/ply[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-libs/boost:=[python,threads(+),python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) inspection? ( points ) path? ( robot ) ship? ( image plot )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=85f405db388280c4d2be989833026835
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=c5d89ea605889c853a1dba2e9c73f87d
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index ebe6722f5fa2..6c3bf251540d 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/alsa-lib-1.2.5_p20210604 b/metadata/md5-cache/media-libs/alsa-lib-1.2.5_p20210604
deleted file mode 100644
index 31d6dd9655ad..000000000000
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.5_p20210604
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( >=app-doc/doxygen-1.2.6 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) media-libs/alsa-topology-conf media-libs/alsa-ucm-conf
-DESCRIPTION=Advanced Linux Sound Architecture Library
-EAPI=7
-HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-IUSE=alisp debug doc elibc_uclibc python +thread-safety 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_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) media-libs/alsa-topology-conf media-libs/alsa-ucm-conf
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=https://git.alsa-project.org/?p=alsa-lib.git;a=snapshot;h=abe805ed6c7f38e48002e575535afd1f673b9bcd;sf=tgz -> alsa-lib-1.2.5_p20210604.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=90337aee2bd2305ea893f174f6936116
diff --git a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5 b/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5
deleted file mode 100644
index db2a24cfe992..000000000000
--- a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!<media-libs/alsa-lib-1.2.1
-DESCRIPTION=ALSA topology configuration files
-EAPI=7
-HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=!<media-libs/alsa-lib-1.2.1
-SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-topology-conf-1.2.5.tar.bz2
-_md5_=53f460f1083d5af9919b679b592a75da
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5-r1 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5-r1
deleted file mode 100644
index 62292980db79..000000000000
--- a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!<media-libs/alsa-lib-1.2.1
-DESCRIPTION=ALSA ucm configuration files
-EAPI=7
-HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=!<media-libs/alsa-lib-1.2.1
-SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-1.2.5.tar.bz2
-_md5_=6b6f0e27ff349e0aa319f594c37bdac8
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0-r3 b/metadata/md5-cache/media-libs/freeimage-3.18.0-r3
new file mode 100644
index 000000000000..d88eb0eab805
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freeimage-3.18.0-r3
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/ilmbase:= media-libs/tiff:0 ) webp? ( media-libs/libwebp:= )
+DESCRIPTION=Image library supporting many formats
+EAPI=8
+HOMEPAGE=https://freeimage.sourceforge.io/
+IUSE=jpeg jpeg2k mng openexr png raw static-libs tiff webp
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 FIPL-1.0 )
+RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/ilmbase:= media-libs/tiff:0 ) webp? ( media-libs/libwebp:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=701e1390059d5b2247ad164ca6cd5b35
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 630020a52578..7f0a50f61395 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-utils-1.2.5-r1 b/metadata/md5-cache/media-sound/alsa-utils-1.2.5-r1
deleted file mode 100644
index e18545bc0809..000000000000
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst
-DEPEND=>=media-libs/alsa-lib-1.2.5 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) doc? ( app-text/xmlto )
-DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
-EAPI=7
-HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-IUSE=bat doc +libsamplerate +ncurses nls selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/alsa-lib-1.2.5 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
-SLOT=0.9
-SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.5.tar.bz2
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=c377e1e2d712df12cae22ec7a63c9d86
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 95162d454f68..1744dd06abd9 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/makemkv-1.16.5 b/metadata/md5-cache/media-video/makemkv-1.16.5
new file mode 100644
index 000000000000..4ae6f4a557cb
--- /dev/null
+++ b/metadata/md5-cache/media-video/makemkv-1.16.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig gui? ( dev-qt/qtcore:5 )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=dev-libs/expat dev-libs/openssl:0=[-bindist(-)] >=media-video/ffmpeg-1.0.0:0= sys-libs/glibc sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs
+EAPI=8
+HOMEPAGE=http://www.makemkv.com/
+IUSE=+gui +java kernel_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
+RDEPEND=dev-libs/expat dev-libs/openssl:0=[-bindist(-)] >=media-video/ffmpeg-1.0.0:0= sys-libs/glibc sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) net-misc/wget java? ( >=virtual/jre-1.8 )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.16.5.tar.gz http://www.makemkv.com/download/makemkv-bin-1.16.5.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=9d4615333db78ecf9c4ccb31412e818d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index cb0324799ed4..9ea386849962 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/zabbix-4.0.34 b/metadata/md5-cache/net-analyzer/zabbix-4.0.34
index 3cb2ba0e4201..cc2741687f1c 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.34
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.34
@@ -5,11 +5,11 @@ DESCRIPTION=ZABBIX is software for monitoring of your applications, network and
 EAPI=7
 HOMEPAGE=https://www.zabbix.com/
 IUSE=+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
+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? ( gnutls? ( net-libs/gnutls:0= ) mbedtls? ( net-libs/mbedtls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) xmpp? ( dev-libs/iksemel ) acct-group/zabbix acct-user/zabbix 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 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent frontend proxy server ) ssl? ( ^^ ( gnutls mbedtls openssl ) ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) ) static? ( !oracle !snmp )
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.34.tar.gz
 _eclasses_=java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=cccfbbad47c5feb6b4c7a6a6c8823756
+_md5_=e222244c758063b3186aa68e5d75d207
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.16 b/metadata/md5-cache/net-analyzer/zabbix-5.0.16
index abed78f9b3b2..d765d8916417 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.16
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.16
@@ -5,7 +5,7 @@ DESCRIPTION=ZABBIX is software for monitoring of your applications, network and
 EAPI=7
 HOMEPAGE=https://www.zabbix.com/
 IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
+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? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) acct-group/zabbix acct-user/zabbix 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 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) ) ssl? ( ^^ ( gnutls openssl ) ) static? ( !oracle !snmp )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.16.tar.gz agent2? ( mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
 _eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=98672b4dabea5db452cf11f247352a76
+_md5_=eb455a2093b91703a0e3344d6aa73cb8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.4.5 b/metadata/md5-cache/net-analyzer/zabbix-5.4.5
index 591caa3e012c..a39a9fe7155b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.4.5
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.4.5
@@ -5,7 +5,7 @@ DESCRIPTION=ZABBIX is software for monitoring of your applications, network and
 EAPI=7
 HOMEPAGE=https://www.zabbix.com/
 IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
+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? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) acct-group/zabbix acct-user/zabbix 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 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) ) ssl? ( ^^ ( gnutls openssl ) ) static? ( !oracle !snmp )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/5.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.4/zabbix-5.4.5.tar.gz agent2? ( mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.zip -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.zip mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.mod -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.mod mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.zip -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.mod -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.zip -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.mod -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.zip -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.mod -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.zip -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.mod -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.zip -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.mod -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
 _eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=a9a511aba11a07f565912223c147f35f
+_md5_=17852705a29a2eaac0353488b27c7627
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index f4c2053bce56..1979b36076ef 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/linux-atm-2.5.2 b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
deleted file mode 100644
index 4683dfdbfbc1..000000000000
--- a/metadata/md5-cache/net-dialup/linux-atm-2.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/yacc >=app-portage/elt-patches-20170815
-DESCRIPTION=Tools for ATM
-EAPI=5
-HOMEPAGE=http://linux-atm.sourceforge.net/
-IUSE=static-libs kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=25cb33bdc052d4639d0eb04401571e4e
diff --git a/metadata/md5-cache/net-dialup/linux-atm-2.5.2-r1 b/metadata/md5-cache/net-dialup/linux-atm-2.5.2-r1
new file mode 100644
index 000000000000..fd0eb82d37a8
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.5.2-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DESCRIPTION=Tools for ATM
+EAPI=8
+HOMEPAGE=http://linux-atm.sourceforge.net/
+IUSE=kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.2.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0bd047cebef769d1661322b36aab5d13
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index c572426c53d5..f114cc4a9d2f 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/dnscrypt-proxy-2.1.0 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.0
index 811f36e0a03c..6aa5eb081fd5 100644
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.0
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
 EAPI=7
 HOMEPAGE=https://github.com/DNSCrypt/dnscrypt-proxy
 IUSE=+pie +filecaps
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=Apache-2.0 BSD ISC MIT MPL-2.0
 RDEPEND=acct-group/dnscrypt-proxy acct-user/dnscrypt-proxy filecaps? ( sys-libs/libcap )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/DNSCrypt/dnscrypt-proxy/archive/2.1.0.tar.gz -> dnscrypt-proxy-2.1.0.tar.gz
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e56be1bd2b0c60bef56e14e78edb2bb4
+_md5_=086d4a2b546f4ff702f5a1e496cbd3e2
diff --git a/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1 b/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
index d2a4ce321617..f5043032f619 100644
--- a/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
+++ b/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
@@ -1,12 +1,15 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
 DESCRIPTION=Fingerprinting DNS servers
-EAPI=5
+EAPI=8
 HOMEPAGE=https://github.com/kirei/fpdns/
+IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-perl/Net-DNS-0.74 dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-perl/Net-DNS-0.74 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kirei/fpdns/archive/20130404.tar.gz -> fpdns-0.10.0_pre20130404.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=56cf40b04e9bc70a2d50fed925f69a64
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=816e6ef5c9a5f40a31a56a4aea996636
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 502dde85f7c2..83db98066e1b 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/sendxmpp-1.24 b/metadata/md5-cache/net-im/sendxmpp-1.24
index cbd6a08f74f9..80a6e6e7ee80 100644
--- a/metadata/md5-cache/net-im/sendxmpp-1.24
+++ b/metadata/md5-cache/net-im/sendxmpp-1.24
@@ -1,12 +1,15 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
 DESCRIPTION=A perl-script to send xmpp (jabber), similar to what mail(1) does for mail
-EAPI=5
+EAPI=8
 HOMEPAGE=http://sendxmpp.hostname.sk/
+IUSE=test
 KEYWORDS=amd64 ~hppa ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/Net-XMPP dev-perl/Authen-SASL virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/Net-XMPP dev-perl/Authen-SASL virtual/perl-Getopt-Long dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lhost/sendxmpp/archive/v1.24.tar.gz -> sendxmpp-1.24.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9162deca3695d6cf4b10732a1ce293b5
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=e9190b990b544850ffe1375d9cc7d743
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.9.3-r1 b/metadata/md5-cache/net-im/telegram-desktop-2.9.3-r1
deleted file mode 100644
index d455e7822fc0..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-2.9.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-cpp/glibmm:2 dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-IUSE=+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X
-KEYWORDS=amd64 ~ppc64
-LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-cpp/glibmm:2 dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
-REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webkit? ( gtk ) gtk? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.9.3/tdesktop-2.9.3-full.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=609480ed103b67a4dbf170b2557a168d
diff --git a/metadata/md5-cache/net-im/telegram-desktop-3.1.11 b/metadata/md5-cache/net-im/telegram-desktop-3.1.11
new file mode 100644
index 000000000000..668169455997
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-3.1.11
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210914[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+IUSE=+dbus enchant +hunspell screencast +spell wayland webkit +X
+KEYWORDS=~amd64 ~ppc64
+LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210914[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
+REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webkit? ( dbus )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v3.1.11/tdesktop-3.1.11-full.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=0de1f9d9fa6c997e930481eace803c19
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 22c2b74ae563..37d906bcd426 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/ldns-1.7.1-r5 b/metadata/md5-cache/net-libs/ldns-1.7.1-r5
index 38e4a5335524..7071ec8a901f 100644
--- a/metadata/md5-cache/net-libs/ldns-1.7.1-r5
+++ b/metadata/md5-cache/net-libs/ldns-1.7.1-r5
@@ -4,7 +4,7 @@ DESCRIPTION=a library with the aim to simplify DNS programming in C
 EAPI=8
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
 IUSE=+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax 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_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) ecdsa? ( >=dev-libs/openssl-1.0.1e: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(-)?] ) ed25519? ( >=dev-libs/openssl-1.1.0: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(-)?] ) ed448? ( >=dev-libs/openssl-1.1.1: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(-)?] ) >=dev-libs/openssl-1.0.1e: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(-)?]
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/3
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=511a4879637af0337af8dcb2578a15e0
+_md5_=cea819b04e525f1d91d36315fbd548f3
diff --git a/metadata/md5-cache/net-libs/libtelnet-0.23 b/metadata/md5-cache/net-libs/libtelnet-0.23-r1
similarity index 62%
rename from metadata/md5-cache/net-libs/libtelnet-0.23
rename to metadata/md5-cache/net-libs/libtelnet-0.23-r1
index 32621a0a4ba2..0942809a0fe4 100644
--- a/metadata/md5-cache/net-libs/libtelnet-0.23
+++ b/metadata/md5-cache/net-libs/libtelnet-0.23-r1
@@ -1,11 +1,13 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
+BDEPEND=app-doc/doxygen virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=sys-libs/zlib
 DESCRIPTION=Simple RFC-compliant TELNET implementation as a C library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/seanmiddleditch/libtelnet
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
+RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/seanmiddleditch/libtelnet/archive/0.23.tar.gz -> libtelnet-0.23.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1665bde2d25e788a4f8f1dac0f0073f5
+_md5_=e45c8e0746e9a748585a9760a6580224
diff --git a/metadata/md5-cache/net-libs/libtelnet-9999 b/metadata/md5-cache/net-libs/libtelnet-9999
index d1c4557f1d74..09a270e2b455 100644
--- a/metadata/md5-cache/net-libs/libtelnet-9999
+++ b/metadata/md5-cache/net-libs/libtelnet-9999
@@ -1,10 +1,12 @@
-BDEPEND=app-doc/doxygen dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-doc/doxygen virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib
 DESCRIPTION=Simple RFC-compliant TELNET implementation as a C library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/seanmiddleditch/libtelnet
 LICENSE=public-domain
 PROPERTIES=live
+RDEPEND=sys-libs/zlib
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=7d8bea90556ea78b3ff994a84c0ef5f7
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=e45c8e0746e9a748585a9760a6580224
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index d29162ce168d..5d52146fb179 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/youtube-viewer-3.7.4-r2 b/metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
deleted file mode 100644
index 369b29abc577..000000000000
--- a/metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=A command line utility for viewing youtube-videos in Mplayer
-EAPI=7
-HOMEPAGE=https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html
-IUSE=gtk gtk2
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Data-Dump dev-perl/JSON dev-perl/libwww-perl[ssl] dev-perl/Term-ReadLine-Gnu dev-perl/LWP-Protocol-https virtual/perl-Encode virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Scalar-List-Utils virtual/perl-Term-ANSIColor virtual/perl-Term-ReadLine virtual/perl-Text-ParseWords virtual/perl-Text-Tabs+Wrap gtk? ( gtk2? ( >=dev-perl/Gtk2-1.244.0 ) !gtk2? ( dev-perl/Gtk3 ) dev-perl/File-ShareDir virtual/freedesktop-icon-theme x11-libs/gdk-pixbuf:2[jpeg] ) || ( >=media-video/ffmpeg-4.1.3[openssl] >=media-video/ffmpeg-4.1.3[gnutls] ) || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) ) dev-lang/perl:=
-REQUIRED_USE=gtk2? ( gtk )
-SLOT=0
-SRC_URI=https://github.com/trizen/youtube-viewer/archive/3.7.4.tar.gz -> youtube-viewer-3.7.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=87e1e7d7e803d3ec0f43b6d1d3f8d588
diff --git a/metadata/md5-cache/net-misc/youtube-viewer-3.9.3 b/metadata/md5-cache/net-misc/youtube-viewer-3.9.6
similarity index 94%
rename from metadata/md5-cache/net-misc/youtube-viewer-3.9.3
rename to metadata/md5-cache/net-misc/youtube-viewer-3.9.6
index 7f451d4d349d..6332b2219004 100644
--- a/metadata/md5-cache/net-misc/youtube-viewer-3.9.3
+++ b/metadata/md5-cache/net-misc/youtube-viewer-3.9.6
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic-2 GPL-1+ )
 RDEPEND=dev-perl/Data-Dump dev-perl/JSON dev-perl/libwww-perl[ssl] dev-perl/LWP-Protocol-https dev-perl/Term-ReadLine-Gnu virtual/perl-Encode virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Scalar-List-Utils virtual/perl-Term-ANSIColor virtual/perl-Term-ReadLine virtual/perl-Text-ParseWords virtual/perl-Text-Tabs+Wrap gtk? ( dev-perl/Gtk3 dev-perl/File-ShareDir virtual/freedesktop-icon-theme x11-libs/gdk-pixbuf:2[jpeg] ) || ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] ) || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) ) dev-lang/perl:=
 SLOT=0
-SRC_URI=https://github.com/trizen/youtube-viewer/archive/3.9.3.tar.gz -> youtube-viewer-3.9.3.tar.gz
+SRC_URI=https://github.com/trizen/youtube-viewer/archive/3.9.6.tar.gz -> youtube-viewer-3.9.6.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=b2554c2824e382f6b654654a2b902134
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2021.10.22-r2 b/metadata/md5-cache/net-misc/yt-dlp-2021.10.22-r2
index c10e03937601..8aa126b513e2 100644
--- a/metadata/md5-cache/net-misc/yt-dlp-2021.10.22-r2
+++ b/metadata/md5-cache/net-misc/yt-dlp-2021.10.22-r2
@@ -4,7 +4,7 @@ DESCRIPTION=youtube-dl fork with additional features and fixes
 EAPI=8
 HOMEPAGE=https://github.com/yt-dlp/yt-dlp
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~hppa ~riscv ~x86
 LICENSE=Unlicense
 RDEPEND=dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websockets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/mutagen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-video/ffmpeg !net-misc/youtube-dl python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yt-dlp/yt-dlp-2021.10.22.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1424d5a8271872038c2e0371b9d7405
+_md5_=266b26cce75930525baada875c744840
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 8b3f94a40349..964cc53f682d 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/fax4cups-1.29-r1 b/metadata/md5-cache/net-print/fax4cups-1.29-r1
index ad12f62c38fa..2e077231d565 100644
--- a/metadata/md5-cache/net-print/fax4cups-1.29-r1
+++ b/metadata/md5-cache/net-print/fax4cups-1.29-r1
@@ -1,7 +1,8 @@
+BDEPEND=net-print/cups
 DEFINED_PHASES=install postinst
 DEPEND=net-print/cups
 DESCRIPTION=Fax backend for CUPS
-EAPI=5
+EAPI=8
 HOMEPAGE=http://vigna.dsi.unimi.it/fax4CUPS/
 IUSE=+hylafax mgetty-fax efax
 KEYWORDS=amd64 ~ppc x86
@@ -10,4 +11,4 @@ RDEPEND=net-print/cups || ( hylafax? ( net-misc/hylafaxplus ) efax? ( net-misc/e
 REQUIRED_USE=|| ( hylafax mgetty-fax efax )
 SLOT=0
 SRC_URI=http://vigna.dsi.unimi.it/fax4CUPS/fax4CUPS-1.29.tar.gz
-_md5_=6539e3cf4c92d018eba5f2141d5f4154
+_md5_=24756ba6e8975e426d55eb46c477ebde
diff --git a/metadata/md5-cache/net-print/ink-0.5.2 b/metadata/md5-cache/net-print/ink-0.5.2
deleted file mode 100644
index 46da04270b71..000000000000
--- a/metadata/md5-cache/net-print/ink-0.5.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>net-print/libinklevel-0.8
-DESCRIPTION=A command line utility to display the ink level of your printer
-EAPI=5
-HOMEPAGE=http://ink.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>net-print/libinklevel-0.8
-SLOT=0
-SRC_URI=mirror://sourceforge/ink/ink-0.5.2.tar.gz
-_md5_=e55eb93c139565d1e582ba37bda13070
diff --git a/metadata/md5-cache/net-print/ink-0.5.3 b/metadata/md5-cache/net-print/ink-0.5.3
new file mode 100644
index 000000000000..643486aec689
--- /dev/null
+++ b/metadata/md5-cache/net-print/ink-0.5.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=net-print/libinklevel
+DESCRIPTION=A command line utility to display the ink level of your printer
+EAPI=8
+HOMEPAGE=http://ink.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/libinklevel
+SLOT=0
+SRC_URI=mirror://sourceforge/ink/ink-0.5.3.tar.gz
+_md5_=9f86bddd47998ce37f85574250443684
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index bdc2c45ca3be..e5d4c7f6fa46 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/iodine-0.7.0-r2 b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
deleted file mode 100644
index 1b7a7d7bae13..000000000000
--- a/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=sys-libs/zlib test? ( dev-libs/check )
-DESCRIPTION=IP over DNS tunnel
-EAPI=5
-HOMEPAGE=http://code.kryo.se/iodine/
-IUSE=test kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC GPL-2
-RDEPEND=sys-libs/zlib
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://code.kryo.se/iodine/iodine-0.7.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=137c596d8f03e492664849e23c36c613
diff --git a/metadata/md5-cache/net-vpn/iodine-0.7.0-r3 b/metadata/md5-cache/net-vpn/iodine-0.7.0-r3
new file mode 100644
index 000000000000..3ba0602301c4
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/iodine-0.7.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=sys-libs/zlib test? ( dev-libs/check )
+DESCRIPTION=IP over DNS tunnel
+EAPI=8
+HOMEPAGE=http://code.kryo.se/iodine/
+IUSE=test kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC GPL-2
+RDEPEND=sys-libs/zlib
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://code.kryo.se/iodine/iodine-0.7.0.tar.gz
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=56a4b55250059154438b57ef6dbe0ed9
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 5ba272852a8f..85dd2ba221ae 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/josm-bin-18191 b/metadata/md5-cache/sci-geosciences/josm-bin-18303
similarity index 88%
rename from metadata/md5-cache/sci-geosciences/josm-bin-18191
rename to metadata/md5-cache/sci-geosciences/josm-bin-18303
index db47d075e79c..8b1d4674f094 100644
--- a/metadata/md5-cache/sci-geosciences/josm-bin-18191
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-18303
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 GPL-2+ GPL-3
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
-SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-18191.jar
+SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-18303.jar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=bcd3244156c99c64fa42fc3885e5d074
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 7dba228bed17..924e8ea36d00 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/iproute2-5.15.0 b/metadata/md5-cache/sys-apps/iproute2-5.15.0
new file mode 100644
index 000000000000..dc8fb748f874
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/iproute2-5.15.0
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils >=sys-devel/bison-2.4 sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) berkdb? ( sys-libs/db:= ) bpf? ( dev-libs/libbpf:= ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) selinux? ( sys-libs/libselinux ) >=sys-kernel/linux-headers-3.16
+DESCRIPTION=kernel routing and traffic control utilities
+EAPI=7
+HOMEPAGE=https://wiki.linuxfoundation.org/networking/iproute2
+IUSE=atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) berkdb? ( sys-libs/db:= ) bpf? ( dev-libs/libbpf:= ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-5.15.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2f9a2cf0480459b5992f0a1e504cd263
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.29 b/metadata/md5-cache/sys-apps/sandbox-2.29
new file mode 100644
index 000000000000..873fd6a5bd07
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sandbox-2.29
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
+DESCRIPTION=sandbox'd LD_PRELOAD hack
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Sandbox
+IUSE=+nnp 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
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~vapier/dist/sandbox-2.29.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ef7f313ff68b5430bdd627a7f52accf1
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 3fb0839ae749..87e123742cb4 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/tgt-1.0.80 b/metadata/md5-cache/sys-block/tgt-1.0.80
index 4bdcd89f8fda..fef9061c80d9 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.80
+++ b/metadata/md5-cache/sys-block/tgt-1.0.80
@@ -5,10 +5,10 @@ DESCRIPTION=Linux SCSI target framework (tgt)
 EAPI=7
 HOMEPAGE=http://stgt.sourceforge.net
 IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-perl/Config-General rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) dev-libs/libaio sys-apps/sg3_utils
 SLOT=0
 SRC_URI=https://github.com/fujita/tgt/archive/v1.0.80.tar.gz -> tgt-1.0.80.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8533e0fe961e9facc3168a3dad53b308
+_md5_=d91c3e5b773a742377ac43738ddc1773
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 6518fadf2c7a..91575510ff36 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/e2fsprogs-1.46.4-r50 b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.4-r51
similarity index 75%
rename from metadata/md5-cache/sys-fs/e2fsprogs-1.46.4-r50
rename to metadata/md5-cache/sys-fs/e2fsprogs-1.46.4-r51
index 5cbfdd35b322..1bbf99665684 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.4-r50
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.4-r51
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig sys-apps/texinfo nls? ( sys-devel/gettext ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!sys-libs/com_err !sys-libs/ss !sys-libs/e2fsprogs-libs >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( >=sys-apps/util-linux-2.16 )
+DEPEND=!sys-libs/com_err !sys-libs/ss !sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( >=sys-apps/util-linux-2.16 )
 DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=cron fuse lto nls static-libs +threads +tools elibc_FreeBSD split-usr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-2 BSD
-RDEPEND=!sys-libs/com_err !sys-libs/ss !sys-libs/e2fsprogs-libs >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( >=sys-apps/util-linux-2.16 )
+RDEPEND=!sys-libs/com_err !sys-libs/ss !sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( >=sys-apps/util-linux-2.16 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2a937502eb9acf0a6ad44e834c77d3d3
+_md5_=450054356e789edf261988bf797c0c40
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index ea1d26363281..39a49c56c05d 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-sources-4.14.253 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.253
index ab1d52fec8b7..74b4fb9dc8f7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.253
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.253
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
 EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio 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.253
 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-263.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-263.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-263.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-263.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-263.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-263.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-263.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-263.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-263.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=782c06a0f048caa425346f5e1c34bebe
+_md5_=2ad828b7e7233955af2c4c3c2ad52204
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.214 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.214
index cbfb8e6a61c5..f49f2716cea9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.214
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.214
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
 EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio 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.214
 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-213.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-213.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-213.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-213.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-213.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-213.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-213.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-213.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-213.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c75c6e51be0eb3620fe5def6941a2690
+_md5_=dddf882bc4b3c5c8b0bf3e1d72d48ab5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.290 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.290
index d99a30cab3a7..ed5d6ebd1b03 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.290
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.290
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
 EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( app-arch/cpio 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.290
 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-292.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-292.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-292.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-292.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-292.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-292.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-292.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-292.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-292.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8712ea25e821e719ae373ae84692de6d
+_md5_=dd94ebf7cb8ba82e4295d529b08b6a40
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.288 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.288
index 897902a8e8f7..8b7567eaaad7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.288
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.288
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
 EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( app-arch/cpio 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.288
 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-292.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-292.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-292.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-292.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-292.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-292.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-292.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-292.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-292.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8712ea25e821e719ae373ae84692de6d
+_md5_=dd94ebf7cb8ba82e4295d529b08b6a40
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.76-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.76-r1
index 8a86829986c0..ddc4dbf8ef47 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.76-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.76-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
 EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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
 RDEPEND=!build? ( app-arch/cpio 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.10.76-r1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-83.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-83.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-83.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-83.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-83.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-83.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-83.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-83.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-83.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e77fb9c34be4da6c723cbed6851cc92e
+_md5_=e4e0daf5c734af49c9956ef5ba4eb7fa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.156 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.156
index 64929b99ad3b..bbd67d9337df 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.156
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.156
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
 EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio 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.156
 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-160.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-160.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-160.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-160.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-160.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-160.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-160.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-160.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-160.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1e840c976696d831df4b77974aea79b3
+_md5_=d193d56936e4f77464a54decf9b774e1
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index a7dbcaa553c5..e90b20cd01df 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/rust-1.56.1 b/metadata/md5-cache/virtual/rust-1.56.1
new file mode 100644
index 000000000000..51cc3c17f7b2
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.56.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=7
+IUSE=rustfmt 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 ~riscv ~x86
+RDEPEND=|| ( ~dev-lang/rust-1.56.1[rustfmt?,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-lang/rust-bin-1.56.1[rustfmt?,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
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8464fbd39e5a204486e22b1c8ec43be7
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 55d53357df3f..4ae4c87b3a39 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/microsoft-edge-beta-95.0.1020.30 b/metadata/md5-cache/www-client/microsoft-edge-beta-96.0.1054.8
similarity index 92%
rename from metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.30
rename to metadata/md5-cache/www-client/microsoft-edge-beta-96.0.1054.8
index fd6b4af0a235..66b874b5d428 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.30
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-96.0.1054.8
@@ -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/curl[ssl] 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/libxshmfence 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-beta/microsoft-edge-beta_95.0.1020.30-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_96.0.1054.8-1_amd64.deb
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=0add9c6b20bf831441de3c6359e81181
+_md5_=5669403d6eae87b45b6fac05f0940c88
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 32bd2be60c08..50f921451624 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-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 05b12f0999b3..3d014f75a3dd 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] 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 unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/openssl: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/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 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 ) >=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(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5
+BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] 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 ) ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=media-libs/libglvnd[X] dev-libs/openssl: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/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 >=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 ) >=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(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5
 DESCRIPTION=X.Org X servers
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-IUSE=kdrive xephyr xnest xorg xvfb debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity doc
+IUSE=xephyr xnest xorg xvfb debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity doc
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-9999 )
 PROPERTIES=live
-RDEPEND=media-libs/libglvnd[X] dev-libs/openssl: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/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 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 ) >=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(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( kdrive xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) xephyr? ( kdrive )
+RDEPEND=media-libs/libglvnd[X] dev-libs/openssl: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/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 >=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 ) >=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(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver )
+REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	cd706b673da66bddf59f910d089761d6
-_md5_=20b3fe70bc77b33c1748a4fdb5e95cfe
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	cd706b673da66bddf59f910d089761d6
+_md5_=d6878edc9bcb0cb903773550b92ff4f0
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 5900645a6cc2..fc481c2bba90 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.44 b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.44
index 00d2e64bbdce..4a939f8879b7 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.44
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.44
@@ -11,4 +11,4 @@ RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc:= tools? ( dev-libs/at
 SLOT=0/495
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/495.44/NVIDIA-Linux-x86_64-495.44.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/495.44/NVIDIA-Linux-aarch64-495.44.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-495.44.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-495.44.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-495.44.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-495.44.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-495.44.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	1c03540c81548283580ab5526ab0978c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a60b3fe44c321f3d9fc30713011676cd
+_md5_=bf201045c59d57a6eacc1dbd3f13b0cb
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 65fffa0f42d7..4d1d7717abf9 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/pango-1.48.10 b/metadata/md5-cache/x11-libs/pango-1.48.10-r1
similarity index 67%
rename from metadata/md5-cache/x11-libs/pango-1.48.10
rename to metadata/md5-cache/x11-libs/pango-1.48.10-r1
index 964ced959dfe..b6da874b34d4 100644
--- a/metadata/md5-cache/x11-libs/pango-1.48.10
+++ b/metadata/md5-cache/x11-libs/pango-1.48.10-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/glib-utils sys-apps/help2man virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.62.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(-)?] >=dev-libs/fribidi-1.0.6[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-2.2.0:=[glib(+),introspection?,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(-)?] >=media-libs/fontconfig-2.12.92: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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) 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/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.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(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.62.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(-)?] >=dev-libs/fribidi-1.0.6[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-2.2.0:=[glib(+),introspection?,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(-)?] >=media-libs/fontconfig-2.12.92: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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) 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/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.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(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Internationalized text layout and rendering library
 EAPI=7
 HOMEPAGE=https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango
 IUSE=debug +introspection sysprof 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
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.62.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(-)?] >=dev-libs/fribidi-1.0.6[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-2.2.0:=[glib(+),introspection?,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(-)?] >=media-libs/fontconfig-2.12.92: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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) 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/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.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(-)?] )
+RDEPEND=>=dev-libs/glib-2.62.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(-)?] >=dev-libs/fribidi-1.0.6[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-2.2.0:=[glib(+),introspection?,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(-)?] >=media-libs/fontconfig-2.12.92: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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) 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/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.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(-)?] )
 SLOT=0
 SRC_URI=http://ftp.gnome.org/pub/GNOME/sources/pango/1.48/pango-1.48.10.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=903e14f215d81f12ea28a87b7652dba3
+_md5_=8b869f82f7c58887f3e16cab919bb628
diff --git a/metadata/md5-cache/x11-libs/pango-1.48.7-r1 b/metadata/md5-cache/x11-libs/pango-1.48.7-r2
similarity index 67%
rename from metadata/md5-cache/x11-libs/pango-1.48.7-r1
rename to metadata/md5-cache/x11-libs/pango-1.48.7-r2
index 91e0f08d9cc1..9b0ce69830fc 100644
--- a/metadata/md5-cache/x11-libs/pango-1.48.7-r1
+++ b/metadata/md5-cache/x11-libs/pango-1.48.7-r2
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/glib-utils sys-apps/help2man virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.62.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(-)?] >=dev-libs/fribidi-1.0.6[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-2.0:=[glib(+),introspection?,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(-)?] >=media-libs/fontconfig-2.12.92: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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) 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/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.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(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.62.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(-)?] >=dev-libs/fribidi-1.0.6[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-2.0:=[glib(+),introspection?,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(-)?] >=media-libs/fontconfig-2.12.92: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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) 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/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.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(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Internationalized text layout and rendering library
 EAPI=7
 HOMEPAGE=https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango
 IUSE=debug +introspection sysprof 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
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.62.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(-)?] >=dev-libs/fribidi-1.0.6[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-2.0:=[glib(+),introspection?,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(-)?] >=media-libs/fontconfig-2.12.92: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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) 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/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.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(-)?] )
+RDEPEND=>=dev-libs/glib-2.62.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(-)?] >=dev-libs/fribidi-1.0.6[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-2.0:=[glib(+),introspection?,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(-)?] >=media-libs/fontconfig-2.12.92: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(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) 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/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.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(-)?] )
 SLOT=0
 SRC_URI=http://ftp.gnome.org/pub/GNOME/sources/pango/1.48/pango-1.48.7.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=4daae588593f14c1bab078727db15038
+_md5_=ff205f312c04f80adb62ba60821173ec
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index d12e0d53c61d..d8d7250e6441 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1 b/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1
index 802729788267..aa1fc5dd2293 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1
@@ -5,11 +5,11 @@ DESCRIPTION=Unified widget and session management libs for Xfce
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=debug glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.16/libxfce4ui-4.16.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=133cec5c411d6261fe7e8ca49f5b7208
+_md5_=b046d17c5e592abbb6a13aeca656eccc
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 629a962fbb85..6e93fc745b91 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15699 BLAKE2B f15728e0d0843f8ed0ab50efefae64f7579ad19fc1747c1cf409d85bfb7561ccd16bbf38ee75202fa17e7c1a4705843bbf9bf2e1efa3126f583c59f39107d117 SHA512 c5ef94aedc01b6003ce4bc869aa7200b3cbcf796f7cfe7a1aac06aa4e415627f0ec8e9dcdf305d6bb30d4a602e2948a1e3a0bf85c6841ae2fb469424c454348b
-TIMESTAMP 2021-11-01T14:39:20Z
+TIMESTAMP 2021-11-02T12:09:17Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmF//BhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGBKm1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klByxBAAn8RX337/MPlAmyR6PPhVmMB5bz2+mFzhUzI+MtP4FQTh9f6mvaH5oJ5I
-8QGM5Xl08rOI3gKKYi+qXIsRrDUvQwjzJy96L3r1B8g9p/6qM/AFRYLzLowcbYei
-u381CBWLYwxa5DfRN87ouRFlK0JBn8hUgfLTq+jyRDXGAf4nWYaD9ljqu99Gd+r1
-iki+0J/n0IyIQwmbpwrJguVY9Bai89VUeAq+ANnzm5HAidXJtnCjfvSNu8Q/eZJF
-grcDjQGmtzix1/cph3p28+t5V2ev60DwuCHd9a01Jr0Ao0eJzj0/GnIegXFskUES
-KijktPyiSdYddV+z6U8cxjxYc70/8Q37OwYjMcJOo5g9aBa62+tXZ9Hok27GuHnq
-4gGqPKoQiMvvia/LTrqhW+hXNEpcC1f3kI5j5Xr+QKkBpvuFRhZySuSByGFqtv+F
-m2lov2kNot4nJG1vcjezMdva+Wiq9MZIDlCO/XZXBhlkXfDndtf1hqW1s/GRKFMZ
-zNSut1a3nItauNNnuD+uIGbNxAyvMzfrAFDjoSVkcSEVO/W9JFzfNBfDKN3AQKg6
-v8VBMebSbEEosR6CYmmplVGW9flnAGuK/AduHw3qbdO7BwALJQljRFlnGaiyJqbl
-EWxzu6vDv/0VX2jaNfyJA0CXxBYU9RmFoL9oB4r0imjGPGS4nKM=
-=be+T
+klAMYQ//cZIVGs7wehMWdyY7s5x73M8a6ICncnNj7L6yf+FGEX+J+Yom2WbEi2ga
+HB8XXxcZmkiHnZiFMCs4E3sKIfD74jIrBih8+eZ56nAbna4bw02lMuUf+zapuEns
+nLZKRencpjY8XDECn6yL/YVZfwFuYvlSrhDKMyrc2GAbytucPlKjEfhQXDucAfUM
++d332LdG5EeqpxNjAMCICZmB790lTPWvRMdlTFq/WhXAZO14r3VKfeKtWUG9HOj8
+ybkE+r5AiSQmmEEy7HVxPL23pmsXLXH+nXchA3sy2LaUimtTzvQAxfIkJVEI9HiU
+hKKJySQLOGzXB/gdoofFgJd6RmhOQuTgUsopDm2zSTvFZZnyn9Ou7WdOMxjzsEVv
+GFurlhxhPf40Qy4MCyKQ1D3hVI/c4+O3F5PQfe34hFTiW1ZERb171K1hKBMEG8cb
+Zc6yh3Ws5fKZUTelEPPRN4XAdj77s3cWKe5qqRYget1hh6cYw/hHH1E6EDvGW5gM
+PsT2pU45Qq1NqEoYe6bDeAr7LC1wITfCQx29eKkda1adbwmOmHvVlcRrZdfOoGlk
+VlZudXnfVuk73JGqrQuWlrFp1S4m6kweRlm+abUyP1FMH5MTsJBELUaTqs1CHm2O
+7klGfIcGk2d6DpDAEV4atLjlgapNypA7XoJguukgEIIhEN16ZCs=
+=phKh
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d225ab347201..c804de900358 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Nov 2021 14:39:17 +0000
+Tue, 02 Nov 2021 12:09:13 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 207166c46571..cefa984d48bd 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Nov  1 02:09:15 PM UTC 2021
+Tue Nov  2 12:09:12 PM UTC 2021
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 227978c2d92d..41ec1a48e917 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -1226,6 +1226,7 @@
 2110281009 ./app-admin/awscli/awscli-1.21.5.ebuild
 2110290009 ./app-admin/awscli/awscli-1.21.6.ebuild
 2110301009 ./app-admin/awscli/awscli-1.21.7.ebuild
+2111020139 ./app-admin/awscli/awscli-1.21.8.ebuild
 2106141609 ./app-admin/ansible-molecule/ansible-molecule-3.3.4.ebuild
 2107270639 ./app-admin/ananicy/ananicy-2.2.1-r1.ebuild
 2109150109 ./app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
@@ -1482,7 +1483,7 @@
 2107150909 ./app-benchmarks/siege/siege-4.1.0.ebuild
 2110300109 ./app-benchmarks/stress-ng/stress-ng-0.13.06.ebuild
 2008091909 ./app-benchmarks/stress/stress-1.0.4-r2.ebuild
-2110021539 ./app-benchmarks/stress/stress-1.0.5.ebuild
+2111021339 ./app-benchmarks/stress/stress-1.0.5.ebuild
 2107020039 ./app-benchmarks/sysbench/sysbench-1.0.20-r100.ebuild
 1702282250 ./app-benchmarks/tiobench/tiobench-0.4.2.ebuild
 2109171809 ./app-benchmarks/tiobench/tiobench-0.5.0.ebuild
@@ -4006,7 +4007,7 @@
 2107191439 ./app-misc/rdfind/rdfind-1.4.1.ebuild
 2109111439 ./app-misc/rdfind/rdfind-1.5.0.ebuild
 2110240739 ./app-misc/broot/broot-1.6.6.ebuild
-2110311509 ./app-misc/broot/broot-1.7.0.ebuild
+2111021239 ./app-misc/broot/broot-1.7.0.ebuild
 2108082339 ./app-misc/libdatovka/libdatovka-0.1.2.ebuild
 2110071139 ./app-misc/libdatovka/libdatovka-0.2.0.ebuild
 2109100009 ./app-misc/rmlint/rmlint-2.10.1.ebuild
@@ -7303,7 +7304,8 @@
 2107102039 ./dev-lang/gprolog/gprolog-1.5.0.ebuild
 2106010339 ./dev-lang/hy/hy-0.20.0.ebuild
 2109260309 ./dev-lang/icon/icon-9.5.20i.ebuild
-1702282250 ./dev-lang/inform/inform-6.33.1_p2.ebuild
+2111021139 ./dev-lang/inform/inform-6.33.1_p2.ebuild
+2111021139 ./dev-lang/inform/inform-6.35_p4.ebuild
 2105022009 ./dev-lang/interprolog/interprolog-2.1.2.ebuild
 2110200740 ./dev-lang/ispc/ispc-1.16.1.ebuild
 2110200740 ./dev-lang/ispc/ispc-9999.ebuild
@@ -7407,11 +7409,13 @@
 2109070339 ./dev-lang/rust-bin/rust-bin-1.53.0.ebuild
 2109131839 ./dev-lang/rust-bin/rust-bin-1.55.0.ebuild
 2110220009 ./dev-lang/rust-bin/rust-bin-1.56.0.ebuild
+2111020039 ./dev-lang/rust-bin/rust-bin-1.56.1.ebuild
 2110071909 ./dev-lang/rust/rust-1.52.1.ebuild
 2110071909 ./dev-lang/rust/rust-1.53.0.ebuild
 2110071909 ./dev-lang/rust/rust-1.54.0.ebuild
 2110071909 ./dev-lang/rust/rust-1.55.0.ebuild
 2110220309 ./dev-lang/rust/rust-1.56.0-r1.ebuild
+2111020039 ./dev-lang/rust/rust-1.56.1.ebuild
 2108180339 ./dev-lang/sassc/sassc-3.6.2.ebuild
 2107120939 ./dev-lang/scala-bin/scala-bin-2.13.6.ebuild
 2104161439 ./dev-lang/scala/scala-2.12.10.ebuild
@@ -7712,7 +7716,7 @@
 2110190639 ./dev-libs/libaio/libaio-9999.ebuild
 2105311239 ./dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
 2109101139 ./dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
-2107172139 ./dev-libs/libarcus/libarcus-4.9.1.ebuild
+2111021209 ./dev-libs/libarcus/libarcus-4.9.1.ebuild
 2106121909 ./dev-libs/libassuan/libassuan-2.5.3.ebuild
 2106121909 ./dev-libs/libassuan/libassuan-2.5.4.ebuild
 2108162339 ./dev-libs/libassuan/libassuan-2.5.5.ebuild
@@ -7739,10 +7743,10 @@
 2108100309 ./dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
 2101310343 ./dev-libs/libcec/libcec-4.0.4-r1.ebuild
 2101310343 ./dev-libs/libcec/libcec-4.0.7.ebuild
-2105200309 ./dev-libs/libcec/libcec-6.0.2.ebuild
+2111021209 ./dev-libs/libcec/libcec-6.0.2.ebuild
 2107052310 ./dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
 2109190139 ./dev-libs/libcgroup/libcgroup-2.0.ebuild
-2107231609 ./dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
+2111021209 ./dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
 2103112009 ./dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
 2108122310 ./dev-libs/libclc/libclc-13.0.0_rc1.ebuild
 2101241509 ./dev-libs/libconfig/libconfig-1.7.2.ebuild
@@ -7870,7 +7874,6 @@
 2107160439 ./dev-libs/libmix/libmix-2.05-r7.ebuild
 2003031839 ./dev-libs/libmodbus/libmodbus-3.1.6.ebuild
 2106300139 ./dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
-2105021909 ./dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
 2109241040 ./dev-libs/libmowgli/libmowgli-9999.ebuild
 2110312109 ./dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
 2002112051 ./dev-libs/libmspack/libmspack-9999.ebuild
@@ -7934,9 +7937,9 @@
 2109071839 ./dev-libs/libreport/libreport-2.15.2.ebuild
 2108120640 ./dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
 2108120640 ./dev-libs/librevenge/librevenge-9999.ebuild
-2108180339 ./dev-libs/libsass/libsass-3.6.5.ebuild
 2108180339 ./dev-libs/libsass/libsass-9999.ebuild
-2107172139 ./dev-libs/libsavitar/libsavitar-4.9.1.ebuild
+2111011909 ./dev-libs/libsass/libsass-3.6.5.ebuild
+2111021209 ./dev-libs/libsavitar/libsavitar-4.9.1.ebuild
 2008302039 ./dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
 2105280639 ./dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028.ebuild
 2104031909 ./dev-libs/libserialport/libserialport-0.1.1.ebuild
@@ -8648,7 +8651,7 @@
 2103140409 ./dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild
 2107122309 ./dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
 2110150639 ./dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild
-2110201010 ./dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
+2111021339 ./dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
 2103140409 ./dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
 2103140409 ./dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
 2106100109 ./dev-ml/ppx_tools/ppx_tools-6.2.ebuild
@@ -8656,7 +8659,7 @@
 2110150709 ./dev-ml/ppx_tools/ppx_tools-6.4.ebuild
 2103150709 ./dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.4.0.ebuild
 2110150639 ./dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild
-2110201010 ./dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
+2111021339 ./dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
 2103140409 ./dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
 2110060409 ./dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1-r1.ebuild
 2103140409 ./dev-ml/react/react-1.2.1-r1.ebuild
@@ -8752,7 +8755,7 @@
 2110150609 ./dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild
 2110150609 ./dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild
 2110150609 ./dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
-2110291539 ./dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
+2111021239 ./dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
 2103140409 ./dev-ml/re/re-1.9.0.ebuild
 2110060409 ./dev-ml/re/re-1.10.3.ebuild
 2105292209 ./dev-ml/sexplib0/sexplib0-0.14.0.ebuild
@@ -9444,37 +9447,31 @@
 2108031509 ./dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
 2111011439 ./dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.120.0-r3.ebuild
 2111011439 ./dev-perl/HTML-Strip/HTML-Strip-2.100.0-r1.ebuild
-1912110241 ./dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0.ebuild
-1912110241 ./dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0.ebuild
-2004032241 ./dev-perl/HTML-Table/HTML-Table-2.08a-r1.ebuild
-1702282250 ./dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.130.0.ebuild
+2111012109 ./dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0-r1.ebuild
+2111012109 ./dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0-r1.ebuild
+2111012109 ./dev-perl/HTML-Table/HTML-Table-2.08a-r2.ebuild
 2108031509 ./dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild
-2008291639 ./dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild
-2008050409 ./dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild
+2111012109 ./dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.305.0.ebuild
+2111012109 ./dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0-r1.ebuild
 2108031509 ./dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild
 2106140309 ./dev-perl/HTML-TagFilter/HTML-TagFilter-1.30.0-r1.ebuild
 2106140309 ./dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r2.ebuild
-1702282250 ./dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r1.ebuild
+2111012109 ./dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r2.ebuild
 2105221839 ./dev-perl/HTML-Template-JIT/HTML-Template-JIT-0.50.0-r3.ebuild
 2106150239 ./dev-perl/HTML-Template-Pro/HTML-Template-Pro-0.951.0-r1.ebuild
-2004290039 ./dev-perl/HTML-Template/HTML-Template-2.970.0.ebuild
+2111012109 ./dev-perl/HTML-Template/HTML-Template-2.970.0-r1.ebuild
 2106150239 ./dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r2.ebuild
-2108020539 ./dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
+2111012109 ./dev-perl/HTML-Tree/HTML-Tree-5.70.0-r1.ebuild
 2106150239 ./dev-perl/HTTP-Body/HTTP-Body-1.220.0-r1.ebuild
-2012311940 ./dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.140.0.ebuild
 2108031509 ./dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
-2110160409 ./dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
-1912110241 ./dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.8.0.ebuild
+2111020510 ./dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.350.0.ebuild
+2111020510 ./dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0-r1.ebuild
 2106150239 ./dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.10.0.ebuild
-2104060140 ./dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild
+2111020510 ./dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.12.0.ebuild
 2108061539 ./dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild
-1702282250 ./dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild
 2108031509 ./dev-perl/HTTP-DAV/HTTP-DAV-0.490.0.ebuild
-2104060140 ./dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
 2106252239 ./dev-perl/HTTP-Daemon/HTTP-Daemon-6.120.0.ebuild
-2104060140 ./dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild
 2108061539 ./dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild
-2004032241 ./dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.200.0.ebuild
 2108051739 ./dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild
 2007060609 ./dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.220.0.ebuild
 2108061539 ./dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild
@@ -10042,7 +10039,7 @@
 2104060140 ./dev-perl/Params-Util/Params-Util-1.70.0.ebuild
 2110071009 ./dev-perl/Params-Util/Params-Util-1.102.0.ebuild
 2101070139 ./dev-perl/Params-Validate/Params-Validate-1.290.0.ebuild
-2111010539 ./dev-perl/Params-Validate/Params-Validate-1.300.0.ebuild
+2111021339 ./dev-perl/Params-Validate/Params-Validate-1.300.0.ebuild
 2101070139 ./dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.260.0.ebuild
 2108262310 ./dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.300.0.ebuild
 2110291639 ./dev-perl/Parse-ErrorString-Perl/Parse-ErrorString-Perl-0.270.0-r1.ebuild
@@ -10226,7 +10223,7 @@
 2108081809 ./dev-perl/Sort-Tree/Sort-Tree-1.90.0-r2.ebuild
 2108081809 ./dev-perl/Sort-Versions/Sort-Versions-1.620.0-r1.ebuild
 2101070139 ./dev-perl/Specio/Specio-0.420.0.ebuild
-2110110639 ./dev-perl/Specio/Specio-0.470.0.ebuild
+2111011909 ./dev-perl/Specio/Specio-0.470.0.ebuild
 2108090339 ./dev-perl/Speech-Recognizer-SPX/Speech-Recognizer-SPX-0.80.100-r2.ebuild
 2108090339 ./dev-perl/Sphinx-Config/Sphinx-Config-0.100.0-r1.ebuild
 2108090339 ./dev-perl/Sphinx-Search/Sphinx-Search-0.310.0-r1.ebuild
@@ -10576,7 +10573,7 @@
 2104060140 ./dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
 2109302339 ./dev-perl/Unicode-Map/Unicode-Map-0.112.0-r2.ebuild
 2104060140 ./dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
-2110200339 ./dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
+2111021239 ./dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
 2104060140 ./dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild
 2110020339 ./dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.140.0.ebuild
 2110020339 ./dev-perl/Unicode-String/Unicode-String-2.100.0-r1.ebuild
@@ -10618,8 +10615,7 @@
 2110030139 ./dev-perl/Weather-Com/Weather-Com-2.0.0-r2.ebuild
 1912110241 ./dev-perl/WebService-Linode/WebService-Linode-0.28.0.ebuild
 2110030139 ./dev-perl/WebService-Linode/WebService-Linode-0.290.0.ebuild
-2109270139 ./dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild
-2110030139 ./dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.5.ebuild
+2111021339 ./dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.5.ebuild
 2110030139 ./dev-perl/WordNet-QueryData/WordNet-QueryData-1.490.0-r3.ebuild
 2110031539 ./dev-perl/Wx-GLCanvas/Wx-GLCanvas-0.90.0-r1.ebuild
 2110291639 ./dev-perl/Wx-Perl-ProcessStream/Wx-Perl-ProcessStream-0.320.0-r4.ebuild
@@ -10862,7 +10858,7 @@
 2009221539 ./dev-perl/Authen-OATH/Authen-OATH-2.0.1.ebuild
 2009221539 ./dev-perl/Convert-Base32/Convert-Base32-0.60.0.ebuild
 2108010839 ./dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild
-2110111809 ./dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild
+2111021339 ./dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild
 2011092009 ./dev-perl/PDF-Builder/PDF-Builder-3.19.0.ebuild
 2110262109 ./dev-perl/PDF-Builder/PDF-Builder-3.23.0.ebuild
 2107242339 ./dev-perl/Alien-GMP/Alien-GMP-1.160.0.ebuild
@@ -10887,7 +10883,7 @@
 2110110309 ./dev-perl/Alien-HDF4/Alien-HDF4-0.50.0.ebuild
 2110110309 ./dev-perl/Convert-UU/Convert-UU-0.520.100.ebuild
 2110110009 ./dev-perl/PPIx-Utils/PPIx-Utils-0.3.0.ebuild
-2110110639 ./dev-perl/XString/XString-0.5.0.ebuild
+2111011909 ./dev-perl/XString/XString-0.5.0.ebuild
 2109222239 ./dev-perl/Archive-Any-Lite/Archive-Any-Lite-0.110.0.ebuild
 2109222239 ./dev-perl/Array-Diff/Array-Diff-0.90.0.ebuild
 2109222239 ./dev-perl/Data-Binary/Data-Binary-0.10.0.ebuild
@@ -11394,6 +11390,7 @@
 2109181939 ./dev-python/async_generator/async_generator-1.10-r1.ebuild
 2108021209 ./dev-python/async_timeout/async_timeout-3.0.1.ebuild
 2111011139 ./dev-python/async_timeout/async_timeout-4.0.0_alpha3.ebuild
+2111020139 ./dev-python/async_timeout/async_timeout-4.0.0.ebuild
 2109090339 ./dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
 2108190940 ./dev-python/atpublic/atpublic-2.3.ebuild
 2106052339 ./dev-python/attrs/attrs-21.2.0.ebuild
@@ -11410,7 +11407,7 @@
 2109192039 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
 2108161539 ./dev-python/babelfish/babelfish-9999.ebuild
 2109171239 ./dev-python/babelfish/babelfish-0.6.0-r1.ebuild
-2109262109 ./dev-python/backcall/backcall-0.2.0.ebuild
+2111011909 ./dev-python/backcall/backcall-0.2.0.ebuild
 2101310343 ./dev-python/backports-tempfile/backports-tempfile-1.0-r1.ebuild
 2101310343 ./dev-python/backports-weakref/backports-weakref-1.0_p1-r1.ebuild
 2109081439 ./dev-python/bandit/bandit-1.7.0.ebuild
@@ -11441,6 +11438,7 @@
 2110281009 ./dev-python/boto3/boto3-1.19.5.ebuild
 2110290009 ./dev-python/boto3/boto3-1.19.6.ebuild
 2110301009 ./dev-python/boto3/boto3-1.19.7.ebuild
+2111020139 ./dev-python/boto3/boto3-1.19.8.ebuild
 2109280139 ./dev-python/botocore/botocore-9999.ebuild
 2110131339 ./dev-python/botocore/botocore-1.21.60.ebuild
 2110170109 ./dev-python/botocore/botocore-1.21.53.ebuild
@@ -11448,6 +11446,7 @@
 2110281009 ./dev-python/botocore/botocore-1.22.5.ebuild
 2110290009 ./dev-python/botocore/botocore-1.22.6.ebuild
 2110301009 ./dev-python/botocore/botocore-1.22.7.ebuild
+2111020139 ./dev-python/botocore/botocore-1.22.8.ebuild
 2107021539 ./dev-python/bottle/bottle-0.12.19.ebuild
 2110250039 ./dev-python/bottleneck/bottleneck-1.3.2.ebuild
 2110291839 ./dev-python/bpython/bpython-0.21.ebuild
@@ -11499,7 +11498,7 @@
 2110091039 ./dev-python/click/click-8.0.2.ebuild
 2110111109 ./dev-python/click/click-8.0.3.ebuild
 2107030940 ./dev-python/cliff/cliff-3.8.0.ebuild
-2110172239 ./dev-python/cliff/cliff-3.9.0.ebuild
+2111011909 ./dev-python/cliff/cliff-3.9.0.ebuild
 2105231239 ./dev-python/clint/clint-0.5.1-r3.ebuild
 2110160209 ./dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
 2110160209 ./dev-python/cmd2/cmd2-2.2.0.ebuild
@@ -11591,6 +11590,7 @@
 2106030409 ./dev-python/django/django-2.2.24.ebuild
 2107020939 ./dev-python/django/django-3.1.13.ebuild
 2110172239 ./dev-python/django/django-3.2.8.ebuild
+2111020139 ./dev-python/django/django-3.2.9.ebuild
 2108292239 ./dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild
 2107081009 ./dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
 2109050739 ./dev-python/dkimpy/dkimpy-1.0.5.ebuild
@@ -11727,6 +11727,7 @@
 2109020939 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.6.ebuild
 2110271139 ./dev-python/google-auth/google-auth-2.3.2.ebuild
 2110312109 ./dev-python/google-auth/google-auth-2.3.0.ebuild
+2111020139 ./dev-python/google-auth/google-auth-2.3.3.ebuild
 2106210110 ./dev-python/google-pasta/google-pasta-0.2.0-r1.ebuild
 2103030039 ./dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
 2107081409 ./dev-python/graph-tool/graph-tool-2.43.ebuild
@@ -11954,7 +11955,7 @@
 2108060109 ./dev-python/minimock/minimock-1.3.0.ebuild
 2102192039 ./dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
 2104062309 ./dev-python/miniupnpc/miniupnpc-2.2.2.ebuild
-2109291009 ./dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
+2111021239 ./dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
 2102230309 ./dev-python/misaka/misaka-2.1.1.ebuild
 2105071409 ./dev-python/mistune/mistune-0.8.4-r1.ebuild
 2109091909 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
@@ -12037,7 +12038,7 @@
 2110250039 ./dev-python/numexpr/numexpr-2.7.3.ebuild
 2110250009 ./dev-python/numpy/numpy-1.21.1-r1.ebuild
 2110250009 ./dev-python/numpy/numpy-1.21.3-r1.ebuild
-2110270939 ./dev-python/numpy/numpy-1.21.2-r1.ebuild
+2111021239 ./dev-python/numpy/numpy-1.21.2-r1.ebuild
 2110141539 ./dev-python/numpydoc/numpydoc-1.1.0.ebuild
 2101310343 ./dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
 2107130709 ./dev-python/oauthlib/oauthlib-3.1.1.ebuild
@@ -12051,7 +12052,7 @@
 2101310343 ./dev-python/openstackdocstheme/openstackdocstheme-2.2.5.ebuild
 2110011239 ./dev-python/openstackdocstheme/openstackdocstheme-2.3.1.ebuild
 2110040409 ./dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
-2108011639 ./dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
+2111021009 ./dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
 2105161609 ./dev-python/os-client-config/os-client-config-2.1.0.ebuild
 2110312109 ./dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
 2107070539 ./dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
@@ -12114,7 +12115,7 @@
 2106240739 ./dev-python/pgspecial/pgspecial-1.13.0.ebuild
 2110281009 ./dev-python/phonenumbers/phonenumbers-8.12.36.ebuild
 2110312109 ./dev-python/phonenumbers/phonenumbers-8.12.35.ebuild
-2109262109 ./dev-python/pickleshare/pickleshare-0.7.5.ebuild
+2111011909 ./dev-python/pickleshare/pickleshare-0.7.5.ebuild
 2108211009 ./dev-python/pid/pid-3.0.4.ebuild
 2106051809 ./dev-python/piexif/piexif-1.1.3-r1.ebuild
 2101310343 ./dev-python/pika/pika-1.1.0.ebuild
@@ -12153,6 +12154,7 @@
 2110101009 ./dev-python/pretty-yaml/pretty-yaml-21.10.1.ebuild
 2109091739 ./dev-python/prettytable/prettytable-0.7.2-r1.ebuild
 2110312109 ./dev-python/prettytable/prettytable-2.2.1.ebuild
+2111020139 ./dev-python/prettytable/prettytable-2.3.0.ebuild
 2105071439 ./dev-python/priority/priority-1.3.0.ebuild
 2109050109 ./dev-python/priority/priority-2.0.0.ebuild
 2106240039 ./dev-python/process-tests/process-tests-2.1.2.ebuild
@@ -12165,7 +12167,7 @@
 2110292309 ./dev-python/prometheus_client/prometheus_client-0.12.0.ebuild
 2107242039 ./dev-python/prompt_toolkit/prompt_toolkit-3.0.19.ebuild
 2109262109 ./dev-python/prompt_toolkit/prompt_toolkit-3.0.20.ebuild
-2110221339 ./dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild
+2111011909 ./dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild
 2107020039 ./dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
 2107020039 ./dev-python/protobuf-python/protobuf-python-3.16.0.ebuild
 2107020039 ./dev-python/protobuf-python/protobuf-python-3.17.0.ebuild
@@ -12451,6 +12453,7 @@
 2109191609 ./dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
 2108160909 ./dev-python/pytools/pytools-9999.ebuild
 2109182039 ./dev-python/pytools/pytools-2021.2.8.ebuild
+2111020939 ./dev-python/pytools/pytools-2021.2.9.ebuild
 2105071439 ./dev-python/pytrie/pytrie-0.4.0.ebuild
 2105061809 ./dev-python/pytz/pytz-2021.1.ebuild
 2110021109 ./dev-python/pytz/pytz-2021.3.ebuild
@@ -12480,7 +12483,7 @@
 2110031909 ./dev-python/rarfile/rarfile-4.0.ebuild
 2108211009 ./dev-python/ratelimit/ratelimit-2.2.1.ebuild
 2108250009 ./dev-python/rdflib/rdflib-5.0.0.ebuild
-2110270739 ./dev-python/rdflib/rdflib-6.0.2.ebuild
+2111021239 ./dev-python/rdflib/rdflib-6.0.2.ebuild
 2110312109 ./dev-python/readme_renderer/readme_renderer-30.0.ebuild
 2106052139 ./dev-python/rebulk/rebulk-3.0.1.ebuild
 2107011739 ./dev-python/recommonmark/recommonmark-0.7.1.ebuild
@@ -12490,6 +12493,7 @@
 2110111839 ./dev-python/regex/regex-2021.8.28.ebuild
 2110231039 ./dev-python/regex/regex-2021.10.23.ebuild
 2110312139 ./dev-python/regex/regex-2021.10.8.ebuild
+2111020139 ./dev-python/regex/regex-2021.11.1.ebuild
 2109171739 ./dev-python/rencode/rencode-1.0.6-r2.ebuild
 2110011239 ./dev-python/reno/reno-3.4.0.ebuild
 2110080109 ./dev-python/reno/reno-3.5.0.ebuild
@@ -12631,7 +12635,7 @@
 2108051439 ./dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
 2109050109 ./dev-python/sqlalchemy/sqlalchemy-1.4.23.ebuild
 2109260039 ./dev-python/sqlalchemy/sqlalchemy-1.4.25.ebuild
-2110312139 ./dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
+2111011909 ./dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
 2108192209 ./dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
 2107111609 ./dev-python/ssl-fetch/ssl-fetch-9999.ebuild
 2109230439 ./dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -12651,6 +12655,7 @@
 2108250839 ./dev-python/svg-path/svg-path-4.1.ebuild
 2106052139 ./dev-python/svgwrite/svgwrite-1.4.1.ebuild
 2101301909 ./dev-python/swagger-spec-validator/swagger-spec-validator-2.7.3.ebuild
+2111021340 ./dev-python/swagger-spec-validator/swagger-spec-validator-2.7.4.ebuild
 2108190940 ./dev-python/sybil/sybil-2.0.1.ebuild
 2110281009 ./dev-python/sybil/sybil-3.0.0.ebuild
 2105292139 ./dev-python/symengine/symengine-0.7.2-r2.ebuild
@@ -12712,7 +12717,7 @@
 2105181609 ./dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
 2110160209 ./dev-python/unidecode/unidecode-1.3.0.ebuild
 2106052139 ./dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
-2106142009 ./dev-python/uranium/uranium-4.9.1.ebuild
+2111021209 ./dev-python/uranium/uranium-4.9.1.ebuild
 2109231739 ./dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild
 2110110439 ./dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
 2110111109 ./dev-python/uritemplate/uritemplate-4.0.0.ebuild
@@ -12739,6 +12744,7 @@
 2110231439 ./dev-python/virtualenv/virtualenv-20.7.2-r1.ebuild
 2110232339 ./dev-python/virtualenv/virtualenv-20.9.0.ebuild
 2110312109 ./dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
+2111020139 ./dev-python/virtualenv/virtualenv-20.10.0.ebuild
 2101310343 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
 2105112239 ./dev-python/visitor/visitor-0.1.3-r1.ebuild
 2109140439 ./dev-python/vobject/vobject-0.9.6.1-r2.ebuild
@@ -12785,6 +12791,7 @@
 2109072139 ./dev-python/xcffib/xcffib-0.11.1.ebuild
 2110250039 ./dev-python/xlrd/xlrd-2.0.1.ebuild
 2110250039 ./dev-python/xlsxwriter/xlsxwriter-3.0.1.ebuild
+2111020139 ./dev-python/xlsxwriter/xlsxwriter-3.0.2.ebuild
 2109072139 ./dev-python/xlwt/xlwt-1.3.0-r1.ebuild
 2109060339 ./dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
 2105140139 ./dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
@@ -12794,6 +12801,7 @@
 2106052209 ./dev-python/yapsy/yapsy-1.12.2.ebuild
 2105222139 ./dev-python/yarl/yarl-1.6.3.ebuild
 2110080109 ./dev-python/yarl/yarl-1.7.0.ebuild
+2111020139 ./dev-python/yarl/yarl-1.7.2.ebuild
 2103051209 ./dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
 2109030209 ./dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
 2109201709 ./dev-python/zeep/zeep-4.1.0.ebuild
@@ -12876,7 +12884,7 @@
 2109140809 ./dev-python/patch-ng/patch-ng-1.17.4.ebuild
 2107081439 ./dev-python/pweave/pweave-0.30.3-r1.ebuild
 2105242309 ./dev-python/snaketrace/snaketrace-0.3.1.ebuild
-2107081009 ./dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+2111020139 ./dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
 2109140909 ./dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
 2106010339 ./dev-python/pynvim/pynvim-0.4.3.ebuild
 2105061509 ./dev-python/ordered-set/ordered-set-4.0.2.ebuild
@@ -13056,7 +13064,7 @@
 2106051839 ./dev-python/three-merge/three-merge-0.1.1.ebuild
 2102161539 ./dev-python/pytaglib/pytaglib-1.4.6.ebuild
 2102041809 ./dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
-2107172139 ./dev-python/pynest2d/pynest2d-4.9.1.ebuild
+2111021209 ./dev-python/pynest2d/pynest2d-4.9.1.ebuild
 2108220139 ./dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
 2107242039 ./dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
 2109261009 ./dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
@@ -13274,7 +13282,7 @@
 2109260039 ./dev-python/u-msgpack-python/u-msgpack-python-2.7.1.ebuild
 2110132209 ./dev-python/debugpy/debugpy-1.5.0.ebuild
 2110191039 ./dev-python/debugpy/debugpy-1.5.1.ebuild
-2110172239 ./dev-python/autopage/autopage-0.4.0.ebuild
+2111011909 ./dev-python/autopage/autopage-0.4.0.ebuild
 2110092239 ./dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
 2109091710 ./dev-python/json5/json5-0.9.6.ebuild
 2109091710 ./dev-python/jupyter-lsp/jupyter-lsp-1.4.1.ebuild
@@ -13299,7 +13307,7 @@
 2110110009 ./dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
 2110110009 ./dev-python/watchgod/watchgod-0.7.ebuild
 2110011009 ./dev-python/toposort/toposort-1.7.ebuild
-2110312109 ./dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
+2111011909 ./dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
 2110240809 ./dev-python/pytest-check/pytest-check-1.0.4.ebuild
 2109251009 ./dev-python/patiencediff/patiencediff-0.2.2.ebuild
 2109251709 ./dev-python/puremagic/puremagic-1.11.ebuild
@@ -14809,8 +14817,8 @@
 2109080039 ./dev-ruby/crass/crass-1.0.6.ebuild
 2008221109 ./dev-ruby/creole/creole-0.5.0.ebuild
 2101241009 ./dev-ruby/creole/creole-0.5.0-r1.ebuild
-2009150909 ./dev-ruby/cri/cri-2.15.10.ebuild
 2101060939 ./dev-ruby/cri/cri-2.15.11.ebuild
+2111020839 ./dev-ruby/cri/cri-2.15.11-r1.ebuild
 2007231809 ./dev-ruby/css_parser/css_parser-1.7.1.ebuild
 2107071009 ./dev-ruby/css_parser/css_parser-1.9.0.ebuild
 2107311009 ./dev-ruby/css_parser/css_parser-1.10.0.ebuild
@@ -15000,6 +15008,7 @@
 2004041009 ./dev-ruby/ice_nine/ice_nine-0.11.2.ebuild
 2110110309 ./dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
 2106120939 ./dev-ruby/idn-ruby/idn-ruby-0.1.2.ebuild
+2111020839 ./dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild
 2102191009 ./dev-ruby/image_processing/image_processing-1.12.1.ebuild
 2008161939 ./dev-ruby/imagesize/imagesize-0.1.1_p20100902-r1.ebuild
 2007221309 ./dev-ruby/inflecto/inflecto-0.0.2.ebuild
@@ -15153,6 +15162,7 @@
 2003051139 ./dev-ruby/net-ssh/net-ssh-5.2.0.ebuild
 2109280409 ./dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
 2107211339 ./dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
+2111020839 ./dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
 2001261139 ./dev-ruby/netrc/netrc-0.11.0.ebuild
 2104300909 ./dev-ruby/netrc/netrc-0.11.0-r1.ebuild
 2008030839 ./dev-ruby/network_interface/network_interface-0.0.2.ebuild
@@ -15463,7 +15473,7 @@
 2011060639 ./dev-ruby/sass/sass-3.4.25.ebuild
 2109081939 ./dev-ruby/sass/sass-3.7.4.ebuild
 2107062309 ./dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild
-2110110309 ./dev-ruby/sassc/sassc-2.4.0.ebuild
+2111011909 ./dev-ruby/sassc/sassc-2.4.0.ebuild
 2009080909 ./dev-ruby/sawyer/sawyer-0.8.2.ebuild
 2109071539 ./dev-ruby/sdoc/sdoc-1.1.0.ebuild
 2007252039 ./dev-ruby/seed-fu/seed-fu-2.3.9.ebuild
@@ -15476,7 +15486,7 @@
 2107181139 ./dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
 2007252039 ./dev-ruby/semver2/semver2-3.4.2.ebuild
 2002230909 ./dev-ruby/serialport/serialport-1.3.1.ebuild
-2111011310 ./dev-ruby/serialport/serialport-1.3.2.ebuild
+2111021239 ./dev-ruby/serialport/serialport-1.3.2.ebuild
 2001251039 ./dev-ruby/serverengine/serverengine-2.2.1.ebuild
 2011040909 ./dev-ruby/serverengine/serverengine-2.2.2.ebuild
 2102181039 ./dev-ruby/serverengine/serverengine-2.2.3.ebuild
@@ -16091,7 +16101,7 @@
 2109062309 ./dev-util/ccache/ccache-4.3-r2.ebuild
 2109120410 ./dev-util/ccache/ccache-4.4.1.ebuild
 2110080809 ./dev-util/ccache/ccache-4.3-r3.ebuild
-2110302039 ./dev-util/ccache/ccache-4.4.2.ebuild
+2111021239 ./dev-util/ccache/ccache-4.4.2.ebuild
 2104161439 ./dev-util/cccc/cccc-3.1.5-r1.ebuild
 2104161439 ./dev-util/cccc/cccc-3.1.6.ebuild
 1912210209 ./dev-util/cflow/cflow-1.6.ebuild
@@ -16125,6 +16135,7 @@
 2010142139 ./dev-util/codeblocks/codeblocks-17.12-r304.ebuild
 2103170539 ./dev-util/codeblocks/codeblocks-20.03-r2.ebuild
 2110130039 ./dev-util/codeblocks/codeblocks-20.03-r3.ebuild
+2111021409 ./dev-util/codeblocks/codeblocks-20.03-r4.ebuild
 2101191809 ./dev-util/colm/colm-0.14.6.ebuild
 2104060140 ./dev-util/colm/colm-0.13.0.7.ebuild
 2108291739 ./dev-util/colm/colm-0.14.7.ebuild
@@ -16405,7 +16416,7 @@
 2104060140 ./dev-util/ninja/ninja-1.10.0.ebuild
 2104060140 ./dev-util/ninja/ninja-1.10.1.ebuild
 2110111209 ./dev-util/ninja/ninja-9999.ebuild
-2110312110 ./dev-util/ninja/ninja-1.10.2-r1.ebuild
+2111021239 ./dev-util/ninja/ninja-1.10.2-r1.ebuild
 1908180239 ./dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
 2002091639 ./dev-util/numdiff/numdiff-5.9.0.ebuild
 2104130239 ./dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.2.89-r1.ebuild
@@ -16529,8 +16540,8 @@
 2007171109 ./dev-util/serialtalk/serialtalk-1.2-r1.ebuild
 2004060109 ./dev-util/sgb/sgb-20030623-r1.ebuild
 2004060109 ./dev-util/sgb/sgb-20090810.ebuild
-1708261636 ./dev-util/shadowman/shadowman-9999.ebuild
 2109062309 ./dev-util/shadowman/shadowman-2.ebuild
+2111012009 ./dev-util/shadowman/shadowman-3.ebuild
 2108261409 ./dev-util/shards/shards-0.15.0-r1.ebuild
 1812181639 ./dev-util/shc/shc-3.9.6.ebuild
 2007092039 ./dev-util/shellcheck-bin/shellcheck-bin-0.7.1.ebuild
@@ -17524,6 +17535,7 @@
 2104040939 ./games-roguelike/adom/adom-1.1.1-r2.ebuild
 2104101609 ./games-roguelike/adom/adom-3.3.3-r1.ebuild
 2110280209 ./games-roguelike/angband/angband-4.2.2-r2.ebuild
+2111020609 ./games-roguelike/angband/angband-4.2.3-r1.ebuild
 2011302339 ./games-roguelike/crossfire-client/crossfire-client-1.71.0-r100.ebuild
 2108230739 ./games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
 2104052109 ./games-roguelike/hengband/hengband-1.6.2-r1.ebuild
@@ -18790,7 +18802,6 @@
 2109160439 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.5.ebuild
 2110270809 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.2.ebuild
 2109160439 ./kde-plasma/plasma-desktop/plasma-desktop-5.22.5.ebuild
-2110270809 ./kde-plasma/plasma-desktop/plasma-desktop-5.23.2.ebuild
 2110271339 ./kde-plasma/plasma-desktop/plasma-desktop-5.23.2.1.ebuild
 2109160439 ./kde-plasma/plasma-integration/plasma-integration-5.22.5.ebuild
 2110270809 ./kde-plasma/plasma-integration/plasma-integration-5.23.2.ebuild
@@ -19600,8 +19611,8 @@
 2106011639 ./media-gfx/netpaint/netpaint-1.1.2.ebuild
 2111011310 ./media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild
 2109161139 ./media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
-2107172140 ./media-gfx/freecad/freecad-0.19.2-r3.ebuild
-2107172140 ./media-gfx/freecad/freecad-9999.ebuild
+2111021309 ./media-gfx/freecad/freecad-0.19.2-r4.ebuild
+2111021309 ./media-gfx/freecad/freecad-9999.ebuild
 2105121509 ./media-gfx/brscan4/brscan4-0.4.10.1.ebuild
 2107191409 ./media-gfx/libredwg/libredwg-0.12.4.ebuild
 2109081439 ./media-gfx/hydrus/hydrus-9999.ebuild
@@ -19620,7 +19631,6 @@
 2102142339 ./media-libs/allegro/allegro-5.2.6.0.ebuild
 2107200239 ./media-libs/allegro/allegro-4.4.3.1.ebuild
 2107200239 ./media-libs/allegro/allegro-5.2.7.0.ebuild
-2106052339 ./media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
 2109230439 ./media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
 2110030209 ./media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
 2106052339 ./media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -19680,6 +19690,7 @@
 2009071209 ./media-libs/freealut/freealut-1.1.0-r4.ebuild
 2110310339 ./media-libs/freeglut/freeglut-3.2.1-r2.ebuild
 2104180939 ./media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+2111021309 ./media-libs/freeimage/freeimage-3.18.0-r3.ebuild
 2107192139 ./media-libs/freetype/freetype-2.10.4.ebuild
 2107192139 ./media-libs/freetype/freetype-9999.ebuild
 2109070309 ./media-libs/freetype/freetype-2.11.0-r1.ebuild
@@ -20174,10 +20185,8 @@
 2108181239 ./media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
 2108211209 ./media-libs/zvbi/zvbi-0.2.35-r1.ebuild
 2109100309 ./media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
-2106052339 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
 2109230439 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
 2110030209 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild
-2106052339 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
 2109230439 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
 2110030209 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.1.ebuild
 2110161109 ./media-libs/libopenmpt/libopenmpt-0.5.12.ebuild
@@ -20809,7 +20818,6 @@
 1703112346 ./media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild
 2106052339 ./media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
 2109101809 ./media-sound/alsa-tools/alsa-tools-1.2.5.ebuild
-2106052339 ./media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
 2107021539 ./media-sound/alsa-utils/alsa-utils-1.2.5.1.ebuild
 2109230439 ./media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
 1806121839 ./media-sound/alsamixer-app/alsamixer-app-0.1-r1.ebuild
@@ -21378,6 +21386,7 @@
 2104180939 ./media-video/lxdvdrip/lxdvdrip-1.77.ebuild
 1912120139 ./media-video/m2vrequantizer/m2vrequantizer-0.0.2_pre20060306-r1.ebuild
 2107101439 ./media-video/makemkv/makemkv-1.16.4.ebuild
+2111020109 ./media-video/makemkv/makemkv-1.16.5.ebuild
 2106190039 ./media-video/matroxset/matroxset-0.4-r1.ebuild
 2101240609 ./media-video/mediainfo/mediainfo-20.09.ebuild
 2103280339 ./media-video/mediainfo/mediainfo-20.09-r1.ebuild
@@ -21894,9 +21903,6 @@
 2011270309 ./net-analyzer/xprobe/xprobe-0.3-r1.ebuild
 2001281909 ./net-analyzer/yersinia/yersinia-9999.ebuild
 2011271109 ./net-analyzer/yersinia/yersinia-0.8.2.ebuild
-2110021639 ./net-analyzer/zabbix/zabbix-4.0.34.ebuild
-2110021639 ./net-analyzer/zabbix/zabbix-5.0.16.ebuild
-2110021639 ./net-analyzer/zabbix/zabbix-5.4.5.ebuild
 2110032109 ./net-analyzer/zabbix/zabbix-4.0.33.ebuild
 2110032109 ./net-analyzer/zabbix/zabbix-5.0.15.ebuild
 2110032109 ./net-analyzer/zabbix/zabbix-5.4.4.ebuild
@@ -21904,6 +21910,9 @@
 2110221339 ./net-analyzer/zabbix/zabbix-5.0.17.ebuild
 2110221339 ./net-analyzer/zabbix/zabbix-5.4.6.ebuild
 2110292209 ./net-analyzer/zabbix/zabbix-5.4.7.ebuild
+2111021340 ./net-analyzer/zabbix/zabbix-4.0.34.ebuild
+2111021340 ./net-analyzer/zabbix/zabbix-5.0.16.ebuild
+2111021340 ./net-analyzer/zabbix/zabbix-5.4.5.ebuild
 2010021709 ./net-analyzer/zmap/zmap-9999.ebuild
 2110100539 ./net-analyzer/zmap/zmap-2.1.1-r3.ebuild
 2110212239 ./net-analyzer/zniper/zniper-1.0-r3.ebuild
@@ -21935,7 +21944,7 @@
 2106302209 ./net-dialup/freeradius/freeradius-3.0.22-r2.ebuild
 1702282250 ./net-dialup/isdn-firmware/isdn-firmware-2005.8.15.2.ebuild
 2101021809 ./net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild
-2105311239 ./net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+2111020109 ./net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
 2109272011 ./net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
 2107051639 ./net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
 2109230439 ./net-dialup/mingetty/mingetty-1.08-r1.ebuild
@@ -21981,9 +21990,9 @@
 2104120016 ./net-dns/dnrd/dnrd-2.20.3-r3.ebuild
 1910111739 ./net-dns/dnscap/dnscap-1.10.3.ebuild
 2109012010 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild
-2109181539 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
 2109280809 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
 2110302039 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild
+2111021240 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
 2012230109 ./net-dns/dnsdist/dnsdist-1.5.1-r100.ebuild
 2106150709 ./net-dns/dnsdist/dnsdist-1.6.0.ebuild
 2109212039 ./net-dns/dnsdist/dnsdist-1.6.1.ebuild
@@ -22001,7 +22010,7 @@
 2109292009 ./net-dns/dnsviz/dnsviz-0.9.4.ebuild
 2101061809 ./net-dns/dnswalk/dnswalk-2.0.2.ebuild
 2104120016 ./net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild
-2104161439 ./net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild
+2111020109 ./net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild
 2107310511 ./net-dns/getdns/getdns-1.7.0-r1.ebuild
 2107172140 ./net-dns/hash-slinger/hash-slinger-3.1.ebuild
 2011252124 ./net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
@@ -22218,7 +22227,7 @@
 2110250739 ./net-im/qtox/qtox-9999.ebuild
 2007281739 ./net-im/ricochet/ricochet-9999.ebuild
 2107160109 ./net-im/ricochet/ricochet-1.1.4.ebuild
-2012311940 ./net-im/sendxmpp/sendxmpp-1.24.ebuild
+2111020109 ./net-im/sendxmpp/sendxmpp-1.24.ebuild
 2110310610 ./net-im/signal-desktop-bin/signal-desktop-bin-5.22.0.ebuild
 2102261739 ./net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
 2106121639 ./net-im/skypeforlinux/skypeforlinux-8.73.0.92.ebuild
@@ -22243,9 +22252,9 @@
 2107041710 ./net-im/vacuum/vacuum-9999.ebuild
 2107021739 ./net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
 2106210056 ./net-im/ysm/ysm-2.9.9.1-r2.ebuild
-2109242040 ./net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild
 2110102209 ./net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
 2110141709 ./net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
+2111012340 ./net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild
 2003170039 ./net-im/psimedia/psimedia-9999.ebuild
 2110310339 ./net-im/teams/teams-1.4.00.13653-r2.ebuild
 2110310339 ./net-im/teams/teams-1.4.00.26453-r1.ebuild
@@ -22410,7 +22419,7 @@
 2107262139 ./net-libs/kdav2/kdav2-0.3.0.ebuild
 2001162209 ./net-libs/kimap2/kimap2-0.3.0.ebuild
 2106180139 ./net-libs/ldns/ldns-1.7.1-r4.ebuild
-2110310209 ./net-libs/ldns/ldns-1.7.1-r5.ebuild
+2111021240 ./net-libs/ldns/ldns-1.7.1-r5.ebuild
 2110021309 ./net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
 2102252109 ./net-libs/libad9361-iio/libad9361-iio-0.2.ebuild
 2102252109 ./net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -22541,8 +22550,8 @@
 2105021339 ./net-libs/libssh2/libssh2-9999.ebuild
 2106211724 ./net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
 2110152239 ./net-libs/libssh2/libssh2-1.10.0.ebuild
-2104031909 ./net-libs/libtelnet/libtelnet-0.23.ebuild
-2104031909 ./net-libs/libtelnet/libtelnet-9999.ebuild
+2111021440 ./net-libs/libtelnet/libtelnet-0.23-r1.ebuild
+2111021440 ./net-libs/libtelnet/libtelnet-9999.ebuild
 2106131409 ./net-libs/libtirpc/libtirpc-1.3.2.ebuild
 2106182240 ./net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild
 2106182240 ./net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild
@@ -23326,9 +23335,8 @@
 2109130939 ./net-misc/you-get/you-get-0.4.1545.ebuild
 2106251309 ./net-misc/youtube-dl/youtube-dl-9999.ebuild
 2107171110 ./net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
-2105012139 ./net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild
-2108080009 ./net-misc/youtube-viewer/youtube-viewer-3.9.3.ebuild
 2108080009 ./net-misc/youtube-viewer/youtube-viewer-9999.ebuild
+2111012009 ./net-misc/youtube-viewer/youtube-viewer-3.9.6.ebuild
 2104122209 ./net-misc/zerotier/zerotier-1.6.3.ebuild
 2104122209 ./net-misc/zerotier/zerotier-1.6.4.ebuild
 2110271609 ./net-misc/zssh/zssh-1.5c-r1.ebuild
@@ -23372,7 +23380,7 @@
 2111011740 ./net-misc/xmrig/xmrig-6.15.3.ebuild
 2107221239 ./net-misc/websocketd/websocketd-0.4.1.ebuild
 2110290239 ./net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild
-2110310239 ./net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild
+2111011909 ./net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild
 2108260210 ./net-misc/s4cmd/s4cmd-2.1.0.ebuild
 2008291539 ./net-nds/adtool/adtool-1.3.3-r1.ebuild
 2105111309 ./net-nds/gssproxy/gssproxy-0.8.4.ebuild
@@ -23538,7 +23546,7 @@
 2110281309 ./net-print/cups/cups-2.3.3_p2-r3.ebuild
 2104161439 ./net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
 2101150309 ./net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.8.ebuild
-1702282250 ./net-print/fax4cups/fax4cups-1.29-r1.ebuild
+2111020109 ./net-print/fax4cups/fax4cups-1.29-r1.ebuild
 2104161439 ./net-print/foo2zjs/foo2zjs-20200221.ebuild
 2104161439 ./net-print/foo2zjs/foo2zjs-99999999.ebuild
 2104161439 ./net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
@@ -23555,7 +23563,7 @@
 2108192109 ./net-print/hplip/hplip-3.21.6.ebuild
 2109302009 ./net-print/hplip/hplip-3.21.8.ebuild
 1702282250 ./net-print/ink/ink-0.5.1.ebuild
-1702282250 ./net-print/ink/ink-0.5.2.ebuild
+2111020109 ./net-print/ink/ink-0.5.3.ebuild
 1801132309 ./net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
 1912111540 ./net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild
 2110310839 ./net-print/libinklevel/libinklevel-0.9.2.ebuild
@@ -23635,7 +23643,7 @@
 2012111109 ./net-vpn/i2p/i2p-0.9.48.ebuild
 2107160439 ./net-vpn/i2p/i2p-0.9.50.ebuild
 2109211009 ./net-vpn/i2pd/i2pd-2.39.0.ebuild
-2104161439 ./net-vpn/iodine/iodine-0.7.0-r2.ebuild
+2111020109 ./net-vpn/iodine/iodine-0.7.0-r3.ebuild
 1902241409 ./net-vpn/isatapd/isatapd-0.9.7-r2.ebuild
 2108010139 ./net-vpn/libreswan/libreswan-3.32-r4.ebuild
 2108010139 ./net-vpn/libreswan/libreswan-4.3-r2.ebuild
@@ -24531,8 +24539,8 @@
 2104230009 ./sci-geosciences/gmaptool/gmaptool-08220.ebuild
 2108291539 ./sci-geosciences/folium/folium-0.12.1.ebuild
 2108012009 ./sci-geosciences/geopy/geopy-2.2.0.ebuild
-2109040939 ./sci-geosciences/josm-bin/josm-bin-18191.ebuild
 2109101040 ./sci-geosciences/josm-bin/josm-bin-18193.ebuild
+2111021309 ./sci-geosciences/josm-bin/josm-bin-18303.ebuild
 2110181810 ./sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
 2106182240 ./sci-libs/ViSP/ViSP-3.3.0-r1.ebuild
 2108200539 ./sci-libs/adolc/adolc-9999.ebuild
@@ -26103,6 +26111,7 @@
 2109011039 ./sys-apps/iproute2/iproute2-5.14.0.ebuild
 2109011039 ./sys-apps/iproute2/iproute2-9999.ebuild
 2109062309 ./sys-apps/iproute2/iproute2-5.13.0-r1.ebuild
+2111021240 ./sys-apps/iproute2/iproute2-5.15.0.ebuild
 2107180040 ./sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild
 2010300209 ./sys-apps/isapnptools/isapnptools-1.27.ebuild
 2006291439 ./sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
@@ -26279,6 +26288,7 @@
 2110281109 ./sys-apps/sandbox/sandbox-2.26.ebuild
 2110281109 ./sys-apps/sandbox/sandbox-2.27.ebuild
 2110281109 ./sys-apps/sandbox/sandbox-2.28.ebuild
+2111020739 ./sys-apps/sandbox/sandbox-2.29.ebuild
 2109230439 ./sys-apps/sdparm/sdparm-1.12.ebuild
 2107050640 ./sys-apps/secilc/secilc-3.1.ebuild
 2107050640 ./sys-apps/secilc/secilc-9999.ebuild
@@ -26568,7 +26578,7 @@
 2110181210 ./sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild
 2110181210 ./sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild
 2101020009 ./sys-block/tgt/tgt-1.0.79.ebuild
-2110270939 ./sys-block/tgt/tgt-1.0.80.ebuild
+2111021240 ./sys-block/tgt/tgt-1.0.80.ebuild
 2106101309 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
 2106101309 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
 2107091010 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
@@ -27155,7 +27165,7 @@
 2107101939 ./sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
 2107280939 ./sys-fs/e2fsprogs/e2fsprogs-1.46.3.ebuild
 2110022039 ./sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
-2110310440 ./sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
+2111012110 ./sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
 2109132339 ./sys-fs/e2tools/e2tools-0.1.0-r1.ebuild
 2008170539 ./sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild
 2105022109 ./sys-fs/encfs/encfs-1.9.5-r1.ebuild
@@ -27386,13 +27396,13 @@
 2110292239 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.287.ebuild
 2110292239 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.74.ebuild
 2110292239 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.154.ebuild
-2111010809 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.253.ebuild
-2111010809 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.214.ebuild
-2111010809 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.290.ebuild
-2111010809 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.288.ebuild
-2111010809 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.76-r1.ebuild
 2111011509 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.0.ebuild
-2111010809 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.156.ebuild
+2111021340 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.253.ebuild
+2111021340 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.214.ebuild
+2111021340 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.290.ebuild
+2111021340 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.288.ebuild
+2111021340 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.76-r1.ebuild
+2111021340 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.156.ebuild
 2109131009 ./sys-kernel/git-sources/git-sources-5.15_rc1.ebuild
 2109201339 ./sys-kernel/git-sources/git-sources-5.15_rc2.ebuild
 2109270209 ./sys-kernel/git-sources/git-sources-5.15_rc3.ebuild
@@ -28015,6 +28025,7 @@
 2109070339 ./virtual/rust/rust-1.53.0-r1.ebuild
 2109131839 ./virtual/rust/rust-1.55.0.ebuild
 2110220009 ./virtual/rust/rust-1.56.0.ebuild
+2111020039 ./virtual/rust/rust-1.56.1.ebuild
 2105161839 ./virtual/service-manager/service-manager-1.ebuild
 2110111609 ./virtual/skkserv/skkserv-0-r1.ebuild
 2104060140 ./virtual/ssh/ssh-0.ebuild
@@ -28290,9 +28301,9 @@
 2110212109 ./www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1047.2.ebuild
 2110270009 ./www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1054.2.ebuild
 2110301139 ./www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1054.5.ebuild
-2110212109 ./www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.30.ebuild
 2110290009 ./www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.38.ebuild
 2110301139 ./www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.40.ebuild
+2111020039 ./www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.8.ebuild
 2110301139 ./www-client/microsoft-edge/microsoft-edge-95.0.1020.40.ebuild
 2104161439 ./www-misc/awstats/awstats-7.8-r1.ebuild
 2002230040 ./www-misc/bookmarksync/bookmarksync-0.3.4-r3.ebuild
@@ -28492,8 +28503,8 @@
 2108280513 ./x11-base/xorg-proto/xorg-proto-2021.4.99.2.ebuild
 2110291039 ./x11-base/xorg-proto/xorg-proto-2021.5.ebuild
 2110291039 ./x11-base/xorg-proto/xorg-proto-9999.ebuild
-2109102340 ./x11-base/xorg-server/xorg-server-9999.ebuild
 2109232339 ./x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild
+2111012240 ./x11-base/xorg-server/xorg-server-9999.ebuild
 2110220439 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
 2108200339 ./x11-base/xwayland/xwayland-21.1.2-r2.ebuild
 2110220739 ./x11-base/xwayland/xwayland-21.1.2.901.ebuild
@@ -28502,7 +28513,7 @@
 2111010910 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild
 2111010910 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
 2111010910 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.82.00.ebuild
-2111010910 ./x11-drivers/nvidia-drivers/nvidia-drivers-495.44.ebuild
+2111012110 ./x11-drivers/nvidia-drivers/nvidia-drivers-495.44.ebuild
 2101101939 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
 2107210909 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
 2103200209 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -28681,9 +28692,9 @@
 2108051709 ./x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
 2104060140 ./x11-libs/pango/pango-1.42.4-r2.ebuild
 2108190609 ./x11-libs/pango/pango-1.48.9.ebuild
-2108221840 ./x11-libs/pango/pango-1.48.7-r1.ebuild
 2109130009 ./x11-libs/pango/pango-1.48.5-r1.ebuild
-2110042109 ./x11-libs/pango/pango-1.48.10.ebuild
+2111020010 ./x11-libs/pango/pango-1.48.10-r1.ebuild
+2111020010 ./x11-libs/pango/pango-1.48.7-r2.ebuild
 2106040440 ./x11-libs/pixman/pixman-9999.ebuild
 2109191609 ./x11-libs/pixman/pixman-0.40.0.ebuild
 2108031409 ./x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -29609,7 +29620,7 @@
 2105251739 ./xfce-base/garcon/garcon-0.8.0.ebuild
 2109111940 ./xfce-base/libxfce4ui/libxfce4ui-4.16.0.ebuild
 2109111940 ./xfce-base/libxfce4ui/libxfce4ui-4.17.1.ebuild
-2110292139 ./xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
+2111021340 ./xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
 2105211809 ./xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild
 2107190910 ./xfce-base/libxfce4util/libxfce4util-4.17.1.ebuild
 2105130739 ./xfce-base/thunar/thunar-4.16.8.ebuild
@@ -30897,7 +30908,6 @@
 2110291939 metadata/md5-cache/app-admin/syslog-ng-3.33.2
 2110301009 metadata/md5-cache/app-admin/awscli-1.21.7
 2110310639 metadata/md5-cache/app-admin/lnav-0.10.1
-2111010209 metadata/md5-cache/app-admin/Manifest.gz
 2110312244 metadata/md5-cache/app-admin/abrt-2.14.6
 2110312244 metadata/md5-cache/app-admin/ansible-cmdb-1.28
 2110312244 metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.28.2
@@ -30922,6 +30932,8 @@
 2110312244 metadata/md5-cache/app-admin/system-config-printer-1.5.15
 2110312244 metadata/md5-cache/app-admin/systemdgenie-0.99.0
 2110312244 metadata/md5-cache/app-admin/testdisk-7.1-r1
+2111020139 metadata/md5-cache/app-admin/Manifest.gz
+2111020139 metadata/md5-cache/app-admin/awscli-1.21.8
 2109272010 metadata/md5-cache/app-antivirus/fangfrisch-1.4.0
 2110040409 metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
 2110200640 metadata/md5-cache/app-antivirus/fangfrisch-1.5.0
@@ -31171,10 +31183,8 @@
 2110012311 metadata/md5-cache/app-benchmarks/siege-4.0.9
 2110012311 metadata/md5-cache/app-benchmarks/siege-4.1.0
 2110012311 metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
-2110021539 metadata/md5-cache/app-benchmarks/stress-1.0.5
 2110182240 metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1
 2110262139 metadata/md5-cache/app-benchmarks/hyperfine-1.12.0
-2110300109 metadata/md5-cache/app-benchmarks/Manifest.gz
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-2.4.2-r1
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-2.4.3-r1
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-3.4.2-r1
@@ -31182,6 +31192,8 @@
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-5.4.1-r1
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-5.4.2
 2110300109 metadata/md5-cache/app-benchmarks/stress-ng-0.13.06
+2111021340 metadata/md5-cache/app-benchmarks/Manifest.gz
+2111021340 metadata/md5-cache/app-benchmarks/stress-1.0.5
 1910111840 metadata/md5-cache/app-cdr/ccd2iso-0.3
 1805212239 metadata/md5-cache/app-cdr/cdlabelgen-4.3.0
 1712122339 metadata/md5-cache/app-cdr/disc-cover-1.5.6-r1
@@ -33660,8 +33672,6 @@
 2110290511 metadata/md5-cache/app-misc/wcd-6.0.3-r1
 2110291439 metadata/md5-cache/app-misc/mosquitto-2.0.12
 2110302039 metadata/md5-cache/app-misc/binwalk-2.3.3
-2110311509 metadata/md5-cache/app-misc/broot-1.7.0
-2110312244 metadata/md5-cache/app-misc/Manifest.gz
 2110312244 metadata/md5-cache/app-misc/anki-2.1.15-r1
 2110312244 metadata/md5-cache/app-misc/bijiben-40.1
 2110312244 metadata/md5-cache/app-misc/brewtarget-2.3.1-r1
@@ -33718,6 +33728,8 @@
 2110312244 metadata/md5-cache/app-misc/vifm-0.11
 2110312244 metadata/md5-cache/app-misc/vifm-9999
 2110312244 metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
+2111021239 metadata/md5-cache/app-misc/Manifest.gz
+2111021239 metadata/md5-cache/app-misc/broot-1.7.0
 1710020739 metadata/md5-cache/app-mobilephone/dfu-util-0.9
 1805222109 metadata/md5-cache/app-mobilephone/scmxx-0.9.0
 2109040224 metadata/md5-cache/app-mobilephone/qtadb-0.8.1-r1
@@ -36978,7 +36990,6 @@
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
 1810090339 metadata/md5-cache/dev-lang/execline-2.5.0.1
 1906221109 metadata/md5-cache/dev-lang/execline-2.5.1.0
-1702282312 metadata/md5-cache/dev-lang/inform-6.33.1_p2
 1702282312 metadata/md5-cache/dev-lang/nwcc-0.8.3
 1911290109 metadata/md5-cache/dev-lang/execline-2.5.3.0
 2010112109 metadata/md5-cache/dev-lang/execline-2.6.1.1
@@ -37180,7 +37191,6 @@
 2110300939 metadata/md5-cache/dev-lang/python-3.8.12_p1
 2110300939 metadata/md5-cache/dev-lang/python-3.9.7_p1
 2110300939 metadata/md5-cache/dev-lang/starlark-rust-0.5.0
-2110312244 metadata/md5-cache/dev-lang/Manifest.gz
 2110312244 metadata/md5-cache/dev-lang/gdl-1.0.0_rc3
 2110312244 metadata/md5-cache/dev-lang/ispc-1.16.0
 2110312244 metadata/md5-cache/dev-lang/ispc-1.16.1
@@ -37213,6 +37223,11 @@
 2110312244 metadata/md5-cache/dev-lang/zig-0.8.0
 2110312244 metadata/md5-cache/dev-lang/zig-0.8.1
 2110312244 metadata/md5-cache/dev-lang/zig-9999
+2111021140 metadata/md5-cache/dev-lang/Manifest.gz
+2111021140 metadata/md5-cache/dev-lang/inform-6.33.1_p2
+2111021140 metadata/md5-cache/dev-lang/inform-6.35_p4
+2111020039 metadata/md5-cache/dev-lang/rust-1.56.1
+2111020039 metadata/md5-cache/dev-lang/rust-bin-1.56.1
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1908180639 metadata/md5-cache/dev-libs/darts-0.32
 1702282313 metadata/md5-cache/dev-libs/libb64-1.2.1
@@ -37600,7 +37615,6 @@
 2110012311 metadata/md5-cache/dev-libs/libmaxminddb-9999
 2110012311 metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
 2110012311 metadata/md5-cache/dev-libs/libmix-2.05-r7
-2110012311 metadata/md5-cache/dev-libs/libmowgli-2.1.3-r2
 2110012311 metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
 2110012311 metadata/md5-cache/dev-libs/libmspack-9999
 2110012311 metadata/md5-cache/dev-libs/libnatspec-0.3.0
@@ -37615,7 +37629,6 @@
 2110012311 metadata/md5-cache/dev-libs/librep-0.92.7-r1
 2110012311 metadata/md5-cache/dev-libs/libreport-2.15.2
 2110012311 metadata/md5-cache/dev-libs/librevenge-9999
-2110012311 metadata/md5-cache/dev-libs/libsass-3.6.5
 2110012311 metadata/md5-cache/dev-libs/libsass-9999
 2110012311 metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20190401
 2110012311 metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20201028
@@ -37835,7 +37848,6 @@
 2110292239 metadata/md5-cache/dev-libs/libpcre2-10.39
 2110310209 metadata/md5-cache/dev-libs/mpfr-4.1.0_p13-r1
 2110311309 metadata/md5-cache/dev-libs/hiredis-1.0.2-r1
-2111010440 metadata/md5-cache/dev-libs/Manifest.gz
 2110312244 metadata/md5-cache/dev-libs/appstream-0.14.5
 2110312244 metadata/md5-cache/dev-libs/appstream-glib-0.7.18-r1
 2110312244 metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -37939,15 +37951,12 @@
 2110312244 metadata/md5-cache/dev-libs/leveldb-1.23-r1
 2110312244 metadata/md5-cache/dev-libs/libIDL-0.8.14-r2
 2110312244 metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
-2110312244 metadata/md5-cache/dev-libs/libarcus-4.9.1
 2110312244 metadata/md5-cache/dev-libs/libbson-1.16.2
 2110312244 metadata/md5-cache/dev-libs/libbson-1.17.0
 2110312244 metadata/md5-cache/dev-libs/libbson-1.18.0
 2110312244 metadata/md5-cache/dev-libs/libcbor-0.8.0
 2110312244 metadata/md5-cache/dev-libs/libcec-4.0.4-r1
 2110312244 metadata/md5-cache/dev-libs/libcec-4.0.7
-2110312244 metadata/md5-cache/dev-libs/libcec-6.0.2
-2110312244 metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
 2110312244 metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
 2110312244 metadata/md5-cache/dev-libs/libclc-13.0.0_rc1
 2110312244 metadata/md5-cache/dev-libs/libcroco-0.6.13-r1
@@ -37988,7 +37997,6 @@
 2110312244 metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r1
 2110312244 metadata/md5-cache/dev-libs/libplatform-9999
 2110312244 metadata/md5-cache/dev-libs/libqtxdg-3.7.1
-2110312244 metadata/md5-cache/dev-libs/libsavitar-4.9.1
 2110312244 metadata/md5-cache/dev-libs/libtimezonemap-0.4.6-r1
 2110312244 metadata/md5-cache/dev-libs/libtsm-4.0.1
 2110312244 metadata/md5-cache/dev-libs/libunique-1.1.6-r2
@@ -38127,6 +38135,12 @@
 2110312244 metadata/md5-cache/dev-libs/xerces-c-9999
 2110312244 metadata/md5-cache/dev-libs/yajl-2.1.0-r3
 2110312244 metadata/md5-cache/dev-libs/zziplib-0.13.72
+2111021410 metadata/md5-cache/dev-libs/Manifest.gz
+2111021209 metadata/md5-cache/dev-libs/libarcus-4.9.1
+2111021209 metadata/md5-cache/dev-libs/libcec-6.0.2
+2111021209 metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
+2111011909 metadata/md5-cache/dev-libs/libsass-3.6.5
+2111021209 metadata/md5-cache/dev-libs/libsavitar-4.9.1
 2106291109 metadata/md5-cache/dev-lisp/asdf-3.1.5
 2108190940 metadata/md5-cache/dev-lisp/hyperspec-7.0-r3
 2109040224 metadata/md5-cache/dev-lisp/alexandria-20171029
@@ -38495,21 +38509,21 @@
 2110171809 metadata/md5-cache/dev-ml/merlin-4.3.1
 2110170109 metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3
 2110190309 metadata/md5-cache/dev-ml/csexp-1.5.1
-2110201010 metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
-2110201010 metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
 2110251709 metadata/md5-cache/dev-ml/bos-0.2.0-r1
 2110290909 metadata/md5-cache/dev-ml/dose3-6.1-r1
 2110290909 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0
-2110291539 metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
 2110290909 metadata/md5-cache/dev-ml/uutf-1.0.2
 2110292239 metadata/md5-cache/dev-ml/lwt-5.3.0-r1
-2110312244 metadata/md5-cache/dev-ml/Manifest.gz
 2110312244 metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
 2110312244 metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0
 2110312244 metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1
 2110312244 metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0
 2110312244 metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0.9999
 2110312244 metadata/md5-cache/dev-ml/llvm-ocaml-14.0.0.9999
+2111021340 metadata/md5-cache/dev-ml/Manifest.gz
+2111021340 metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
+2111021340 metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
+2111021240 metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
 2109022141 metadata/md5-cache/dev-perl/Acme-Damn-0.80.0-r2
 2109022141 metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r2
 2109022141 metadata/md5-cache/dev-perl/Algorithm-C3-0.110.0
@@ -38970,31 +38984,20 @@
 2109022141 metadata/md5-cache/dev-perl/HTML-Packer-2.100.0
 2109022141 metadata/md5-cache/dev-perl/HTML-Parser-3.760.0
 2109022141 metadata/md5-cache/dev-perl/HTML-Scrubber-0.190.0
-2109022141 metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0
-2109022141 metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0
 2109022141 metadata/md5-cache/dev-perl/HTML-TableContentParser-0.304.0
-2109022141 metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0
-2109022141 metadata/md5-cache/dev-perl/HTML-TableParser-0.420.0
 2109022141 metadata/md5-cache/dev-perl/HTML-TableParser-0.430.0
 2109022141 metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0-r1
 2109022141 metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r2
-2109022141 metadata/md5-cache/dev-perl/HTML-Template-2.970.0
 2109022141 metadata/md5-cache/dev-perl/HTML-Template-JIT-0.50.0-r3
 2109022141 metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0-r1
 2109022141 metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r2
-2109022141 metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
 2109022141 metadata/md5-cache/dev-perl/HTTP-Body-1.220.0-r1
-2109022141 metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0
 2109022141 metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.310.0
 2109022141 metadata/md5-cache/dev-perl/HTTP-CookieJar-0.10.0
-2109022141 metadata/md5-cache/dev-perl/HTTP-CookieJar-0.8.0
 2109022141 metadata/md5-cache/dev-perl/HTTP-Cookies-6.100.0
-2109022141 metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0
 2109022141 metadata/md5-cache/dev-perl/HTTP-DAV-0.490.0
 2109022141 metadata/md5-cache/dev-perl/HTTP-Daemon-6.120.0
-2109022141 metadata/md5-cache/dev-perl/HTTP-Daemon-6.60.0
 2109022141 metadata/md5-cache/dev-perl/HTTP-Date-6.50.0
-2109022141 metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0
 2109022141 metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.250.0-r1
 2109022141 metadata/md5-cache/dev-perl/HTTP-Exception-0.40.70
 2109022141 metadata/md5-cache/dev-perl/HTTP-Headers-Fast-0.220.0
@@ -39881,11 +39884,6 @@
 2109040224 metadata/md5-cache/dev-perl/ExtUtils-F77-1.260.0
 2109040224 metadata/md5-cache/dev-perl/File-RsyncP-0.760.0
 2109040224 metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
-2109040224 metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
-2109040224 metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
-2109040224 metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
-2109040224 metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
-2109040224 metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
 2109040224 metadata/md5-cache/dev-perl/IO-Stty-0.30.0
 2109040224 metadata/md5-cache/dev-perl/IO-Tty-1.120.0
 2109040224 metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
@@ -40057,7 +40055,6 @@
 2109261439 metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r2
 2109261439 metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0-r1
 2109261439 metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0-r1
-2109270139 metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.4
 2109272209 metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r2
 2109272209 metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0-r1
 2109272209 metadata/md5-cache/dev-perl/TheSchwartz-1.160.0
@@ -40153,7 +40150,6 @@
 2110030139 metadata/md5-cache/dev-perl/WeakRef-0.10.0-r2
 2110030139 metadata/md5-cache/dev-perl/Weather-Com-2.0.0-r2
 2110030139 metadata/md5-cache/dev-perl/WebService-Linode-0.290.0
-2110030139 metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.5
 2110030139 metadata/md5-cache/dev-perl/WordNet-QueryData-1.490.0-r3
 2110031539 metadata/md5-cache/dev-perl/Wx-GLCanvas-0.90.0-r1
 2110031539 metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r2
@@ -40282,7 +40278,6 @@
 2110102109 metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0-r1
 2110102109 metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r3
 2110110309 metadata/md5-cache/dev-perl/Convert-UU-0.520.100
-2110111809 metadata/md5-cache/dev-perl/Gtk3-ImageView-10.0.0
 2110110009 metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0
 2110110309 metadata/md5-cache/dev-perl/PDL-2.54.0
 2110110639 metadata/md5-cache/dev-perl/PDL-Transform-Color-1.5.0
@@ -40307,8 +40302,6 @@
 2110110739 metadata/md5-cache/dev-perl/Scope-Upper-0.320.0
 2110110939 metadata/md5-cache/dev-perl/Sereal-Encoder-4.18.0
 2110111839 metadata/md5-cache/dev-perl/Socket6-0.290.0
-2110110639 metadata/md5-cache/dev-perl/Specio-0.470.0
-2110110639 metadata/md5-cache/dev-perl/XString-0.5.0
 2110120039 metadata/md5-cache/dev-perl/Class-ISA-0.360.0-r1
 2110120039 metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0-r1
 2110120039 metadata/md5-cache/dev-perl/Class-Std-0.13.0-r1
@@ -40384,7 +40377,6 @@
 2110160409 metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0-r1
 2110160409 metadata/md5-cache/dev-perl/Email-Find-0.100.0-r2
 2110161809 metadata/md5-cache/dev-perl/File-Next-1.180.0-r1
-2110160409 metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
 2110160409 metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
 2110160409 metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
 2110160409 metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
@@ -40437,7 +40429,6 @@
 2110190909 metadata/md5-cache/dev-perl/Server-Starter-0.350.0
 2110190309 metadata/md5-cache/dev-perl/Test-Base-0.890.0
 2110200339 metadata/md5-cache/dev-perl/Type-Tiny-1.12.3
-2110200339 metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0-r2
 2110201239 metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0-r1
 2110201239 metadata/md5-cache/dev-perl/SQL-Abstract-2.0.1
 2110210209 metadata/md5-cache/dev-perl/DBD-SQLite-1.700.0
@@ -40635,12 +40626,28 @@
 2110311609 metadata/md5-cache/dev-perl/Hash-NoRef-0.30.0-r3
 2110312309 metadata/md5-cache/dev-perl/Heap-0.800.0-r3
 2110312309 metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0-r1
-2111011439 metadata/md5-cache/dev-perl/Manifest.gz
-2111010539 metadata/md5-cache/dev-perl/Params-Validate-1.300.0
 2111011310 metadata/md5-cache/dev-perl/SDL-2.548.0
 2110312110 metadata/md5-cache/dev-perl/Statistics-ChiSquare-1.0.0
 2110311609 metadata/md5-cache/dev-perl/gtk2-trayicon-0.70.0
 2110311609 metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r3
+2111021340 metadata/md5-cache/dev-perl/Gtk3-ImageView-10.0.0
+2111012109 metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0-r1
+2111012109 metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0-r1
+2111012109 metadata/md5-cache/dev-perl/HTML-Table-2.08a-r2
+2111012109 metadata/md5-cache/dev-perl/HTML-TableContentParser-0.305.0
+2111012109 metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0-r1
+2111012109 metadata/md5-cache/dev-perl/HTML-Template-2.970.0-r1
+2111012109 metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r2
+2111012109 metadata/md5-cache/dev-perl/HTML-Tree-5.70.0-r1
+2111020511 metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.350.0
+2111020511 metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0-r1
+2111020511 metadata/md5-cache/dev-perl/HTTP-CookieJar-0.12.0
+2111021509 metadata/md5-cache/dev-perl/Manifest.gz
+2111021340 metadata/md5-cache/dev-perl/Params-Validate-1.300.0
+2111011909 metadata/md5-cache/dev-perl/Specio-0.470.0
+2111021240 metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0-r2
+2111021340 metadata/md5-cache/dev-perl/WebService-MusicBrainz-1.0.5
+2111011909 metadata/md5-cache/dev-perl/XString-0.5.0
 1903202339 metadata/md5-cache/dev-php/PEAR-HTTP_Header-1.2.1-r2
 1702282315 metadata/md5-cache/dev-php/cli-prompt-1.0.0
 1812180409 metadata/md5-cache/dev-php/cli-prompt-1.0.3
@@ -41163,7 +41170,6 @@
 2109272010 metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0
 2109272010 metadata/md5-cache/dev-python/babelfish-0.6.0-r1
 2109272010 metadata/md5-cache/dev-python/babelfish-9999
-2109272010 metadata/md5-cache/dev-python/backcall-0.2.0
 2109272010 metadata/md5-cache/dev-python/backoff-1.11.0
 2109272010 metadata/md5-cache/dev-python/backports-tempfile-1.0-r1
 2109272010 metadata/md5-cache/dev-python/backports-weakref-1.0_p1-r1
@@ -41667,7 +41673,6 @@
 2109272010 metadata/md5-cache/dev-python/olefile-0.46-r1
 2109272010 metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
 2109272010 metadata/md5-cache/dev-python/openstackdocstheme-2.2.5
-2109272010 metadata/md5-cache/dev-python/opt-einsum-3.3.0
 2109272010 metadata/md5-cache/dev-python/ordered-set-4.0.2
 2109272010 metadata/md5-cache/dev-python/os-client-config-2.1.0
 2109272010 metadata/md5-cache/dev-python/os-service-types-1.7.0-r1
@@ -41711,7 +41716,6 @@
 2109272010 metadata/md5-cache/dev-python/pendulum-2.1.2-r1
 2109272010 metadata/md5-cache/dev-python/pgspecial-1.13.0
 2109272010 metadata/md5-cache/dev-python/phply-1.2.5
-2109272010 metadata/md5-cache/dev-python/pickleshare-0.7.5
 2109272010 metadata/md5-cache/dev-python/pid-3.0.4
 2109272010 metadata/md5-cache/dev-python/piexif-1.1.3-r1
 2109272010 metadata/md5-cache/dev-python/pika-1.1.0
@@ -41911,7 +41915,6 @@
 2109272010 metadata/md5-cache/dev-python/pytest-html-3.1.1
 2109272010 metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
 2109272010 metadata/md5-cache/dev-python/pytest-httpx-0.13.0
-2109272010 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
 2109272010 metadata/md5-cache/dev-python/pytest-localftpserver-1.1.2
 2109272010 metadata/md5-cache/dev-python/pytest-localserver-0.5.0
 2109272010 metadata/md5-cache/dev-python/pytest-metadata-1.11.0
@@ -42337,7 +42340,6 @@
 2109280939 metadata/md5-cache/dev-python/pygit2-1.6.1-r2
 2109291039 metadata/md5-cache/dev-python/confuse-1.6.0
 2109291039 metadata/md5-cache/dev-python/mediafile-0.8.1
-2109291009 metadata/md5-cache/dev-python/miniupnpc-2.2.3
 2109290039 metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2
 2109290039 metadata/md5-cache/dev-python/testpath-0.5.0
 2110010109 metadata/md5-cache/dev-python/django-sortedm2m-3.1.1
@@ -42633,7 +42635,6 @@
 2110170939 metadata/md5-cache/dev-python/anyio-3.2.1
 2110180039 metadata/md5-cache/dev-python/astroid-2.8.3
 2110162239 metadata/md5-cache/dev-python/asyncstdlib-3.10.2
-2110172240 metadata/md5-cache/dev-python/autopage-0.4.0
 2110172240 metadata/md5-cache/dev-python/beagle-0.3.0
 2110170109 metadata/md5-cache/dev-python/boto3-1.18.53
 2110170109 metadata/md5-cache/dev-python/botocore-1.21.53
@@ -42641,7 +42642,6 @@
 2110172240 metadata/md5-cache/dev-python/cachelib-0.3.0
 2110170339 metadata/md5-cache/dev-python/cachelib-0.4.1
 2110170109 metadata/md5-cache/dev-python/charset_normalizer-2.0.6
-2110172240 metadata/md5-cache/dev-python/cliff-3.9.0
 2110181210 metadata/md5-cache/dev-python/configshell-fb-1.1.28
 2110181210 metadata/md5-cache/dev-python/configshell-fb-1.1.29
 2110172240 metadata/md5-cache/dev-python/django-3.2.8
@@ -42736,7 +42736,6 @@
 2110221339 metadata/md5-cache/dev-python/oslo-log-4.6.1
 2110221339 metadata/md5-cache/dev-python/oslo-utils-4.11.0
 2110211539 metadata/md5-cache/dev-python/paho-mqtt-1.6.0
-2110221339 metadata/md5-cache/dev-python/prompt_toolkit-3.0.21
 2110211709 metadata/md5-cache/dev-python/prov-2.0.0
 2110220239 metadata/md5-cache/dev-python/pytest-env-0.6.2
 2110220609 metadata/md5-cache/dev-python/qscintilla-python-2.13.1
@@ -42878,7 +42877,6 @@
 2110261439 metadata/md5-cache/dev-python/jsonschema-4.1.0
 2110261439 metadata/md5-cache/dev-python/jsonschema-4.1.1
 2110261439 metadata/md5-cache/dev-python/jsonschema-4.1.2
-2110270739 metadata/md5-cache/dev-python/rdflib-6.0.2
 2110270109 metadata/md5-cache/dev-python/sqlitedict-1.7.0
 2110261409 metadata/md5-cache/dev-python/sympy-1.8
 2110270739 metadata/md5-cache/dev-python/ujson-4.2.0
@@ -42887,7 +42885,6 @@
 2110271139 metadata/md5-cache/dev-python/docutils-0.18
 2110271139 metadata/md5-cache/dev-python/google-auth-2.3.2
 2110271039 metadata/md5-cache/dev-python/jellyfish-0.8.9
-2110270939 metadata/md5-cache/dev-python/numpy-1.21.2-r1
 2110271139 metadata/md5-cache/dev-python/pytest-flakes-4.0.4
 2110271139 metadata/md5-cache/dev-python/python-engineio-4.3.0
 2110271139 metadata/md5-cache/dev-python/responses-0.15.0
@@ -42950,13 +42947,11 @@
 2110311040 metadata/md5-cache/dev-python/pydyf-0.1.2
 2110311040 metadata/md5-cache/dev-python/pyparsing-3.0.4
 2110311040 metadata/md5-cache/dev-python/zeroconf-0.36.11
-2111011509 metadata/md5-cache/dev-python/Manifest.gz
 2111011140 metadata/md5-cache/dev-python/aiohttp-3.7.4-r2
 2111011509 metadata/md5-cache/dev-python/aiohttp-3.8.0
 2111011509 metadata/md5-cache/dev-python/aiosignal-1.2.0
 2111011140 metadata/md5-cache/dev-python/async_timeout-4.0.0_alpha3
 2110312110 metadata/md5-cache/dev-python/aws-sam-translator-1.39.0
-2110312110 metadata/md5-cache/dev-python/berkeleydb-18.1.4
 2111011140 metadata/md5-cache/dev-python/black-21.10_beta0
 2110312110 metadata/md5-cache/dev-python/cachetools-4.2.4
 2110312244 metadata/md5-cache/dev-python/carbon-1.1.7
@@ -43024,7 +43019,6 @@
 2110312244 metadata/md5-cache/dev-python/pygobject-3.42.0
 2110312244 metadata/md5-cache/dev-python/pyilmbase-2.5.7
 2110312110 metadata/md5-cache/dev-python/pymdown-extensions-9.0
-2110312244 metadata/md5-cache/dev-python/pynest2d-4.9.1
 2110312244 metadata/md5-cache/dev-python/pypax-0.9.5
 2110312244 metadata/md5-cache/dev-python/pypax-9999
 2110312244 metadata/md5-cache/dev-python/pyside2-5.15.2-r1
@@ -43048,18 +43042,43 @@
 2110312244 metadata/md5-cache/dev-python/spyder-4.2.5-r2
 2110312244 metadata/md5-cache/dev-python/spyder-5.0.5-r1
 2110312244 metadata/md5-cache/dev-python/spyder-5.1.5-r1
-2110312140 metadata/md5-cache/dev-python/sqlalchemy-1.4.26
 2110312140 metadata/md5-cache/dev-python/subunit-1.4.0_p20210729
 2110312110 metadata/md5-cache/dev-python/tempest-29.0.0-r1
 2110312110 metadata/md5-cache/dev-python/testfixtures-6.18.3
 2110312244 metadata/md5-cache/dev-python/textx-1.4
 2110312244 metadata/md5-cache/dev-python/thrift-0.14.1
 2110312110 metadata/md5-cache/dev-python/typing-extensions-3.10.0.2
-2110312244 metadata/md5-cache/dev-python/uranium-4.9.1
 2110312110 metadata/md5-cache/dev-python/virtualenv-20.8.1-r1
 2110312110 metadata/md5-cache/dev-python/websockets-10.0
 2110312110 metadata/md5-cache/dev-python/xmlschema-1.8.1
 2110312110 metadata/md5-cache/dev-python/zipp-3.6.0
+2111021340 metadata/md5-cache/dev-python/Manifest.gz
+2111020139 metadata/md5-cache/dev-python/async_timeout-4.0.0
+2111011909 metadata/md5-cache/dev-python/autopage-0.4.0
+2111011909 metadata/md5-cache/dev-python/backcall-0.2.0
+2111011909 metadata/md5-cache/dev-python/berkeleydb-18.1.4
+2111020139 metadata/md5-cache/dev-python/boto3-1.19.8
+2111020139 metadata/md5-cache/dev-python/botocore-1.22.8
+2111011909 metadata/md5-cache/dev-python/cliff-3.9.0
+2111020139 metadata/md5-cache/dev-python/django-3.2.9
+2111020139 metadata/md5-cache/dev-python/google-auth-2.3.3
+2111021240 metadata/md5-cache/dev-python/miniupnpc-2.2.3
+2111021240 metadata/md5-cache/dev-python/numpy-1.21.2-r1
+2111021009 metadata/md5-cache/dev-python/opt-einsum-3.3.0
+2111011909 metadata/md5-cache/dev-python/pickleshare-0.7.5
+2111020139 metadata/md5-cache/dev-python/prettytable-2.3.0
+2111011909 metadata/md5-cache/dev-python/prompt_toolkit-3.0.21
+2111021209 metadata/md5-cache/dev-python/pynest2d-4.9.1
+2111020139 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
+2111020940 metadata/md5-cache/dev-python/pytools-2021.2.9
+2111021240 metadata/md5-cache/dev-python/rdflib-6.0.2
+2111020139 metadata/md5-cache/dev-python/regex-2021.11.1
+2111011909 metadata/md5-cache/dev-python/sqlalchemy-1.4.26
+2111021340 metadata/md5-cache/dev-python/swagger-spec-validator-2.7.4
+2111021209 metadata/md5-cache/dev-python/uranium-4.9.1
+2111020139 metadata/md5-cache/dev-python/virtualenv-20.10.0
+2111020139 metadata/md5-cache/dev-python/xlsxwriter-3.0.2
+2111020139 metadata/md5-cache/dev-python/yarl-1.7.2
 2109040224 metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r1
 2109082009 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
 2110170409 metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10
@@ -44547,7 +44566,6 @@
 2110171140 metadata/md5-cache/dev-ruby/crass-1.0.6
 2110171140 metadata/md5-cache/dev-ruby/creole-0.5.0
 2110171140 metadata/md5-cache/dev-ruby/creole-0.5.0-r1
-2110171140 metadata/md5-cache/dev-ruby/cri-2.15.10
 2110171140 metadata/md5-cache/dev-ruby/cri-2.15.11
 2110171140 metadata/md5-cache/dev-ruby/css_parser-1.10.0
 2110171140 metadata/md5-cache/dev-ruby/css_parser-1.7.1
@@ -45162,7 +45180,6 @@
 2110171140 metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
 2110171140 metadata/md5-cache/dev-ruby/sass-rails-5.0.8
 2110171140 metadata/md5-cache/dev-ruby/sass-rails-5.1.0
-2110171140 metadata/md5-cache/dev-ruby/sassc-2.4.0
 2110171140 metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
 2110171140 metadata/md5-cache/dev-ruby/sawyer-0.8.2
 2110171140 metadata/md5-cache/dev-ruby/sdoc-1.1.0
@@ -45470,16 +45487,20 @@
 2110311439 metadata/md5-cache/dev-ruby/itextomml-1.6.1
 2110311439 metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1
 2110311439 metadata/md5-cache/dev-ruby/posix-spawn-0.3.15-r1
-2111011310 metadata/md5-cache/dev-ruby/Manifest.gz
 2110312244 metadata/md5-cache/dev-ruby/facter-3.14.19
 2110312244 metadata/md5-cache/dev-ruby/facter-3.14.20
 2110312244 metadata/md5-cache/dev-ruby/facter-3.14.21
 2110312110 metadata/md5-cache/dev-ruby/minitest-around-0.5.0
 2111010940 metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1
-2111011310 metadata/md5-cache/dev-ruby/serialport-1.3.2
 2111010940 metadata/md5-cache/dev-ruby/sigar-0.7.3-r1
 2110312110 metadata/md5-cache/dev-ruby/test_construct-2.0.2
 2111010940 metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1
+2111021240 metadata/md5-cache/dev-ruby/Manifest.gz
+2111020839 metadata/md5-cache/dev-ruby/cri-2.15.11-r1
+2111020839 metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
+2111020839 metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
+2111011909 metadata/md5-cache/dev-ruby/sassc-2.4.0
+2111021240 metadata/md5-cache/dev-ruby/serialport-1.3.2
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
 1708031509 metadata/md5-cache/dev-scheme/scmxlate-20090410-r1
@@ -45752,7 +45773,6 @@
 2106231354 metadata/md5-cache/dev-util/japi-compliance-checker-9999
 2106231354 metadata/md5-cache/dev-util/patchbin-99999999
 2106231354 metadata/md5-cache/dev-util/pkgdiff-9999
-2106231354 metadata/md5-cache/dev-util/shadowman-9999
 2106272139 metadata/md5-cache/dev-util/cloc-1.88
 2106272139 metadata/md5-cache/dev-util/cloc-1.90
 2106301339 metadata/md5-cache/dev-util/indent-2.2.12
@@ -46326,7 +46346,6 @@
 2110292239 metadata/md5-cache/dev-util/diffoscope-189
 2110300239 metadata/md5-cache/dev-util/git-delta-0.9.2
 2110311210 metadata/md5-cache/dev-util/packer-1.7.8
-2111010709 metadata/md5-cache/dev-util/Manifest.gz
 2110312244 metadata/md5-cache/dev-util/android-tools-31.0.0_p1
 2111010709 metadata/md5-cache/dev-util/android-tools-31.0.3
 2110312244 metadata/md5-cache/dev-util/anjuta-3.34.0
@@ -46353,7 +46372,6 @@
 2110312244 metadata/md5-cache/dev-util/ccache-4.3-r3
 2110312244 metadata/md5-cache/dev-util/ccache-4.4
 2110312244 metadata/md5-cache/dev-util/ccache-4.4.1
-2110312244 metadata/md5-cache/dev-util/ccache-4.4.2
 2110312244 metadata/md5-cache/dev-util/ccls-0.20201219
 2110312244 metadata/md5-cache/dev-util/ccls-0.20210330
 2110312244 metadata/md5-cache/dev-util/ccls-9999
@@ -46436,7 +46454,6 @@
 2110312339 metadata/md5-cache/dev-util/meson-0.60.0
 2110312244 metadata/md5-cache/dev-util/min-cscope-16.1.0
 2110312244 metadata/md5-cache/dev-util/nemiver-0.9.6
-2110312110 metadata/md5-cache/dev-util/ninja-1.10.2-r1
 2110312244 metadata/md5-cache/dev-util/pahole-1.20
 2110312244 metadata/md5-cache/dev-util/pahole-1.21
 2110312244 metadata/md5-cache/dev-util/pycharm-community-2021.1.2-r1
@@ -46491,6 +46508,11 @@
 2110312244 metadata/md5-cache/dev-util/vulkan-tools-1.2.182-r1
 2110312244 metadata/md5-cache/dev-util/vulkan-tools-1.2.189
 2110312244 metadata/md5-cache/dev-util/vulkan-tools-9999
+2111021410 metadata/md5-cache/dev-util/Manifest.gz
+2111021240 metadata/md5-cache/dev-util/ccache-4.4.2
+2111021410 metadata/md5-cache/dev-util/codeblocks-20.03-r4
+2111021240 metadata/md5-cache/dev-util/ninja-1.10.2-r1
+2111012009 metadata/md5-cache/dev-util/shadowman-3
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1807302309 metadata/md5-cache/dev-vcs/easygit-1.7.5.2
 1702282322 metadata/md5-cache/dev-vcs/git-merge-changelog-20170131
@@ -47283,7 +47305,6 @@
 2110012311 metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
 2110012311 metadata/md5-cache/games-roguelike/scourge-0.21.1-r1
 2110012311 metadata/md5-cache/games-roguelike/zangband-2.7.4c
-2111010709 metadata/md5-cache/games-roguelike/Manifest.gz
 2110312244 metadata/md5-cache/games-roguelike/angband-4.2.2-r2
 2110312244 metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100
 2110312244 metadata/md5-cache/games-roguelike/moria-5.7.14-r1
@@ -47293,6 +47314,8 @@
 2110312244 metadata/md5-cache/games-roguelike/stone-soup-0.27.1
 2111010709 metadata/md5-cache/games-roguelike/stone-soup-0.28.0_pre20211031
 2110312244 metadata/md5-cache/games-roguelike/tomenet-4.7.3
+2111020609 metadata/md5-cache/games-roguelike/Manifest.gz
+2111020609 metadata/md5-cache/games-roguelike/angband-4.2.3-r1
 2104161439 metadata/md5-cache/games-rpg/xu4-0.9-r1
 2104212209 metadata/md5-cache/games-rpg/queen-1-r1
 2105200039 metadata/md5-cache/games-rpg/freedink-data-1.08.20170409-r1
@@ -48505,7 +48528,6 @@
 2110051909 metadata/md5-cache/kde-plasma/plasma-meta-5.22.5-r1
 2110270809 metadata/md5-cache/kde-plasma/breeze-grub-5.23.2
 2110270809 metadata/md5-cache/kde-plasma/plasma-meta-5.23.2
-2110312244 metadata/md5-cache/kde-plasma/Manifest.gz
 2110312244 metadata/md5-cache/kde-plasma/bluedevil-5.22.5
 2110312244 metadata/md5-cache/kde-plasma/bluedevil-5.23.2
 2110312244 metadata/md5-cache/kde-plasma/breeze-5.22.5
@@ -48570,7 +48592,6 @@
 2110312244 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.22.5
 2110312244 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.23.2
 2110312244 metadata/md5-cache/kde-plasma/plasma-desktop-5.22.5
-2110312244 metadata/md5-cache/kde-plasma/plasma-desktop-5.23.2
 2110312244 metadata/md5-cache/kde-plasma/plasma-desktop-5.23.2.1
 2110312244 metadata/md5-cache/kde-plasma/plasma-disks-5.22.5
 2110312244 metadata/md5-cache/kde-plasma/plasma-disks-5.23.2
@@ -48608,6 +48629,7 @@
 2110312244 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.2
 2110312244 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.22.5
 2110312244 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.2
+2111012140 metadata/md5-cache/kde-plasma/Manifest.gz
 2107211809 metadata/md5-cache/lxde-base/lxappearance-0.6.3-r2
 2107211809 metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
 2107211809 metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r7
@@ -49236,7 +49258,6 @@
 2110281809 metadata/md5-cache/media-gfx/mkbold-mkitalic-0.11
 2110292239 metadata/md5-cache/media-gfx/hydrus-459.3
 2110310339 metadata/md5-cache/media-gfx/fbida-2.14-r3
-2111011310 metadata/md5-cache/media-gfx/Manifest.gz
 2110312244 metadata/md5-cache/media-gfx/ahoviewer-2.0.0_beta
 2110312244 metadata/md5-cache/media-gfx/alembic-1.8.2
 2110312244 metadata/md5-cache/media-gfx/alembic-1.8.3-r1
@@ -49288,8 +49309,6 @@
 2110312244 metadata/md5-cache/media-gfx/fotoxx-21.50
 2110312244 metadata/md5-cache/media-gfx/fotoxx-21.55
 2110312244 metadata/md5-cache/media-gfx/fotoxx-21.60
-2110312244 metadata/md5-cache/media-gfx/freecad-0.19.2-r3
-2110312244 metadata/md5-cache/media-gfx/freecad-9999
 2110312244 metadata/md5-cache/media-gfx/freepv-0.3.0-r5
 2110312244 metadata/md5-cache/media-gfx/frogr-1.3
 2110312244 metadata/md5-cache/media-gfx/frogr-1.5
@@ -49393,6 +49412,9 @@
 2110312244 metadata/md5-cache/media-gfx/xpaint-3.1.4
 2110312244 metadata/md5-cache/media-gfx/yafaray-3.4.1
 2110312244 metadata/md5-cache/media-gfx/yafaray-3.5.1-r1
+2111021309 metadata/md5-cache/media-gfx/Manifest.gz
+2111021309 metadata/md5-cache/media-gfx/freecad-0.19.2-r4
+2111021309 metadata/md5-cache/media-gfx/freecad-9999
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1902171239 metadata/md5-cache/media-libs/libggimisc-2.2.2-r1
 1702282326 metadata/md5-cache/media-libs/libxtract-0.6.6
@@ -49422,8 +49444,6 @@
 2105061309 metadata/md5-cache/media-libs/libuninameslist-20200413-r1
 2105182039 metadata/md5-cache/media-libs/libltc-1.3.1-r1
 2106030210 metadata/md5-cache/media-libs/libpqstego-0.0.1-r1
-2106052339 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5
-2106052339 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5-r1
 2106110539 metadata/md5-cache/media-libs/libgig-4.3.0
 2106250439 metadata/md5-cache/media-libs/liblqr-0.4.2-r1
 2106251539 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1
@@ -49558,7 +49578,6 @@
 2109302139 metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
 2110012311 metadata/md5-cache/media-libs/a52dec-0.7.4-r8
 2110012311 metadata/md5-cache/media-libs/alsa-lib-1.2.4
-2110012311 metadata/md5-cache/media-libs/alsa-lib-1.2.5_p20210604
 2110012311 metadata/md5-cache/media-libs/alsa-oss-1.1.8
 2110012311 metadata/md5-cache/media-libs/aribb24-1.0.3-r2
 2110012311 metadata/md5-cache/media-libs/bio2jack-0.9-r2
@@ -49785,7 +49804,6 @@
 2110310339 metadata/md5-cache/media-libs/waffle-1.7.0-r1
 2110310339 metadata/md5-cache/media-libs/waffle-9999
 2110312244 metadata/md5-cache/media-libs/Field3D-1.7.2
-2111011639 metadata/md5-cache/media-libs/Manifest.gz
 2110312244 metadata/md5-cache/media-libs/SoQt-1.6.0
 2110312244 metadata/md5-cache/media-libs/SoXt-1.4.0
 2110312244 metadata/md5-cache/media-libs/aften-0.0.8-r2
@@ -50010,6 +50028,8 @@
 2110312244 metadata/md5-cache/media-libs/x265-9999
 2110312244 metadata/md5-cache/media-libs/zmusic-1.1.4
 2110312244 metadata/md5-cache/media-libs/zxing-cpp-1.2.0
+2111021309 metadata/md5-cache/media-libs/Manifest.gz
+2111021309 metadata/md5-cache/media-libs/freeimage-3.18.0-r3
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
 1912241539 metadata/md5-cache/media-plugins/vdr-burn-templates-0.0.3
 2006152009 metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
@@ -50734,7 +50754,6 @@
 2109142114 metadata/md5-cache/media-sound/jalv-1.6.6
 2109142114 metadata/md5-cache/media-sound/klick-0.12.2-r2
 2109150539 metadata/md5-cache/media-sound/cmus-2.9.1-r1
-2109200110 metadata/md5-cache/media-sound/alsa-utils-1.2.5-r1
 2109200110 metadata/md5-cache/media-sound/alsa-utils-1.2.5.1
 2109200110 metadata/md5-cache/media-sound/murmur-1.3.3
 2109200110 metadata/md5-cache/media-sound/murmur-1.3.4
@@ -50843,7 +50862,6 @@
 2110260639 metadata/md5-cache/media-sound/abcmidi-2021.09.15
 2110270439 metadata/md5-cache/media-sound/upmpdcli-1.5.13
 2110290511 metadata/md5-cache/media-sound/sox-14.4.2_p20210509
-2111011310 metadata/md5-cache/media-sound/Manifest.gz
 2110312244 metadata/md5-cache/media-sound/aeolus-0.9.9
 2110312244 metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
 2110312244 metadata/md5-cache/media-sound/alsa-tools-1.2.5
@@ -51034,6 +51052,7 @@
 2110312244 metadata/md5-cache/media-sound/yoshimi-2.1.0-r1
 2110312244 metadata/md5-cache/media-sound/yoshimi-2.1.1.1
 2110312244 metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
+2111021309 metadata/md5-cache/media-sound/Manifest.gz
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 2012172009 metadata/md5-cache/media-tv/w_scan-20170107
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
@@ -51225,7 +51244,6 @@
 2110252309 metadata/md5-cache/media-video/v4l2loopback-9999
 2110271039 metadata/md5-cache/media-video/pipewire-0.3.39-r4
 2110271039 metadata/md5-cache/media-video/pipewire-9999
-2110312244 metadata/md5-cache/media-video/Manifest.gz
 2110312244 metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r102
 2110312244 metadata/md5-cache/media-video/aegisub-9999
 2110312244 metadata/md5-cache/media-video/aravis-0.7.2
@@ -51308,6 +51326,8 @@
 2110312244 metadata/md5-cache/media-video/vlc-3.0.9999
 2110312244 metadata/md5-cache/media-video/vlc-9999
 2110312244 metadata/md5-cache/media-video/xine-ui-0.99.12
+2111020109 metadata/md5-cache/media-video/Manifest.gz
+2111020109 metadata/md5-cache/media-video/makemkv-1.16.5
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1910071209 metadata/md5-cache/net-analyzer/fprobe-1.1-r3
 1910071309 metadata/md5-cache/net-analyzer/ipaudit-1.0_beta2-r1
@@ -51625,9 +51645,6 @@
 2110012311 metadata/md5-cache/net-analyzer/yersinia-9999
 2110021209 metadata/md5-cache/net-analyzer/wapiti-3.0.5
 2110021209 metadata/md5-cache/net-analyzer/wapiti-9999
-2110021639 metadata/md5-cache/net-analyzer/zabbix-4.0.34
-2110021639 metadata/md5-cache/net-analyzer/zabbix-5.0.16
-2110021639 metadata/md5-cache/net-analyzer/zabbix-5.4.5
 2110032109 metadata/md5-cache/net-analyzer/zabbix-4.0.33
 2110032109 metadata/md5-cache/net-analyzer/zabbix-5.0.15
 2110032109 metadata/md5-cache/net-analyzer/zabbix-5.4.4
@@ -51677,7 +51694,6 @@
 2110240709 metadata/md5-cache/net-analyzer/fail2ban-0.11.2-r1
 2110261109 metadata/md5-cache/net-analyzer/testssl-3.0.6
 2110292209 metadata/md5-cache/net-analyzer/zabbix-5.4.7
-2110312244 metadata/md5-cache/net-analyzer/Manifest.gz
 2110312244 metadata/md5-cache/net-analyzer/arpon-3.0
 2110312244 metadata/md5-cache/net-analyzer/ettercap-0.8.3.1
 2110312244 metadata/md5-cache/net-analyzer/ettercap-9999
@@ -51710,6 +51726,10 @@
 2110312244 metadata/md5-cache/net-analyzer/wireshark-9999
 2110312244 metadata/md5-cache/net-analyzer/zmap-2.1.1-r3
 2110312244 metadata/md5-cache/net-analyzer/zmap-9999
+2111021340 metadata/md5-cache/net-analyzer/Manifest.gz
+2111021340 metadata/md5-cache/net-analyzer/zabbix-4.0.34
+2111021340 metadata/md5-cache/net-analyzer/zabbix-5.0.16
+2111021340 metadata/md5-cache/net-analyzer/zabbix-5.4.5
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2104161439 metadata/md5-cache/net-dialup/fbgetty-0.1.698-r1
 2104161439 metadata/md5-cache/net-dialup/sercd-3.0.0-r2
@@ -51740,17 +51760,17 @@
 2110012311 metadata/md5-cache/net-dialup/radiusclient-ng-0.5.6-r2
 2110012311 metadata/md5-cache/net-dialup/rp-pppoe-3.14
 2110012311 metadata/md5-cache/net-dialup/rp-pppoe-3.15
-2110182240 metadata/md5-cache/net-dialup/linux-atm-2.5.2
 2110182240 metadata/md5-cache/net-dialup/openl2tp-1.8-r2
 2110182240 metadata/md5-cache/net-dialup/ppp-2.4.9-r4
 2110182240 metadata/md5-cache/net-dialup/ppp-2.4.9-r5
 2110182240 metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
-2110312244 metadata/md5-cache/net-dialup/Manifest.gz
 2110312244 metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
 2110312244 metadata/md5-cache/net-dialup/accel-ppp-9999
 2110312244 metadata/md5-cache/net-dialup/cutecom-0.51.0-r1
 2110312244 metadata/md5-cache/net-dialup/moserial-3.0.16
 2110312244 metadata/md5-cache/net-dialup/moserial-3.0.20
+2111020109 metadata/md5-cache/net-dialup/Manifest.gz
+2111020109 metadata/md5-cache/net-dialup/linux-atm-2.5.2-r1
 1910111739 metadata/md5-cache/net-dns/dnscap-1.10.3
 1810090339 metadata/md5-cache/net-dns/s6-dns-2.3.0.1
 1906221109 metadata/md5-cache/net-dns/s6-dns-2.3.0.2
@@ -51774,7 +51794,6 @@
 2109040224 metadata/md5-cache/net-dns/dnshijacker-1.3-r2
 2109040224 metadata/md5-cache/net-dns/dnssec-check-2.2
 2109040224 metadata/md5-cache/net-dns/dog-0.1.0
-2109040224 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 2109040224 metadata/md5-cache/net-dns/mdns-repeater-1.11
 2109040224 metadata/md5-cache/net-dns/ndu-0.4-r4
 2109040224 metadata/md5-cache/net-dns/odsclient-1.03-r1
@@ -51796,7 +51815,6 @@
 2109240040 metadata/md5-cache/net-dns/coredns-1.7.0
 2109240040 metadata/md5-cache/net-dns/coredns-1.8.3
 2109240040 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.45
-2109240040 metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.0
 2109240909 metadata/md5-cache/net-dns/pdns-4.5.1
 2109240909 metadata/md5-cache/net-dns/pdns-recursor-4.4.5
 2109240909 metadata/md5-cache/net-dns/pdns-recursor-4.5.5
@@ -51834,11 +51852,13 @@
 2110281239 metadata/md5-cache/net-dns/c-ares-1.18.1
 2110302039 metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.1
 2110310710 metadata/md5-cache/net-dns/knot-3.1.3
-2110312244 metadata/md5-cache/net-dns/Manifest.gz
 2110312244 metadata/md5-cache/net-dns/getdns-1.7.0-r1
 2110312244 metadata/md5-cache/net-dns/https_dns_proxy-0_pre20200925
 2110312244 metadata/md5-cache/net-dns/https_dns_proxy-9999
 2110312244 metadata/md5-cache/net-dns/resolv_wrapper-1.1.7
+2111021240 metadata/md5-cache/net-dns/Manifest.gz
+2111021240 metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.0
+2111020109 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2109040224 metadata/md5-cache/net-firewall/arptables-0.0.5-r1
@@ -51968,7 +51988,6 @@
 2108161009 metadata/md5-cache/net-im/signal-cli-bin-0.8.5
 2108190940 metadata/md5-cache/net-im/mcabber-1.1.2
 2109040224 metadata/md5-cache/net-im/libcommuni-3.6.0
-2109040224 metadata/md5-cache/net-im/sendxmpp-1.24
 2109112110 metadata/md5-cache/net-im/mcabber-9999
 2109141909 metadata/md5-cache/net-im/mattermost-desktop-bin-4.7.2
 2109142114 metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011
@@ -51998,7 +52017,6 @@
 2110272339 metadata/md5-cache/net-im/mattermost-desktop-bin-5.0.1
 2110300109 metadata/md5-cache/net-im/prosody-modules-0_pre20211027
 2110300109 metadata/md5-cache/net-im/prosody-modules-9999
-2110312244 metadata/md5-cache/net-im/Manifest.gz
 2110312244 metadata/md5-cache/net-im/choqok-1.7.0
 2110312244 metadata/md5-cache/net-im/corebird-1.7.4-r2
 2110312244 metadata/md5-cache/net-im/dianara-1.4.2
@@ -52041,7 +52059,6 @@
 2110312244 metadata/md5-cache/net-im/teams-1.4.00.13653-r2
 2110312244 metadata/md5-cache/net-im/teams-1.4.00.26453-r1
 2110312244 metadata/md5-cache/net-im/teams-1.4.00.7556-r1
-2110312244 metadata/md5-cache/net-im/telegram-desktop-2.9.3-r1
 2110312244 metadata/md5-cache/net-im/telegram-desktop-3.0.1-r1
 2110312244 metadata/md5-cache/net-im/telegram-desktop-3.1.8
 2110312244 metadata/md5-cache/net-im/telegram-desktop-bin-3.1.1-r1
@@ -52060,6 +52077,9 @@
 2110312244 metadata/md5-cache/net-im/zoom-5.4.53391.1108-r3
 2110312244 metadata/md5-cache/net-im/zoom-5.8.0.16
 2110312244 metadata/md5-cache/net-im/zoom-5.8.3.145
+2111020109 metadata/md5-cache/net-im/Manifest.gz
+2111020109 metadata/md5-cache/net-im/sendxmpp-1.24
+2111012340 metadata/md5-cache/net-im/telegram-desktop-3.1.11
 2002230040 metadata/md5-cache/net-irc/ircmap-0.99-r1
 2008302209 metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
 2008302209 metadata/md5-cache/net-irc/znc-igloo-push-20200520
@@ -52262,7 +52282,6 @@
 2110012311 metadata/md5-cache/net-libs/libsrtp-1.6.0-r1
 2110012311 metadata/md5-cache/net-libs/libsrtp-2.2.0
 2110012311 metadata/md5-cache/net-libs/libsrtp-2.3.0-r1
-2110012311 metadata/md5-cache/net-libs/libtelnet-0.23
 2110012311 metadata/md5-cache/net-libs/libtorrent-0.13.7
 2110012311 metadata/md5-cache/net-libs/libtorrent-0.13.7-r1
 2110012311 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10-r1
@@ -52342,9 +52361,7 @@
 2110281139 metadata/md5-cache/net-libs/libgsasl-1.10.0
 2110281809 metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
 2110291539 metadata/md5-cache/net-libs/xdp-tools-1.2.0
-2110310209 metadata/md5-cache/net-libs/ldns-1.7.1-r5
 2110310809 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.14-r1
-2111011140 metadata/md5-cache/net-libs/Manifest.gz
 2110312244 metadata/md5-cache/net-libs/biblesync-2.1.0
 2110312244 metadata/md5-cache/net-libs/cppzmq-4.6.0
 2110312244 metadata/md5-cache/net-libs/davix-0.7.6
@@ -52419,7 +52436,6 @@
 2110312244 metadata/md5-cache/net-libs/libssh2-1.10.0
 2110312244 metadata/md5-cache/net-libs/libssh2-1.9.0_p20200614-r1
 2110312244 metadata/md5-cache/net-libs/libssh2-9999
-2110312244 metadata/md5-cache/net-libs/libtelnet-9999
 2111011140 metadata/md5-cache/net-libs/libtorrent-rasterbar-2.0.4-r4
 2110312244 metadata/md5-cache/net-libs/libvncserver-0.9.13
 2110312244 metadata/md5-cache/net-libs/libwebsockets-4.2.2
@@ -52490,6 +52506,10 @@
 2110312244 metadata/md5-cache/net-libs/xrootd-ceph-5.2.0
 2110312244 metadata/md5-cache/net-libs/xrootd-ceph-5.3.1
 2110312244 metadata/md5-cache/net-libs/zmqpp-4.2.0
+2111021440 metadata/md5-cache/net-libs/Manifest.gz
+2111021240 metadata/md5-cache/net-libs/ldns-1.7.1-r5
+2111021440 metadata/md5-cache/net-libs/libtelnet-0.23-r1
+2111021440 metadata/md5-cache/net-libs/libtelnet-9999
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1711271440 metadata/md5-cache/net-mail/qprint-1.1
 1907151840 metadata/md5-cache/net-mail/signify-1.14
@@ -53074,10 +53094,8 @@
 2110300139 metadata/md5-cache/net-misc/openssh-8.8_p1-r2
 2110310610 metadata/md5-cache/net-misc/batctl-2021.3
 2110310639 metadata/md5-cache/net-misc/bfgminer-5.5.0-r2
-2110310239 metadata/md5-cache/net-misc/yt-dlp-2021.10.22-r2
 2110311009 metadata/md5-cache/net-misc/seafile-8.0.4
 2110311309 metadata/md5-cache/net-misc/stuntman-1.2.16
-2111011740 metadata/md5-cache/net-misc/Manifest.gz
 2110312244 metadata/md5-cache/net-misc/anydesk-5.5.6-r1
 2110312244 metadata/md5-cache/net-misc/anydesk-6.0.0-r1
 2110312244 metadata/md5-cache/net-misc/anydesk-6.0.1
@@ -53169,9 +53187,10 @@
 2110312244 metadata/md5-cache/net-misc/xmrig-6.15.2
 2111011740 metadata/md5-cache/net-misc/xmrig-6.15.3
 2110312244 metadata/md5-cache/net-misc/xmrig-9999
-2110312244 metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
-2110312244 metadata/md5-cache/net-misc/youtube-viewer-3.9.3
 2110312244 metadata/md5-cache/net-misc/youtube-viewer-9999
+2111012009 metadata/md5-cache/net-misc/Manifest.gz
+2111012009 metadata/md5-cache/net-misc/youtube-viewer-3.9.6
+2111011909 metadata/md5-cache/net-misc/yt-dlp-2021.10.22-r2
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2011031239 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
 2105111309 metadata/md5-cache/net-nds/gssproxy-0.8.4
@@ -53317,9 +53336,7 @@
 2110312244 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
 2110312244 metadata/md5-cache/net-p2p/vuze-5.7.6.0-r1
 2110312244 metadata/md5-cache/net-p2p/vuze-5.7.6.0-r2
-1702282329 metadata/md5-cache/net-print/fax4cups-1.29-r1
 1702282329 metadata/md5-cache/net-print/ink-0.5.1
-1702282329 metadata/md5-cache/net-print/ink-0.5.2
 1801132309 metadata/md5-cache/net-print/kyocera-1x2x-mfp-driver-1.1203-r1
 1911180909 metadata/md5-cache/net-print/sshlpr-1
 1912111539 metadata/md5-cache/net-print/kyocera-mita-ppds-8.4-r1
@@ -53364,7 +53381,6 @@
 2110281139 metadata/md5-cache/net-print/cups-filters-1.28.10-r1
 2110291539 metadata/md5-cache/net-print/foomatic-db-4.0.20190226
 2110310839 metadata/md5-cache/net-print/libinklevel-0.9.2
-2111010409 metadata/md5-cache/net-print/Manifest.gz
 2110312244 metadata/md5-cache/net-print/brlaser-6
 2110312244 metadata/md5-cache/net-print/cups-2.3.3-r4
 2110312244 metadata/md5-cache/net-print/cups-2.3.3_p2-r2
@@ -53372,6 +53388,9 @@
 2110312244 metadata/md5-cache/net-print/cups-9999
 2110312244 metadata/md5-cache/net-print/cups-pk-helper-0.2.6
 2111010409 metadata/md5-cache/net-print/libinklevel-0.9.3
+2111020109 metadata/md5-cache/net-print/Manifest.gz
+2111020109 metadata/md5-cache/net-print/fax4cups-1.29-r1
+2111020109 metadata/md5-cache/net-print/ink-0.5.3
 2011290239 metadata/md5-cache/net-proxy/ziproxy-3.3.1-r2
 2104172239 metadata/md5-cache/net-proxy/wwwoffle-2.9i-r2
 2104192239 metadata/md5-cache/net-proxy/adzapper-20110915-r2
@@ -53468,7 +53487,6 @@
 2110012311 metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
 2110012311 metadata/md5-cache/net-vpn/tinc-1.1_pre18
 2110102239 metadata/md5-cache/net-vpn/vpnc-scripts-99999999
-2110182240 metadata/md5-cache/net-vpn/iodine-0.7.0-r2
 2110182240 metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
 2110182240 metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198
 2110182240 metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.203
@@ -53492,7 +53510,6 @@
 2110252309 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
 2110281309 metadata/md5-cache/net-vpn/tor-0.4.6.8
 2110281309 metadata/md5-cache/net-vpn/tor-0.4.7.2_alpha
-2110312244 metadata/md5-cache/net-vpn/Manifest.gz
 2110312244 metadata/md5-cache/net-vpn/badvpn-1.999.127-r1
 2110312244 metadata/md5-cache/net-vpn/badvpn-1.999.129-r1
 2110312244 metadata/md5-cache/net-vpn/badvpn-1.999.130-r1
@@ -53508,6 +53525,8 @@
 2110312244 metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r2
 2110312244 metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r2
 2110312244 metadata/md5-cache/net-vpn/riseup-vpn-0.21.6-r1
+2111020109 metadata/md5-cache/net-vpn/Manifest.gz
+2111020109 metadata/md5-cache/net-vpn/iodine-0.7.0-r3
 1909122209 metadata/md5-cache/net-wireless/gr-scan-20160211
 1905080439 metadata/md5-cache/net-wireless/portapack-firmware-20190405
 1808172339 metadata/md5-cache/net-wireless/portapack-havoc-0.0_p20180612
@@ -54265,7 +54284,6 @@
 2110291209 metadata/md5-cache/sci-geosciences/gpsd-9999
 2110302039 metadata/md5-cache/sci-geosciences/gpsd-3.23.1
 2110312244 metadata/md5-cache/sci-geosciences/GeographicLib-1.52
-2110312244 metadata/md5-cache/sci-geosciences/Manifest.gz
 2110312244 metadata/md5-cache/sci-geosciences/foxtrotgps-1.2.2
 2110312244 metadata/md5-cache/sci-geosciences/foxtrotgps-1.2.2-r1
 2110312244 metadata/md5-cache/sci-geosciences/geocode-glib-3.26.2
@@ -54283,7 +54301,6 @@
 2110312244 metadata/md5-cache/sci-geosciences/grass-7.8.6
 2110312244 metadata/md5-cache/sci-geosciences/grass-9999
 2110312244 metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05
-2110312244 metadata/md5-cache/sci-geosciences/josm-bin-18191
 2110312244 metadata/md5-cache/sci-geosciences/josm-bin-18193
 2110312244 metadata/md5-cache/sci-geosciences/laszip-3.4.1
 2110312244 metadata/md5-cache/sci-geosciences/liblas-1.8.1-r3
@@ -54349,6 +54366,8 @@
 2110312244 metadata/md5-cache/sci-geosciences/viking-1.8
 2110312244 metadata/md5-cache/sci-geosciences/viking-1.8-r1
 2110312244 metadata/md5-cache/sci-geosciences/xtide-2.15.1
+2111021309 metadata/md5-cache/sci-geosciences/Manifest.gz
+2111021309 metadata/md5-cache/sci-geosciences/josm-bin-18303
 1702282331 metadata/md5-cache/sci-libs/idlmarkwardt-20160319
 1804261338 metadata/md5-cache/sci-libs/io_lib-1.14.7
 1912132109 metadata/md5-cache/sci-libs/qfits-6.2.0
@@ -56189,7 +56208,6 @@
 2110310610 metadata/md5-cache/sys-apps/secilc-3.3
 2110310610 metadata/md5-cache/sys-apps/selinux-python-3.3
 2110310610 metadata/md5-cache/sys-apps/semodule-utils-3.3
-2111010039 metadata/md5-cache/sys-apps/Manifest.gz
 2110312244 metadata/md5-cache/sys-apps/baobab-40.0
 2110312244 metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
 2110312244 metadata/md5-cache/sys-apps/colorized-logs-2.5
@@ -56216,6 +56234,9 @@
 2110312244 metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
 2110312244 metadata/md5-cache/sys-apps/tuned-2.15.0-r1
 2110312244 metadata/md5-cache/sys-apps/tuned-2.16.0
+2111021240 metadata/md5-cache/sys-apps/Manifest.gz
+2111021240 metadata/md5-cache/sys-apps/iproute2-5.15.0
+2111020739 metadata/md5-cache/sys-apps/sandbox-2.29
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 2011160239 metadata/md5-cache/sys-auth/ykclient-2.15
 2104292039 metadata/md5-cache/sys-auth/pam_mount-2.16-r3
@@ -56404,12 +56425,12 @@
 2110181210 metadata/md5-cache/sys-block/targetcli-fb-2.1.54
 2110210309 metadata/md5-cache/sys-block/mbuffer-20211018
 2110220239 metadata/md5-cache/sys-block/megacli-8.07.14-r3
-2110270939 metadata/md5-cache/sys-block/tgt-1.0.80
-2110312244 metadata/md5-cache/sys-block/Manifest.gz
 2110312244 metadata/md5-cache/sys-block/gparted-1.3.0
 2110312244 metadata/md5-cache/sys-block/gparted-1.3.1
 2110312244 metadata/md5-cache/sys-block/partitionmanager-21.04.3
 2110312244 metadata/md5-cache/sys-block/partitionmanager-21.08.2
+2111021240 metadata/md5-cache/sys-block/Manifest.gz
+2111021240 metadata/md5-cache/sys-block/tgt-1.0.80
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.2
 1911100139 metadata/md5-cache/sys-boot/makebootfat-1.4
 1910191339 metadata/md5-cache/sys-boot/nettrom-2.3.3
@@ -57114,8 +57135,6 @@
 2110252309 metadata/md5-cache/sys-fs/zfs-kmod-9999
 2110281709 metadata/md5-cache/sys-fs/nilfs-utils-2.2.2-r1
 2110290909 metadata/md5-cache/sys-fs/ntfs3g-2021.8.22
-2110310440 metadata/md5-cache/sys-fs/e2fsprogs-1.46.4-r50
-2110312244 metadata/md5-cache/sys-fs/Manifest.gz
 2110312244 metadata/md5-cache/sys-fs/android-file-transfer-linux-3.9
 2110312244 metadata/md5-cache/sys-fs/android-file-transfer-linux-4.1
 2110312244 metadata/md5-cache/sys-fs/android-file-transfer-linux-4.2
@@ -57136,6 +57155,8 @@
 2110312244 metadata/md5-cache/sys-fs/udiskie-2.3.3-r1
 2110312244 metadata/md5-cache/sys-fs/udisks-2.9.3
 2110312244 metadata/md5-cache/sys-fs/udisks-2.9.4
+2111012110 metadata/md5-cache/sys-fs/Manifest.gz
+2111012110 metadata/md5-cache/sys-fs/e2fsprogs-1.46.4-r51
 2003261841 metadata/md5-cache/sys-kernel/installkernel-gentoo-1
 2101162039 metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215
 2101162039 metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.75_p20190925
@@ -57332,18 +57353,18 @@
 2110292239 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.74
 2110292239 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.154
 2110292309 metadata/md5-cache/sys-kernel/linux-firmware-20211027
-2111011509 metadata/md5-cache/sys-kernel/Manifest.gz
 2111010440 metadata/md5-cache/sys-kernel/genkernel-4.2.5
 2111011109 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.76
-2111010809 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.253
-2111010809 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.214
-2111010809 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.290
-2111010809 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.288
-2111010809 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.76-r1
 2111011509 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.0
-2111010809 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.156
 2111011439 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.0
 2111010440 metadata/md5-cache/sys-kernel/zen-sources-5.14.15
+2111021340 metadata/md5-cache/sys-kernel/Manifest.gz
+2111021340 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.253
+2111021340 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.214
+2111021340 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.290
+2111021340 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.288
+2111021340 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.76-r1
+2111021340 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.156
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
 2001301109 metadata/md5-cache/sys-libs/fts-standalone-0.2-r1
 2001301109 metadata/md5-cache/sys-libs/queue-standalone-0.1-r1
@@ -57873,9 +57894,10 @@
 2110301039 metadata/md5-cache/virtual/httpd-basic-0-r4
 2110301109 metadata/md5-cache/virtual/httpd-cgi-0-r4
 2110301109 metadata/md5-cache/virtual/httpd-fastcgi-0-r3
-2111011109 metadata/md5-cache/virtual/Manifest.gz
 2111011109 metadata/md5-cache/virtual/dist-kernel-5.10.76
 2110312140 metadata/md5-cache/virtual/libcrypt-2
+2111020039 metadata/md5-cache/virtual/Manifest.gz
+2111020039 metadata/md5-cache/virtual/rust-1.56.1
 2010091839 metadata/md5-cache/www-apache/modsecurity-crs-3.3.0
 2108190940 metadata/md5-cache/www-apache/modsec-flameeyes-20130216
 2108190940 metadata/md5-cache/www-apache/modsec-flameeyes-99999999
@@ -58078,7 +58100,6 @@
 2110192240 metadata/md5-cache/www-client/dillo-3.1_pre20181005
 2110241209 metadata/md5-cache/www-client/jd-2.8.9_p150226-r2
 2110261939 metadata/md5-cache/www-client/lynx-2.9.0_pre9
-2111011140 metadata/md5-cache/www-client/Manifest.gz
 2110312244 metadata/md5-cache/www-client/chromium-95.0.4638.69
 2110312244 metadata/md5-cache/www-client/chromium-96.0.4664.27
 2110312244 metadata/md5-cache/www-client/chromium-97.0.4682.3
@@ -58102,7 +58123,6 @@
 2110312244 metadata/md5-cache/www-client/luakit-2.3
 2110312244 metadata/md5-cache/www-client/luakit-9999
 2110312244 metadata/md5-cache/www-client/microsoft-edge-95.0.1020.40
-2110312244 metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.30
 2110312244 metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.38
 2110312244 metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.40
 2110312244 metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1047.2
@@ -58132,6 +58152,8 @@
 2110312244 metadata/md5-cache/www-client/vivaldi-4.3.2439.63
 2110312244 metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2457.3
 2110312244 metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2465.3
+2111020039 metadata/md5-cache/www-client/Manifest.gz
+2111020039 metadata/md5-cache/www-client/microsoft-edge-beta-96.0.1054.8
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
 2012281255 metadata/md5-cache/www-misc/profile-sync-daemon-6.31
@@ -58333,13 +58355,13 @@
 2110241939 metadata/md5-cache/x11-base/xorg-proto-2021.4
 2110241939 metadata/md5-cache/x11-base/xorg-proto-2021.4.99.2
 2110242039 metadata/md5-cache/x11-base/xorg-server-1.20.13-r1
-2110242039 metadata/md5-cache/x11-base/xorg-server-9999
 2110241939 metadata/md5-cache/x11-base/xwayland-21.1.2-r2
 2110241939 metadata/md5-cache/x11-base/xwayland-21.1.2.901
 2110291039 metadata/md5-cache/x11-base/xcb-proto-1.14.1
 2110291039 metadata/md5-cache/x11-base/xorg-proto-2021.5
 2110291039 metadata/md5-cache/x11-base/xorg-proto-9999
-2110310209 metadata/md5-cache/x11-base/Manifest.gz
+2111012239 metadata/md5-cache/x11-base/Manifest.gz
+2111012239 metadata/md5-cache/x11-base/xorg-server-9999
 2012231444 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
 2110242039 metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
 2110242039 metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
@@ -58376,13 +58398,13 @@
 2110242039 metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0
 2110242039 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
 2110242039 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0
-2111010910 metadata/md5-cache/x11-drivers/Manifest.gz
 2110311609 metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
 2110311609 metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
 2111010910 metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.05
 2111010910 metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.01
 2111010910 metadata/md5-cache/x11-drivers/nvidia-drivers-470.82.00
-2111010910 metadata/md5-cache/x11-drivers/nvidia-drivers-495.44
+2111012110 metadata/md5-cache/x11-drivers/Manifest.gz
+2111012110 metadata/md5-cache/x11-drivers/nvidia-drivers-495.44
 1702282335 metadata/md5-cache/x11-libs/gtk-mac-integration-2.0.5
 1706300138 metadata/md5-cache/x11-libs/libtinynotify-cli-1.2.1
 1706300138 metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.1
@@ -58517,7 +58539,6 @@
 2110310309 metadata/md5-cache/x11-libs/libxcvt-0.1.0
 2110310309 metadata/md5-cache/x11-libs/libxcvt-0.1.1
 2110310309 metadata/md5-cache/x11-libs/libxcvt-9999
-2110312244 metadata/md5-cache/x11-libs/Manifest.gz
 2110312244 metadata/md5-cache/x11-libs/fltk-1.3.5-r4
 2110312244 metadata/md5-cache/x11-libs/fltk-1.3.9999
 2110312244 metadata/md5-cache/x11-libs/fltk-1.4.9999
@@ -58560,9 +58581,7 @@
 2110312244 metadata/md5-cache/x11-libs/libyui-ncurses-2.48.3
 2110312244 metadata/md5-cache/x11-libs/libyui-qt-2.47.1
 2110312244 metadata/md5-cache/x11-libs/pango-1.42.4-r2
-2110312244 metadata/md5-cache/x11-libs/pango-1.48.10
 2110312244 metadata/md5-cache/x11-libs/pango-1.48.5-r1
-2110312244 metadata/md5-cache/x11-libs/pango-1.48.7-r1
 2110312244 metadata/md5-cache/x11-libs/pango-1.48.9
 2110312244 metadata/md5-cache/x11-libs/qtermwidget-0.17.0
 2110312244 metadata/md5-cache/x11-libs/qtermwidget-9999
@@ -58572,6 +58591,9 @@
 2110312244 metadata/md5-cache/x11-libs/vte-0.64.2
 2110312244 metadata/md5-cache/x11-libs/xapps-2.2.1
 2110312244 metadata/md5-cache/x11-libs/xapps-2.2.4
+2111020010 metadata/md5-cache/x11-libs/Manifest.gz
+2111020010 metadata/md5-cache/x11-libs/pango-1.48.10-r1
+2111020010 metadata/md5-cache/x11-libs/pango-1.48.7-r2
 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/bblaunch-0.0.3
@@ -59458,12 +59480,10 @@
 2109040224 metadata/md5-cache/xfce-base/libxfce4util-4.16.0
 2109040224 metadata/md5-cache/xfce-base/libxfce4util-4.17.1
 2109040224 metadata/md5-cache/xfce-base/xfconf-4.16.0
-2110312244 metadata/md5-cache/xfce-base/Manifest.gz
 2110312244 metadata/md5-cache/xfce-base/exo-4.16.2
 2110312244 metadata/md5-cache/xfce-base/exo-4.17.1
 2110312244 metadata/md5-cache/xfce-base/garcon-0.8.0
 2110312244 metadata/md5-cache/xfce-base/libxfce4ui-4.16.0
-2110312244 metadata/md5-cache/xfce-base/libxfce4ui-4.16.1
 2110312244 metadata/md5-cache/xfce-base/libxfce4ui-4.17.1
 2110312244 metadata/md5-cache/xfce-base/thunar-4.16.10
 2110312244 metadata/md5-cache/xfce-base/thunar-4.16.8
@@ -59477,6 +59497,8 @@
 2110312244 metadata/md5-cache/xfce-base/xfce4-settings-4.16.2
 2110312244 metadata/md5-cache/xfce-base/xfdesktop-4.16.0
 2110312244 metadata/md5-cache/xfce-base/xfwm4-4.16.1
+2111021340 metadata/md5-cache/xfce-base/Manifest.gz
+2111021340 metadata/md5-cache/xfce-base/libxfce4ui-4.16.1
 1910102139 metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0
 1811152009 metadata/md5-cache/xfce-extra/transd-0_p20120503-r1
 2007041609 metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.1
@@ -59534,4 +59556,4 @@
 2110312244 metadata/md5-cache/xfce-extra/xfdashboard-0.9.3
 2110312244 metadata/md5-cache/xfce-extra/xfdashboard-0.9.4
 2110312244 metadata/md5-cache/xfce-extra/xfdashboard-0.9.5
-2111011639 metadata/md5-cache/Manifest.gz
+2111021509 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 861352fe2a3f..7ba8ad97745f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Nov 2021 14:30:01 +0000
+Tue, 02 Nov 2021 12:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 11bc40bcaafb..55555004a315 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f10f89b9ae4f9ce6b0fedb3c0644763f931f9222 1635771988 2021-11-01T13:06:28+00:00
+1dd44a845582422974f388682ef490b3c546313f 1635853186 2021-11-02T11:39:46+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1dd063894bdb..f5a39201fa35 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1635775501 Mon 01 Nov 2021 02:05:01 PM UTC
+1635854701 Tue 02 Nov 2021 12:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d225ab347201..c804de900358 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Nov 2021 14:39:17 +0000
+Tue, 02 Nov 2021 12:09:13 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 4997769343c2..b22be118ec5b 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 104580e59aa7..1cb00e05c613 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -263,13 +263,13 @@ DIST zabbix-5.4.5.tar.gz 24324118 BLAKE2B 3144b58d6dc3fc12d114cdd138219d071afa74
 DIST zabbix-5.4.6.tar.gz 24371783 BLAKE2B 3be879a9b0452f2ee1b36c94511d6ee1a79214f14f3e9438da0035f258c70b190671e9991b0691209be9440b0103ec10a8c2a6cc4f3304a4638ebce0d8eb58a7 SHA512 4ca755bd715d5ba70cfe99894351cdf8ee82e8e8b2316fa7b95c083b9f13e6b3d986d87a52f157b00271bed7edaede5cdda020ca43015d7cf848f51ed169089b
 DIST zabbix-5.4.7.tar.gz 24424262 BLAKE2B c89bdd91ad8702d1edb60288013447aee910822d5a877a348f8770e4573906569393bb3e12a1b050f8550f8f5ac35308ec35795c2a1334ada5230c6e72b48286 SHA512 f87fd158d74c289765ddc3394bfa1c009d72d2756596c2060d567b5e44123594f00307f4df28a67b38c0e59a9d26f7d064afe73e7a3a0bd4e9bc02529334b1d1
 EBUILD zabbix-4.0.33.ebuild 9601 BLAKE2B d7a7dae9b4a10c5010b56f10929b5d8eaf047d2bb89cbf74164de8045ef0d7f85220ae66e155924f197da1ecd9a2f2cd4e5236d9100f78a2a7cdc120a3cf5b74 SHA512 0488a771c886f35e1be321ad9b32845149131347f21ec34c9e3a8826cbd9aefd41c08cc359447b1ed5e1265017f81adc3aca629dd2779f269ad6d208e06fa6b6
-EBUILD zabbix-4.0.34.ebuild 9603 BLAKE2B 710091e33a13efa1aa26faacf94f2ab8453a03e83039c7f8ab615f30df820a1ae0973e58c78623661d2e2d18c1d04b88ceefb0f085bf7d160385c816f07045f7 SHA512 f378e43a9a92a5bdb26fd20ad91246a640c879a413ffc77a3d6feba5c936574cd7dc66be20f0b5cc8683fab282e310a0b461bd5ef04ea289aa7273c1f2a733f3
+EBUILD zabbix-4.0.34.ebuild 9602 BLAKE2B fd9c46e3bffd0d87759789d14294460189dcde08b80f428e290887d55157b97dd52a8a960497cfaebe5fa2f9d95bc18ed50004c802a4394ba4ae040d1ac31903 SHA512 1b489958b5e77b5a2f217f95fb744233b5bac5fea38d75ffb6b1f0255cb5e01df0dceef5bb02e7b4250cc6667f4e163f08c29de74cf8d33e3b325b0ec3d1981c
 EBUILD zabbix-4.0.35.ebuild 9603 BLAKE2B 710091e33a13efa1aa26faacf94f2ab8453a03e83039c7f8ab615f30df820a1ae0973e58c78623661d2e2d18c1d04b88ceefb0f085bf7d160385c816f07045f7 SHA512 f378e43a9a92a5bdb26fd20ad91246a640c879a413ffc77a3d6feba5c936574cd7dc66be20f0b5cc8683fab282e310a0b461bd5ef04ea289aa7273c1f2a733f3
 EBUILD zabbix-5.0.15.ebuild 31366 BLAKE2B 55a203eb225ea619a1dd41b97028dd35d53fd4ca5e5db6aa5427850b80ea3bda1b0b2af4516e95431123e29446200c6d4558bba35ad18d789fb90a14936f6ea6 SHA512 5a8bcea6d75cedfa930412c5046b7cf276cbea09916efdb26658b1d72fdcc3e93a6e08de7282e86d9e4afabc1a86f4efc3955bd291ef135e9f460df306263f19
-EBUILD zabbix-5.0.16.ebuild 31368 BLAKE2B 970b69ea6fa00d40041127080dc2832c3dd1a20a908526d2457a3f9427e94d8ffdc418e8d53b541da3e30e7a38fca2d16243ebae398a9395493e25fd08aa0ccd SHA512 ad7a801aa6d36ca036dddc4e8b13eba2994f1d2dafef6adb6612f46c7b262cb61d25a3b789d6da23a312483effbe2d919bea04ed39ddf8beda241ca93defe471
+EBUILD zabbix-5.0.16.ebuild 31367 BLAKE2B 0a29416906d1b50c7da570ebd34ac68db17bc90f1fb9f2d9a54bdf24fb2efb461d1c391ef744613211b023a3de494781af1412591d5cb69f061bba669d84f65d SHA512 dd80fbdac354638fb7624c6dbc3b101984b10c56b0019e06069995379995b85f6a70a1bb5b49f4560ddc91e7186fe21473d5be57874cdbd3f96655612f4a5dcb
 EBUILD zabbix-5.0.17.ebuild 31368 BLAKE2B 970b69ea6fa00d40041127080dc2832c3dd1a20a908526d2457a3f9427e94d8ffdc418e8d53b541da3e30e7a38fca2d16243ebae398a9395493e25fd08aa0ccd SHA512 ad7a801aa6d36ca036dddc4e8b13eba2994f1d2dafef6adb6612f46c7b262cb61d25a3b789d6da23a312483effbe2d919bea04ed39ddf8beda241ca93defe471
 EBUILD zabbix-5.4.4.ebuild 33756 BLAKE2B a61e42b825891c6e2d5bbe38e6b7cc4b43e791904af43b5d52843bbdb9482efc67e632df0b93c9cf5d700a3cc8158ebf61b66c7c7612351ecc4c281f25771969 SHA512 6be0da5265e003821b45209d86863fd1fd9404ca1e3a4faa65b7db71b62fc862f23d06f8a1004dc0a1ff88f41db89af99e85cf849bfc52c66a2303ae2567f811
-EBUILD zabbix-5.4.5.ebuild 33758 BLAKE2B b1a66bde6ef709643cfd1f9d3545c1c8cdddc74d10e1977ca0ff45b87beeee72e182a3185105e3c630be0353f3f6c121246b97154760a964a7895f5c2e92516a SHA512 bff80821affda6f2fee97e1c007dddb3b0090a60c5d5c32f6a782b4ceb0bcbf6ee97579cef965b6aa6284257ce4ca10d466be74b94610d5f955ab3fe2ec9a044
+EBUILD zabbix-5.4.5.ebuild 33757 BLAKE2B ec9519bbda39d9cab1035f1041d3ff3fca365214c78e3b8f74ded8a4f9ebdfa7034e9d4cf217ef8976bd3c619676e23e33189544cf2a60f3f0176699c70766ce SHA512 f625e2d46e6e766d062fcd1c35c04dfa976aa7a9ec57f556dc57a91c84027d7b97d906de2c6a508ec80ffa58ed81b6ce3e7b7fdbb914131201c65be0fbf9197f
 EBUILD zabbix-5.4.6.ebuild 33758 BLAKE2B b1a66bde6ef709643cfd1f9d3545c1c8cdddc74d10e1977ca0ff45b87beeee72e182a3185105e3c630be0353f3f6c121246b97154760a964a7895f5c2e92516a SHA512 bff80821affda6f2fee97e1c007dddb3b0090a60c5d5c32f6a782b4ceb0bcbf6ee97579cef965b6aa6284257ce4ca10d466be74b94610d5f955ab3fe2ec9a044
 EBUILD zabbix-5.4.7.ebuild 33758 BLAKE2B b1a66bde6ef709643cfd1f9d3545c1c8cdddc74d10e1977ca0ff45b87beeee72e182a3185105e3c630be0353f3f6c121246b97154760a964a7895f5c2e92516a SHA512 bff80821affda6f2fee97e1c007dddb3b0090a60c5d5c32f6a782b4ceb0bcbf6ee97579cef965b6aa6284257ce4ca10d466be74b94610d5f955ab3fe2ec9a044
 MISC metadata.xml 1520 BLAKE2B 4f9851bc026e8d1aaaec68b21be3709972dad92e8b9d6bfa6de5cbac63dc324d74784284fab88227983d77526b21f7b17350f69cff3ef57db3608320b5bc7e7d SHA512 4f60c01cddfa125905c5623e56fed3194fbbc927ba2a5880618bd423f21ce52f910a5dfffdd4204734b0ce8fcb304b1deb77884a0150cbb9c94b386c4db48023
diff --git a/net-analyzer/zabbix/zabbix-4.0.34.ebuild b/net-analyzer/zabbix/zabbix-4.0.34.ebuild
index b4467228139f..7c9038c1e172 100644
--- a/net-analyzer/zabbix/zabbix-4.0.34.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.34.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	ssl? ( ^^ ( gnutls mbedtls openssl ) )
diff --git a/net-analyzer/zabbix/zabbix-5.0.16.ebuild b/net-analyzer/zabbix/zabbix-5.0.16.ebuild
index 919624122741..2c7af60f22d5 100644
--- a/net-analyzer/zabbix/zabbix-5.0.16.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.16.ebuild
@@ -234,7 +234,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
diff --git a/net-analyzer/zabbix/zabbix-5.4.5.ebuild b/net-analyzer/zabbix/zabbix-5.4.5.ebuild
index f1795467d2f7..7a6561b22b25 100644
--- a/net-analyzer/zabbix/zabbix-5.4.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.5.ebuild
@@ -259,7 +259,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 88c6ad8083d2..425fcee6c02c 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index 65541f2b4058..4cc4ab031c63 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -1,5 +1,5 @@
 AUX linux-atm-2.5.2-headers.patch 646 BLAKE2B 1a1280f70c9232ddc39b664e1a533258c6bf7a05017f471544d442b69a9f9b73775d914b1433359adbcc571218207ec7413e2a64e67432489a8b417251b32e3d SHA512 4248a0063de9723ca6a3abdd07c5c3f4bda5a43f21bb5d19f931e898abd3e10f52b20c9d1a21415a17bee70ac6bdba83e13704f2a7c5489fb12d6e93a5a8e113
 AUX linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch 1204 BLAKE2B 26fb42c7c49a56cdb238d22ab65096e7db684550f0f27c208262a2b2b73f790aa3bf4cea65bab176317c444deaf58a4a717e8a83cdb5d2f59474aa6cec814a23 SHA512 0ded21ca8f7f49522611c76d2c161d5f5e2dceeeccf29241d97b57154addd53e0e0101a7ecea648251e264ee88096313dff608b0bd46c53b140be02a4f2cedff
 DIST linux-atm-2.5.2.tar.gz 1082256 BLAKE2B 329aad437a1e6a17fd7d7d2b81c976a76c684aaf127006ed3af1e998a0f52df056747cc84fc13c933dc15c07246f1f00e4ff101ac98ef1dd1bea102830a83625 SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08
-EBUILD linux-atm-2.5.2.ebuild 970 BLAKE2B 0b7ca699f9afd282e48d15f80e9702fe34f2215e8cc43199409c9d3be3929afa581dcf68ee58bac106c44aaca80c7de063fd3d602c9b152ec71a2d19a172d496 SHA512 4d725564cd8b71b88777ed4660ca4312a2cf1edab080082d38a42fde1ce95f608f7b8257bcddfa02393226c6169a535b9384b2a8ef53de1e28276bce4303a351
+EBUILD linux-atm-2.5.2-r1.ebuild 858 BLAKE2B 89e4b18c8e31b7d40ddb356defca2c63ad73e888b7419c8c06fb02bb9853bb73a8ab6005066bef9b5514257ba049e6f6e75279cb9276ddba8a0ea8d6362810cc SHA512 296a319ea45e463f049135ed6b6260380de83815e13951a0fc3e18f4ff1592248f03fb32ba4edd933a725b8964f17c192f255d3319e3ebc544a4221ee145b917
 MISC metadata.xml 252 BLAKE2B 4c79277393da1a02ac043b9d841dcc909664173a4ce14b43399e1912bba3f7521663f15e451e33e85c0b882fc75ec41081967175b1312958b3d739545bb986ea SHA512 676904ba24fe77c0a1ea25c83145ca555f79117628037d23e0b0883c2a77b6cc42bdd8e2d4993b0e8864fdf362faadf642a0873cbfc15c5ece7200e3938837e2
diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
similarity index 68%
rename from net-dialup/linux-atm/linux-atm-2.5.2.ebuild
rename to net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
index 4197658ac869..4c27be104939 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch flag-o-matic libtool linux-info
+inherit autotools flag-o-matic linux-info
 
 DESCRIPTION="Tools for ATM"
 HOMEPAGE="http://linux-atm.sourceforge.net/"
@@ -12,31 +12,30 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs"
 
-RDEPEND=""
-DEPEND="virtual/yacc"
+BDEPEND="virtual/yacc"
 
 RESTRICT="test"
 
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS )
-
 CONFIG_CHECK="~ATM"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-linux-5.2-SIOCGSTAMP.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-headers.patch
-	epatch "${FILESDIR}"/${P}-linux-5.2-SIOCGSTAMP.patch
+	default
 
 	sed -i '/#define _LINUX_NETDEVICE_H/d' \
 		src/arpd/*.c || die "sed command on arpd/*.c files failed"
 
-	elibtoolize
+	eautoreconf
 }
 
 src_configure() {
 	append-flags -fno-strict-aliasing
-
-	econf $(use_enable static-libs static)
+	econf
 }
 
 src_install() {
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 41b71105b92d..b0644799ae15 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index c20dd850de2a..488fc6e7fbcc 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -9,7 +9,7 @@ DIST dnscrypt-proxy-2.0.45.tar.gz 2721610 BLAKE2B cddeafec2a2fa8179b722a1b4fe852
 DIST dnscrypt-proxy-2.1.0.tar.gz 6248378 BLAKE2B 6b0db8eae8bd380634a86ee2026fb6a3f64d0874a77633f9b8ef46bd37601ebf8d9163516b5ccc371d5354023d5c5c542384718aa885dd1f99809a7b98df5de2 SHA512 201a2741f4703872901fa9c045323444d2939d662316e0026f7aa33c7136e45a564225106884ed80522be5247e128c70ced176c83333ddaacc66dc0f87c74029
 DIST dnscrypt-proxy-2.1.1.tar.gz 6114345 BLAKE2B 9d68d94d1fc142d53ed74840080feca56d7abf606b8df9b2ebea7a69b75f13cdc93be53418e6101d30d31d6f4130b3794c1029a5972e129a4c06feeff7dd81e7 SHA512 1118d79aad8d3e3629616c203194a5346f00fcfe88783ebddc6f167d22a82006f26022e728c57905aa82997b87b77f0841f7c1b60e0f8e5335f9df142b759c21
 EBUILD dnscrypt-proxy-2.0.45.ebuild 2832 BLAKE2B 1f4f1532670c887f22fd04cbaef47abcafc658d29a66ee2e662d030e1c9fad54c558d7ee4546af940fc72b7e4d7b0f22d7d71466899264726fdc8fca5a641d2f SHA512 ec71d789ef81d3dd5b90fa5b8dc436242525c6d95b2ebd12e6ae1a653da69a5bc403f19753566c992c205a94214caccf2ba8c6fc41b8e1a5e0d422f4d512b4db
-EBUILD dnscrypt-proxy-2.1.0.ebuild 2833 BLAKE2B 736cc68e0f8d7d98aa4d3a98dbcd64a56138b91921e8a899f5c3bf7622840ddfd2b5e9350c63576e337f54a4b5386385eb87058fa1cdfea3dcee652819acec1e SHA512 35bac5465c345aa6558d3882d73c053b08b920286ed86ac9417a927ad5cdaad130c32c5d12a74d19243f6bf7d344725631ce918e0ade59feac3812d6aa62af05
+EBUILD dnscrypt-proxy-2.1.0.ebuild 2832 BLAKE2B c6fbb2c3e2f802216d42e9b8a53a678c7d48f8345ccca63e6a5fc038634f2c93b3765db249a5da192b38936f72550598bb633223c46ca6b476fbd9bd490ec9bf SHA512 79e14527d18eb85ad2c7ee76d3033e70e67ac1f1f33fce6344bfe8765539320b23ce8787d7fbd88f5496a890e1399a12251407c25b28e53cbdff478e1d32d2c0
 EBUILD dnscrypt-proxy-2.1.1.ebuild 2832 BLAKE2B c6fbb2c3e2f802216d42e9b8a53a678c7d48f8345ccca63e6a5fc038634f2c93b3765db249a5da192b38936f72550598bb633223c46ca6b476fbd9bd490ec9bf SHA512 79e14527d18eb85ad2c7ee76d3033e70e67ac1f1f33fce6344bfe8765539320b23ce8787d7fbd88f5496a890e1399a12251407c25b28e53cbdff478e1d32d2c0
 EBUILD dnscrypt-proxy-9999.ebuild 2837 BLAKE2B 22085dcfbe06de07c55afd2bc405f5e7bf5325f941175db34331c42c75d589c0db9b8ee1bc8930e16c7667f9afcbc3c3f8d6eea912653d349ac4bedf5f68b991 SHA512 9c924e578eb2870ace30ad932ae050df222af11988b8dd518e49d7321d79d884252a8847909b84f12244a76869a28c83403a7a8d7030fe4ccb8f3ea3df35512b
 MISC metadata.xml 619 BLAKE2B b8c10931edf8899ef018fc5f9605d3aad94ec2a48cce361ff04f2048d4e8cfd8de1ebff181fb968822e498d85178e3ed412726d3321f06a240eafbfc55b85b3b SHA512 268ab4c1a07bc15039c382586a575cecce6797bc452b635d7ebbd1806f789b8c154eb75164f58e8d9c87f0add8f99000c9dc75959328ad24f0f2c63bf6bd2f1d
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
index 8266eb0e7c1f..2f8f698a764a 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 else
 	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
diff --git a/net-dns/fpdns/Manifest b/net-dns/fpdns/Manifest
index 6de18b6c3a2f..2d56765fec67 100644
--- a/net-dns/fpdns/Manifest
+++ b/net-dns/fpdns/Manifest
@@ -1,4 +1,4 @@
 AUX fpdns-0.10.0_pre20130404.ro-header.patch 1115 BLAKE2B d8042816acce161ba4e19533700151489f3a169fb96a11d4eb44b107818fe0eab87cb916b4e8d5d2a45e22c82693517d069c6e12095b415b352d40384a9040db SHA512 e345037a210103f5202c0dd052952bd2d3889ad53393fc4881ec48810f3e6d39b1b7d2220d259ffda0b85e339bcc4ef9f1ae28023cf84b81a00685c66e116923
 DIST fpdns-0.10.0_pre20130404.tar.gz 931723 BLAKE2B cab459afee74ef5d8163a25b98c123b799270e6d3293f155a340ebdbfbc86266fbffa999d31928c9b1a732898b0adf4a49e97469f9ae992a0e38f9478431e84c SHA512 1a4d9c1cb666efa3f48dcca2b5cd04793e92727359652095572b17479f5343479c57d2937f1fff8070c071a2698eda5c4dff981caf86436f184f0b076b0fa0b3
-EBUILD fpdns-0.10.0_pre20130404-r1.ebuild 682 BLAKE2B 2d4c6cda36b6d6f87c7e23e4c0255a39801e596a759c9ae49a6a2d5d69ea1f2be7ba03f1fbd1e17f436fd1daf07d3cc9b7ee1999db854c3afc0578ad1e0ff80e SHA512 102c2bf43f52c3788cde71e9bfbb0b8aa07838d96299273f9137ec4812e9295fe0525247784ce750b20297ecc99811d18c452e9c31eb2240d106eb721d926269
+EBUILD fpdns-0.10.0_pre20130404-r1.ebuild 585 BLAKE2B e65b3bcb59605233edf82566bd02b28e858f2398bcc1d6984eb6713b567d9bf450ac976497c07c6d6129c6806e900477c862471eb5799c2a675c85822079d4da SHA512 99ded2a507030ff035b56945576f965473ab9e4ed6fde789dd79808978a96626ee087018c0b600d969d509820ff63eaf8e64bb9c3d96b6d3ff648d74313c1854
 MISC metadata.xml 1421 BLAKE2B aa284dbfc1b37ec2da8254b22242b872198de6a84940075cafc023d25e31a552c150f47b3eeac9d1d57ed6307ba71774733c3dcac5a8d6342a221c77de660086 SHA512 2f174a68b6bdbd47c32645b0faa408b51a2bfaa4869c3e32498aeb9311d7b9d4de7dd598b63858b1b4fef283172728f23beb9ae1812b5937420e96fbe7718388
diff --git a/net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild b/net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild
index 41acf92d3609..69910304830a 100644
--- a/net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild
+++ b/net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild
@@ -1,33 +1,28 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch perl-module
+inherit perl-module
 
 DESCRIPTION="Fingerprinting DNS servers"
 HOMEPAGE="https://github.com/kirei/fpdns/"
-
 MY_P="${PN}-${PV##*_pre}"
 SRC_URI="https://github.com/kirei/fpdns/archive/20130404.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/"${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
 RDEPEND=">=dev-perl/Net-DNS-0.74"
 
-S="${WORKDIR}"/"${MY_P}"
-
-src_prepare() {
-	## fixes https://github.com/kirei/fpdns/issues/6
-	epatch "${FILESDIR}/${P}.ro-header.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}.ro-header.patch
+)
 
 src_install() {
-	newbin apps/fpdns fpdns
+	dobin apps/fpdns
 	insinto "${VENDOR_LIB}"/Net/DNS/
 	doins lib/Net/DNS/Fingerprint.pm
 }
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 07356409b689..2c03a1834087 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/sendxmpp/Manifest b/net-im/sendxmpp/Manifest
index 6bddb1c8dd8d..3b26a3a894e8 100644
--- a/net-im/sendxmpp/Manifest
+++ b/net-im/sendxmpp/Manifest
@@ -1,3 +1,3 @@
 DIST sendxmpp-1.24.tar.gz 9657 BLAKE2B c1dbf65c031d7178b996b4309cab149038774c40aa903185d99f1cf26c9a803b623d5a72e3991e30c929b9f236d7cfe2e2828e92b1f135e7e791e001d58142e1 SHA512 349aac46ad4e13836f797f953d1acb33014d66de2bebed4961bcd981b765b5f0014bd2291a7355f0f8e80db522e3e843088fe08c0a21d4dda360dc2834db4842
-EBUILD sendxmpp-1.24.ebuild 489 BLAKE2B 610f72ed8dd85aabc0ea557daa8715db2c098b9f37094ed1dfd3f1da9de4235941f825f787df46e2902bf8ebca11044ef0572988a8ead7e08f01192492e79fc0 SHA512 de4330df45856ca79e2f7afc972f53e92878e07704b751c361d9521500212edf810c2974a8e1b0f97b027c69a801e721ee5ecec09e5813719ab622ef9dfac49e
+EBUILD sendxmpp-1.24.ebuild 481 BLAKE2B 4a7027367e7a2d2d4e72d88df5c55d60ae8cf32850eeb4f1f28dfdf6016a039f1a7b8391e125aa31372b6f7975a49f9dd493ac85c8f9b15c503e49439d49b1c4 SHA512 763992e2364d131a35dc8fd4d9f6a381fddaa4906f0a1994ee008caf857d1bf1b515b81e0cd516a11f3f9a2fdc4a683401fd979e915c1974590520bea5d53566
 MISC metadata.xml 247 BLAKE2B 52a582a0592a9dd744dd4c163a7506a6572153436c4c1ae91e8d89a178ea90fe3b473e409ee4f18293113154db6d3ae31ccac56955fab8cda516c3f80afe637a SHA512 4691fd9244c82439aea871a7292d18145a5b22cdf342e9f0fd77718864ee5838d1414496b7a8f3c1d5c35c8664c5bbe69d4fd8606b263dcd9fc73dd7e38d0867
diff --git a/net-im/sendxmpp/sendxmpp-1.24.ebuild b/net-im/sendxmpp/sendxmpp-1.24.ebuild
index 29dad73f0f51..f170e4a2625c 100644
--- a/net-im/sendxmpp/sendxmpp-1.24.ebuild
+++ b/net-im/sendxmpp/sendxmpp-1.24.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit perl-module
 
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/lhost/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc sparc x86"
-IUSE=""
 
 RDEPEND="dev-perl/Net-XMPP
 	dev-perl/Authen-SASL
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 34b73f8e5590..03b8e787753b 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -2,10 +2,10 @@ AUX tdesktop-2.9.3-add-libdl-dependency.patch 615 BLAKE2B f87d48b6c36116bad13f4f
 AUX tdesktop-2.9.3-jemalloc-only-telegram.patch 988 BLAKE2B 487ce32454a5bfb51a081c7bd6803ff6cc956b349569d5ddf17d2abb7d7d5f0714002de654e149d8aefe6880e6b827c2ffb42c22e3ffa3fc6f10286c3e805463 SHA512 a1645bac4b715bad17a78226b9e76e30117f64715b1833df17950c882940a2ebbf18c70ab9ec628002408859292b57b9c4a48f9212bd15d9d2903867012eb3cf
 AUX tdesktop-3.1.0-fix-openssl3.patch 641 BLAKE2B 0354e0c8931311e5b6561c601cd0e78d436aeda53f14332803484b278fe60c90fa74e761ac005f79d6f44f18053fa870dc9246de1ab6e63986d7bf9b7214e12c SHA512 cfbf1798a290674e1f4589db1f5f43e61a6c691c19d936090ec9b7396e6cb720aa86b86cfdbff197de68a8723c04a20e7bf858f8511b48cc8e7b924a8d6876ec
 AUX tdesktop-3.1.0-jemalloc-only-telegram.patch 1136 BLAKE2B 06811696df84c1648f63843e937d18542ec5185aee6c3fde99dcfabe982aaad49e97387910882e405ec0ec9e8a12bef615f6f920c7f603224bce347bbff3bf22 SHA512 59c3f508c4be10e182fca52e4069e88af8cd26d150625dbe14214e505f9a5461e1492450896b1e9e229444a4f403eff43e4066d7f0c866bc9631c76f2c1f847e
-DIST tdesktop-2.9.3-full.tar.gz 37335782 BLAKE2B 197583ba6568c455218c51f590c1ba1a3f10c390caa4fd03657098f499ce113a4f5f57ca9dd53bc4baba31992d4229768ed35e68ad6b0685010bc335817edcac SHA512 810cfac5d7e6ce9413b1b2406927e89c1383ea5b725233a68b2cb29dd374b4c3386c22186640afde4492c844516c88889a5db8e5b167a09d6d6c1270ac965ac4
 DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447
+DIST tdesktop-3.1.11-full.tar.gz 38541579 BLAKE2B 0c0c5d9591a6f517d3859ecc1bc6a8410c76a46b03db7267dec3354d54382c590bda86aff46e4cda518a512ae5539815553defc8b4b20929894324fee876b826 SHA512 7d67f2895797d4f7f1edd5e5e7e8509044fad5d5cfe6bbdb5613689da9519dab2fde707a452aad6788193addf84f2ebcc69342955607e0be8507397c22557709
 DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09
-EBUILD telegram-desktop-2.9.3-r1.ebuild 4378 BLAKE2B e93eb591dfb85de579398166b565d473d51edcbe5da9463b6e495ef4190574780ad626e5542019a032dff09de4fed94eb35f2029ae3860ad700eb6451093d45e SHA512 6f2b955352ad244d39286af4c1001e4bb67101d4dd9fa42bf338ac90cc5c15ae3f8b6fb09f8a955a447b5f13e963f4ac33624e3c5197e36936fabdb8e6bd8dc0
 EBUILD telegram-desktop-3.0.1-r1.ebuild 4374 BLAKE2B 1bec2055cdc156572815286d0050aeacd2c388a7cd62d3b60af8140902c0b2dec0ba03a64c8ecc8e143949bcaafe24c84a4e3c79b90593c6246129ff0f60db7d SHA512 754094c452ce7c7e81034c816bab884a6b95f092e619f5774fe887fd4627db0209198e9ef666ed174ee22a3aae78f17c3373c2556c14ef94bca41a7688a90487
+EBUILD telegram-desktop-3.1.11.ebuild 4359 BLAKE2B 7410ce5fa9f3d8548525dd6b38d6eaece35cfdf3986e8c0f076139fe2d581736b3ee1d94a5138043ac8389faa530621b0a5e38438075d9751347052cb83d051a SHA512 49464cdeff4d99bbab809b66f742d5851c19bab0fc3d809067571da45a6ac3960277da168bed539a374cf17057cb9169146a18ca847558676339540feac7f433
 EBUILD telegram-desktop-3.1.8.ebuild 4359 BLAKE2B 7410ce5fa9f3d8548525dd6b38d6eaece35cfdf3986e8c0f076139fe2d581736b3ee1d94a5138043ac8389faa530621b0a5e38438075d9751347052cb83d051a SHA512 49464cdeff4d99bbab809b66f742d5851c19bab0fc3d809067571da45a6ac3960277da168bed539a374cf17057cb9169146a18ca847558676339540feac7f433
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild
similarity index 86%
rename from net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild
rename to net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild
index eda146962285..65f4899c98bf 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit xdg cmake python-any-r1 flag-o-matic
+inherit xdg cmake python-any-r1
 
 DESCRIPTION="Official desktop client for Telegram"
 HOMEPAGE="https://desktop.telegram.org"
@@ -15,22 +15,19 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+dbus enchant +hunspell screencast +spell wayland webkit +X"
 REQUIRED_USE="
 	spell? (
 		^^ ( enchant hunspell )
 	)
-	webkit? ( gtk )
-	gtk? ( dbus )
+	webkit? ( dbus )
 "
-# Future: webkit doesn't depend on gtk anymore (version: >2.9.3)
 
 RDEPEND="
 	!net-im/telegram-desktop-bin
 	app-arch/lz4:=
 	dev-cpp/abseil-cpp:=
-	dev-cpp/glibmm:2
 	dev-libs/jemalloc:=[-lazy-lock]
 	dev-libs/openssl:=
 	dev-libs/xxhash
@@ -47,15 +44,15 @@ RDEPEND="
 	media-libs/openal
 	media-libs/opus:=
 	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20210626[screencast=,X=]
+	~media-libs/tg_owt-0_pre20210914[screencast=,X=]
 	media-video/ffmpeg:=[opus]
 	sys-libs/zlib:=[minizip]
 	dbus? (
+		dev-cpp/glibmm:2
 		dev-qt/qtdbus:5
 		dev-libs/libdbusmenu-qt[qt5(+)]
 	)
 	enchant? ( app-text/enchant:= )
-	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
 	hunspell? ( >=app-text/hunspell-1.7:= )
 	wayland? ( kde-frameworks/kwayland:= )
 	webkit? ( net-libs/webkit-gtk:= )
@@ -70,12 +67,13 @@ BDEPEND="
 	>=dev-util/cmake-3.16
 	virtual/pkgconfig
 "
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/tdesktop-2.9.3-jemalloc-only-telegram.patch"
-	"${FILESDIR}/tdesktop-2.9.3-add-libdl-dependency.patch"
+	"${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
 )
 
 pkg_pretend() {
@@ -105,7 +103,6 @@ src_configure() {
 		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
 		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
 		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
-		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk no yes)
 		-DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit no yes)
 		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
 		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
@@ -139,8 +136,11 @@ src_configure() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems"
 	if ! use X && ! use screencast; then
 		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
 	fi
+	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
+		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
+		ewarn "to crash when pasting big images from the clipboard."
+	fi
 }
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 366a1733c31f..5a205bd39b25 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 8ecebbeffdb9..df04963cb225 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,5 @@
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-1.7.1-r4.ebuild 2621 BLAKE2B 0585d412d07d38a2dd1744dbd539894c5a4e3d3391d5933464494420e1302cd7d935e39ae16d05bb12fcd9769cd2d1bd4ee15d2bf8e80132ab5ec95a83cd1b69 SHA512 26f81bb4f48a6c1f9f8ae7bf5fbcafc4fcddc1efbf14d34bfd0138cbb75449408731325bedc7179f093861e05696a518de3a7ad877cbf92c26110d3ed2a523d9
-EBUILD ldns-1.7.1-r5.ebuild 2620 BLAKE2B cf920b1aa508ec3cab165ff81cf0a0c804f28a118a2a573340831b073e178b0d2b8c28579c1723655fb46620a1c1b97040a68d25110771f398c101752c7599df SHA512 d613589fbc8170220eed5641378a326e916ecc71e2596cf97c0920399c76f81f928de03b5851a480f2637db5732ae53a27a0ed39c11a85f40430dcc493bc054b
+EBUILD ldns-1.7.1-r5.ebuild 2619 BLAKE2B 1409064f86a26ec111c24cc6e77d719fb18ce522964f16710535f1b3ecc7afdadb2c2769dc836e2b13d74182282a88676513425159d4d14055190099f13ba258 SHA512 2da17642e790b55170b91ae4a199707b8a32586b5bc8da0dde2615082fb96d46cc767167571b19fa7098638370c0b769dd6307ae74486584753a580b5709c2f4
 MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e
diff --git a/net-libs/ldns/ldns-1.7.1-r5.ebuild b/net-libs/ldns/ldns-1.7.1-r5.ebuild
index 4295fe850f95..222ef53fab5a 100644
--- a/net-libs/ldns/ldns-1.7.1-r5.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libtelnet/Manifest b/net-libs/libtelnet/Manifest
index 81914e006f74..e9c2557a2373 100644
--- a/net-libs/libtelnet/Manifest
+++ b/net-libs/libtelnet/Manifest
@@ -1,5 +1,5 @@
 AUX libtelnet-9999-doc.patch 1317 BLAKE2B 07293a3658b80cccb147a75279ae7f6b9843101a0414233db33d8e4a2b6fd47283dd35a69942aff2f52775c359b5acf67f739434d5161ba13ed84eca62c95c45 SHA512 de7aef7504a3243fe01bcc11a78bc274f8662dc6fa472a1b6ab8fb84a1a518491d2343e4dd9817e6dbb0ba67fbd68406fd85ce4d1ae6e4e6469b3f71c3594d99
 DIST libtelnet-0.23.tar.gz 241922 BLAKE2B 0436c3eb2085c0fc4262f30c86f634af33679a2381a54dbfe92e6f6196b825b100c9c35f78505191b7fea5360a16d9b960e35ff145cd177aaab50968b2fbe946 SHA512 da16a97d04bc6bb5959f431e0aaa03d08ac38e45ba870d7fe6161551ecfdbd5c37a2209cfb40a0f574e6ea0b5c2866c7461cc91d940d5bb5de09fe1584eeb780
-EBUILD libtelnet-0.23.ebuild 525 BLAKE2B b34c9786a5bbb01f4cdcf624affe9be4e869ca48bde96a94883f34edf15c5424799498a47da6f801c35b6273352197926d63467ca3274d5cbe3348f16f2b640f SHA512 73480b147a663b3a4ef29276ea3063dc74985f13f79f679cb40fb2ab71ed380cea4336a06bc021efa29fca4d5e6918f4c531b103de3d37c04ef43399ac6e4482
-EBUILD libtelnet-9999.ebuild 670 BLAKE2B b34ce45ad667eb5f3e545e498040148fda6160f06d6d98f983b32b389e358945fd2b145aea9a3cdb8d909ee82cdc389b8c440df33f86a5df24e75ba7f47b2eb8 SHA512 6b44868724045fd4df9157f86deeb84dfe06a1d08f5dcb3a0b524481129bb8ffba3d32f92913837486b4d6fe15df63ae2df09c51d46ba033cd62a4487840657a
-MISC metadata.xml 353 BLAKE2B 30680fa4eb79173565e1190cd9e82d70a45c15ad051364cfd868d0bf8ab26f47d71787e345d12ea295acfd5a9395a7703c6097986580196cf4097e4865eda72c SHA512 e7c3f99ca00e1f8505d8d5f9f0ba15f17ed14bbe97b2534e3a2702263b294acec136bfa74319f6a4a62d4cf33e6f6aa68b067264cd3617e948484eb27bc74cd7
+EBUILD libtelnet-0.23-r1.ebuild 770 BLAKE2B 32f8e7e2b9130376b99788877971661fe11a029ff7b45ac3cd357a0b30d6e08badb5c679b950c826ae6384ab46193fe6491179f7f85052b7b249b199456bcb2b SHA512 5e0c4672195566f713f892ac04b0650b446c2c67ee21753c845c9f1021a8cf437ef4978a290c893d5c0e1564fe21f8b8e611de1a4504fa4031fb54353ca1a183
+EBUILD libtelnet-9999.ebuild 770 BLAKE2B 32f8e7e2b9130376b99788877971661fe11a029ff7b45ac3cd357a0b30d6e08badb5c679b950c826ae6384ab46193fe6491179f7f85052b7b249b199456bcb2b SHA512 5e0c4672195566f713f892ac04b0650b446c2c67ee21753c845c9f1021a8cf437ef4978a290c893d5c0e1564fe21f8b8e611de1a4504fa4031fb54353ca1a183
+MISC metadata.xml 467 BLAKE2B c5b25d5401e3d66331eb41fa429cd1dab9c53ee7a1307f4bd5783da5e6ea82f997243e41146bc1f3ae182213becff59e2dd4c8835768a8086d68c17da07105ec SHA512 37b8e0154e334a4661efaf28b11b8ef9f4ba05a6d874f7ad146f62db208294349659ce693d7ae9dcae0536f97f99444fd9d753eb56d3e233da39a2f9cd803f75
diff --git a/net-libs/libtelnet/libtelnet-0.23-r1.ebuild b/net-libs/libtelnet/libtelnet-0.23-r1.ebuild
new file mode 100644
index 000000000000..bf00b8db2d1e
--- /dev/null
+++ b/net-libs/libtelnet/libtelnet-0.23-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/seanmiddleditch/libtelnet.git"
+	inherit git-r3 cmake
+else
+	inherit autotools
+	SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library"
+HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
+
+LICENSE="public-domain"
+SLOT="0"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-doc/doxygen
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	if [[ ${PV} = *9999 ]]; then
+		eapply "${FILESDIR}"/${P}-doc.patch
+		cmake_src_prepare
+	else
+		eautoreconf
+	fi
+}
diff --git a/net-libs/libtelnet/libtelnet-0.23.ebuild b/net-libs/libtelnet/libtelnet-0.23.ebuild
deleted file mode 100644
index 9577f3cce082..000000000000
--- a/net-libs/libtelnet/libtelnet-0.23.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library"
-HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
-SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.a' -delete || die
-}
diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild
index 9edf0466d6a4..bf00b8db2d1e 100644
--- a/net-libs/libtelnet/libtelnet-9999.ebuild
+++ b/net-libs/libtelnet/libtelnet-9999.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-inherit cmake
+EAPI=8
 
 if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
 	EGIT_REPO_URI="https://github.com/seanmiddleditch/libtelnet.git"
+	inherit git-r3 cmake
 else
+	inherit autotools
 	SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -19,10 +18,19 @@ HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
 LICENSE="public-domain"
 SLOT="0"
 
-# needed unconditionally for man pages
-BDEPEND="app-doc/doxygen"
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-doc/doxygen
+	virtual/pkgconfig
+"
 
-PATCHES=(
-	# https://bugs.gentoo.org/737886
-	"${FILESDIR}/${P}-doc.patch"
-)
+src_prepare() {
+	default
+	if [[ ${PV} = *9999 ]]; then
+		eapply "${FILESDIR}"/${P}-doc.patch
+		cmake_src_prepare
+	else
+		eautoreconf
+	fi
+}
diff --git a/net-libs/libtelnet/metadata.xml b/net-libs/libtelnet/metadata.xml
index c89666cddbfa..4ad42fec77ea 100644
--- a/net-libs/libtelnet/metadata.xml
+++ b/net-libs/libtelnet/metadata.xml
@@ -5,6 +5,10 @@
     <email>nativemad@gentoo.org</email>
     <name>Andreas Schuerch</name>
   </maintainer>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">seanmiddleditch/libtelnet</remote-id>
   </upstream>
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 57c73dae4a31..6816de867037 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 370bd5ae3c72..2ce80a27e6c7 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,5 +1,5 @@
 AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
-AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243
+AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
 EBUILD frr-8.0.1.ebuild 3538 BLAKE2B f4c2a6bc1901bc776f0266ece3a0daf04ab716b63a55c32e634f387e2482d18b3c1446785294fab12be08c1d97eb07f56dbcaad22bc20d354befa7c08489fee1 SHA512 4ebdd4c6bbf0770f7c478a1c85a47e8d78237d709240bdeaa7f4bace13ef0b59bc5bf715c899977ba8c712c63a1cf14685fd7e5056cddd2af254fe0e8de8a9d7
diff --git a/net-misc/frr/files/frr-openrc-v1 b/net-misc/frr/files/frr-openrc-v1
index 9e2f1ab914fd..3f9da62e2a18 100644
--- a/net-misc/frr/files/frr-openrc-v1
+++ b/net-misc/frr/files/frr-openrc-v1
@@ -92,6 +92,7 @@ _load_daemon_list() {
         for instance in $(echo $cdaemon_instances | tr ',' ' '); do
           watchfrr_daemons="$watchfrr_daemons $daemon-$instance"
         done
+	continue
       fi
 
       # Single instance daemon handling.
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index 86596fb563c1..f11e6ca2794c 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-viewer-3.7.4.tar.gz 281921 BLAKE2B dac2cbf76f3d0939f79fa875652680e197f41bf09769585894147dfe433db72a94d59309237f5ce5398753a39e2cf2cf83ae3f4f6987f5a4b49d806de2598e2c SHA512 4584821fb0ae3ec7e5f9c3b2e887b1fa158fb74a82be07698277e12d3762fd3b8f0557baddb9e08fe485f322b44b91adc2feaaba46227e0c519a516b54bbc4e8
-DIST youtube-viewer-3.9.3.tar.gz 258488 BLAKE2B 5c8a0fa3e01be483aebcdf3ccab1a1ed583398abadd038a5bf60f76b0b085363fb024c14b39c2223ed3c6027cf65a4b41552e518573f9eac3c09ebf4524edd3b SHA512 1be169858ac0c132b9142549ad63643c3c3bee543f745fbe811c911e6310d65cf9e6f0ff669c7666f2eb1a70592ad95236567301297b9c56726764e3c1174581
-EBUILD youtube-viewer-3.7.4-r2.ebuild 2409 BLAKE2B e40cbe61654ab2309d74cc01f6893abd23d86a7f011f7b6fe1459e972cb319bada728255c2c73dbd60c4d8ac22eee3a9b653d818381a460526edda6cd616bf67 SHA512 13f7d77c225edf71d7921de6b099378257f2436815911297a48565d32c1f5deee9ba08b85122151096754b089c7f836dc9a8a7fd07691c4b70e7f0db7f30b1fb
-EBUILD youtube-viewer-3.9.3.ebuild 2140 BLAKE2B f7cf0a2a840adc259be361603f2d5c248a0d1c7d2e9e6ec8d3ed55ea7a946bccfbdd00bbad0ed02d47ffa7d8c141c755997a9f8ae565b853161f4cb06d78e39e SHA512 c6159145b068330b71b45360d1fa4f0cff1bda7749285b33eae9772d684320df89c558db37b554598a15ba774d31ec3b66994ee89f8d27ec09ccd6b423c0143d
+DIST youtube-viewer-3.9.6.tar.gz 259715 BLAKE2B df6ec66ac63e8d2c815fdb507f3e2aa168c61dda2005908131e9074e54b0a4bb23dcd23ba47b6daba0d022c3b387d03ce8f67e6f3d42b3b182a3ead82965c328 SHA512 205cb691325c7cc09b981a1e04c3267e59016dc5f300cf929cf41693d5b10e61b06a021c8bf5d14415551440f9d9d433edb2ac53f4698b7f3ad811ae0045b70e
+EBUILD youtube-viewer-3.9.6.ebuild 2140 BLAKE2B f7cf0a2a840adc259be361603f2d5c248a0d1c7d2e9e6ec8d3ed55ea7a946bccfbdd00bbad0ed02d47ffa7d8c141c755997a9f8ae565b853161f4cb06d78e39e SHA512 c6159145b068330b71b45360d1fa4f0cff1bda7749285b33eae9772d684320df89c558db37b554598a15ba774d31ec3b66994ee89f8d27ec09ccd6b423c0143d
 EBUILD youtube-viewer-9999.ebuild 1932 BLAKE2B 73a41a742d47da2eae82a467d0ed1cac93e3637873b67af9e4d868eabeebcf19bc0a0c4625a3951411f320577d4eb65f88b497f5b4e3fb8b54b113b27bc8296d SHA512 adeed06bd32b30e18c32a0add6f6e941ef067bdb3f276f7bdd7b2286293f7b82d967870e15c461dae9279371f2e4ecd4e291c9a196313f741b295709e6289d6a
-MISC metadata.xml 848 BLAKE2B cf59cd36dc650494146118bda3f8b2baaaea2e8fa333cb972cbe5289560b4596bf14627fbba86c30971a1059b8a81e5f9730fc66b4205df91317b10a27ab5ee9 SHA512 9f03a8b8580616495ebb773fce7a2d5294c6bf7e4804e3b2a3f74696f31246761570614503ad9932ee38a5b663041ab87556bd74492b9fd22578b4c13734342d
+MISC metadata.xml 928 BLAKE2B 2cad26ef30170e608d4d9ee54b22f1e843a3e4d5fa6856bf99b0953eca10e8f0a9690d2edc7ea7d89a04f9803291b3764b5a05c0d20eca8e297aa6c8546f6d49 SHA512 89e5abf5239cbfd09b610760ffcf2db5a6963c02081d974ea9efb25b779828ac2b5b1a22dd112bff4dea8b7afe679cbb50b7762f6fd48635c3db3c0024224e25
diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml
index 8863887bd4af..24f114d5e4d3 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>trizenx@gmail.com</email>
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild
deleted file mode 100644
index b54b231cd235..000000000000
--- a/net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop optfeature perl-module xdg-utils
-
-DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
-HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
-SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk gtk2"
-
-REQUIRED_USE="gtk2? ( gtk )"
-
-RDEPEND="
-	dev-perl/Data-Dump
-	dev-perl/JSON
-	dev-perl/libwww-perl[ssl]
-	dev-perl/Term-ReadLine-Gnu
-	dev-perl/LWP-Protocol-https
-	virtual/perl-Encode
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Term-ReadLine
-	virtual/perl-Text-ParseWords
-	virtual/perl-Text-Tabs+Wrap
-	gtk? (
-		gtk2? (
-			>=dev-perl/Gtk2-1.244.0
-		)
-		!gtk2? (
-			dev-perl/Gtk3
-		)
-		dev-perl/File-ShareDir
-		virtual/freedesktop-icon-theme
-		x11-libs/gdk-pixbuf:2[jpeg]
-	)
-	|| ( >=media-video/ffmpeg-4.1.3[openssl] >=media-video/ffmpeg-4.1.3[gnutls] )
-	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
-DEPEND="dev-perl/Module-Build"
-
-src_configure() {
-	local myconf
-	if use gtk; then
-		if use gtk2; then
-			myconf="--gtk2"
-		else
-			myconf="--gtk3"
-		fi
-	fi
-
-	perl-module_src_configure
-}
-
-src_install() {
-	perl-module_src_install
-
-	if use gtk; then
-		domenu share/gtk-youtube-viewer.desktop
-		doicon share/icons/gtk-youtube-viewer.png
-	fi
-}
-
-pkg_postinst() {
-	use gtk && xdg_icon_cache_update
-	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
-	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
-	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
-	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
-	optfeature "live streams support" net-misc/youtube-dl
-	optfeature "threads support" virtual/perl-threads
-	elog
-	elog "Check the configuration file in ~/.config/youtube-viewer/"
-	elog "and configure your video player backend."
-	elog
-	ewarn "Starting with version 3.7.4, youtube-viewer requires the user to"
-	ewarn "get their own API key to function. Please refer to README.md or"
-	ewarn "https://github.com/trizen/youtube-viewer#logging-in for details!"
-}
-
-pkg_postrm() {
-	use gtk && xdg_icon_cache_update
-}
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.9.3.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.9.6.ebuild
similarity index 100%
rename from net-misc/youtube-viewer/youtube-viewer-3.9.3.ebuild
rename to net-misc/youtube-viewer/youtube-viewer-3.9.6.ebuild
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index c14dd408d03a..1bfdc4ad93b9 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,4 +1,4 @@
 DIST yt-dlp-2021.10.22.tar.gz 2010916 BLAKE2B fb8f789c74df06dcd672d00ac16eb7cbf466755c3fa607acdd21dd9a9ef2af158a5272f88656133078bd50585506b65cf3b3c03236726de954ccfa0b6c1195fc SHA512 2b590703f8d4f9454b50983019aca8046205234bd98cac4da73a6688eae177a19ef641e486aea92d86197ee7ad6c564c65f9b9496d623c00bdcc349817d5b1f8
-EBUILD yt-dlp-2021.10.22-r2.ebuild 1472 BLAKE2B e759b31b6a474c8fb633b06f18d6f1a91173e92af8e9d75db8e7e0975bca71fe134f21ee656d38efb768552c30be3a17d7f6425cdefe07ec3d368aadeda9ebce SHA512 faed9b70fa25962397771fda4050256f6a9e713e22de080f5d227a15f66a5e260fd099fa5adb5502d816d70301ea932e94d87318afb957e62243b483469ededc
+EBUILD yt-dlp-2021.10.22-r2.ebuild 1478 BLAKE2B 7c8c55fd7b8c1b523334bbef77182929dbb0f631191371772ed22df89dbee94553f9c97536bf04beb826cbfe69b533392d26c82be0806f20b317f13384693c92 SHA512 9fb7ead0738e5885cfca80673c08de140380a58d477f797d85f592d198aebab2ac936d5b03d2522401c89ec211053128f16742b675d67418224c1a7f7a2d0b39
 EBUILD yt-dlp-2021.10.22.ebuild 999 BLAKE2B 36e72cb572e5640d596036634b3ecd7d02945eb63dfe9ed63af6a73283fb9161334a99bac7d879089ff2b02552726ad171b3f0758f0e8d5f15da3d386699bae8 SHA512 54552a9a36c3e335ade68c5c20f905069c17cd8c8c47f41ba8396cce2613a4b9c6e730f4d8a100b5e567c202dfe002903b28c4ced340e76f48e584bf095d1341
 MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
diff --git a/net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild b/net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild
index 89adf8ec5b64..9a121884d749 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~hppa ~riscv ~x86"
 
 RDEPEND="
 	dev-python/keyring[${PYTHON_USEDEP}]
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 1283b49a7e69..e32eca69aa84 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/fax4cups/Manifest b/net-print/fax4cups/Manifest
index f4b2dbd666fc..c53e77dca215 100644
--- a/net-print/fax4cups/Manifest
+++ b/net-print/fax4cups/Manifest
@@ -1,3 +1,3 @@
 DIST fax4CUPS-1.29.tar.gz 15347 BLAKE2B 7ae33ce3c60d2e6283a958bafcba9bc441dd50517bbd508050822354130d8ac02e5fbf4c1d6662e2a84962af202032bcb3b1fb26a473a65006a9b324a09ab1b6 SHA512 b3548095c58bafa3e35a4ad26f7d9fc95538bd0a94f40b248e2ab10adf726a23ff2b6a274085278ef3e0379a4f67b43e31d604491cf1a45ca0fbc163fc4a774b
-EBUILD fax4cups-1.29-r1.ebuild 944 BLAKE2B d44ddf0b6419067d37c9f9def29287d18e699471a31d308f69a885438b663c23b8e43379038576223a189f51c4077446b213f1b2761b827f191ab3577842e14d SHA512 99de32b11f3e50bbf304fb94a423b3d877cc1ad1fe4de7041ee33dd31f87409a015c91e1aa5e7bda72f0eb31f260f82c525d8e96490ec259e0ff46857fb88e57
+EBUILD fax4cups-1.29-r1.ebuild 995 BLAKE2B e6ed18f8fd1da56d2c7e193d1efb4b4c86dab971279a96ac6ea9ad485227473cdef86fa139770d7b73dceabe2b2db5aac9e3f926a39c717f750b031e01183c13 SHA512 64edd9c6c59effe0f1c635f89d842e09deb71e4c80a60a019416b3856c58f50bbf050a6b3fadafe69fc2c63b0c3599b6c2eaec3c3db283dee5ae63c3ec5548a9
 MISC metadata.xml 468 BLAKE2B 18de778194056d2fab86ab52e08cfc375fcdba36ba2e79a30645c55e8e843b634c63b5ab4e963d02d0b4e640e837ad89b8f8549678940109c937d39d63f834ea SHA512 48103147e4e6f21054b932f183755955eeaea4630d2cdb8c7730b055e0ac4b86d5e3f9345d970f9c5a538c8e69e1622afab3ec5bbe35ece476b4631941d151dd
diff --git a/net-print/fax4cups/fax4cups-1.29-r1.ebuild b/net-print/fax4cups/fax4cups-1.29-r1.ebuild
index fe10769ae330..37f2f9ce8f78 100644
--- a/net-print/fax4cups/fax4cups-1.29-r1.ebuild
+++ b/net-print/fax4cups/fax4cups-1.29-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Fax backend for CUPS"
 HOMEPAGE="http://vigna.dsi.unimi.it/fax4CUPS/"
 SRC_URI="http://vigna.dsi.unimi.it/fax4CUPS/fax4CUPS-${PV}.tar.gz"
-LICENSE="GPL-2"
+S="${WORKDIR}/fax4CUPS-${PV}"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-
 IUSE="+hylafax mgetty-fax efax"
 REQUIRED_USE="|| ( hylafax mgetty-fax efax )"
 
@@ -23,27 +23,26 @@ RDEPEND="${DEPEND}
 	)
 	app-admin/sudo
 "
-
-S=${WORKDIR}/fax4CUPS-${PV}
+BDEPEND="net-print/cups"
 
 src_install() {
 	doman fax4CUPS.1
 
-	exeinto $(cups-config --serverbin)/backend
+	exeinto $(cups-config --serverbin || die)/backend
 	insinto /usr/share/cups/model
 
+	local i
 	for i in hylafax efax mgetty-fax; do
-		if use $i
-		then
+		if use ${i}; then
 			# Backend
-			doexe $i
+			doexe ${i}
 			# PPD
-			doins $i.ppd
+			doins ${i}.ppd
 		fi
 	done
 }
 
 pkg_postinst() {
-	elog "Please execute '/etc/init.d/cups restart'"
+	elog "Please execute '${EROOT}/etc/init.d/cups restart'"
 	elog "to get the *.ppd files working properly"
 }
diff --git a/net-print/ink/Manifest b/net-print/ink/Manifest
index cce09d67bd32..36216d6a1f48 100644
--- a/net-print/ink/Manifest
+++ b/net-print/ink/Manifest
@@ -1,5 +1,5 @@
 DIST ink-0.5.1.tar.gz 105174 BLAKE2B dc5807ee0f87e8e48e283e86d7d9ea9fe74b407591448eb66d45871185c2439fb97c81ef8c6ab0d10d871f28c49bd0d3a55b981d126314af829420ecacec7bb2 SHA512 12a21279ca4f390c5748b8ab1c62770c82decec1f9bfa3e6c13d7a269a7cb28fb96f92506c532f52fb4e3f1b72012e2c2a08e654a91edb1c73d1f7b778dc5848
-DIST ink-0.5.2.tar.gz 120024 BLAKE2B f90038992759c484bcf12f949feebd92d202e4e392873ac579733032964a928556fe0d380b814cf5f9519d7e9be964964e1b60b1913b083dd9573e5636351875 SHA512 3e04646141b4c3267cf6e29b28b84b2a879a8edbe3356e469b8195b8fb97787144d167ec2bab41b3365c3171638a31dd566cb690725711d942528e2b4c6d4195
+DIST ink-0.5.3.tar.gz 111791 BLAKE2B 15269a5ea267434f529256aeb144950111ffdaf9d9e182b62f5e1b0b3e6340495a2fdf22ffa6578a1960259a5f1a9097f27ca09ea6ecb1fb1f702aa15b7b2b5b SHA512 a05a3647d0fcae652f1b339006d22b7324e42615ed63fed47269dad409d0a6bd7640b9ec9fb6871d7ff0027af2577b64af98cbb8d9e38810e3b26490a5c0a2a1
 EBUILD ink-0.5.1.ebuild 505 BLAKE2B e09a6a1779b8501130d107164de2f9a6f4f0e0da55cc098082d3bcead9752685d3c228b61420c7c9aebbe589898bc11f561fe8e2baea88b5fa9d49f71cd3d8fd SHA512 9c167ff20458772e81b4704a2dd6ed6ddea9229a7baad1f64783de84ce1dc52480f8e8ebcb8bfc32e56c463a0679fc6d9d8522221a41726b41babbab240443b7
-EBUILD ink-0.5.2.ebuild 505 BLAKE2B 3e81556ff9998a1479e8018cccb83d6a3e0a8ceece323ef92f961370f67e27fbfb2677408386336974e2567de97c500337f22898b91e810f59c17ca398e858e0 SHA512 76ad0d794dda25154196ef1f27ae98999ca5e755b4ff24dbdd772662cb3cda3641b2a4a343e3aac8e6a0d8aa406049f8a6fcdf71400b367a5a5d1c8afd7b6144
+EBUILD ink-0.5.3.ebuild 380 BLAKE2B 9851a56cf1a672141d7ce29ca52a8396f9c3dedb3d0335e0c2cbf434fe0cb7d81a9bca127a74bfd33af85e8272167a20497241562809eff8ba4442ca1c7f2073 SHA512 8cd9ceaf658b944b9bb6746d12d3948b1049dcfbb2327601da87273c7003fc4172b4fb0f532bb0492628221169f93860e8575837737c3b7564f2c2a24abc0218
 MISC metadata.xml 333 BLAKE2B 52927a7468c64aded68640d17cf20ce194779c23fb379770ff9496c5d4ce6c7d8a1b95ae6bd4d5810b5d02f5b9f4e5200fc99eed70e89c982dfde109a9695e5f SHA512 781d5d910ac309158d603b3872dd6d13142879feac149660e9255274e65b727376625c87463245ef6918a292bf5abf052d85b8b7bc4df25f86722790a06b731b
diff --git a/net-print/ink/ink-0.5.2.ebuild b/net-print/ink/ink-0.5.3.ebuild
similarity index 60%
rename from net-print/ink/ink-0.5.2.ebuild
rename to net-print/ink/ink-0.5.3.ebuild
index c74f9fc83d85..3371caf8ab65 100644
--- a/net-print/ink/ink-0.5.2.ebuild
+++ b/net-print/ink/ink-0.5.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="A command line utility to display the ink level of your printer"
 SRC_URI="mirror://sourceforge/ink/${P/_}.tar.gz"
@@ -10,12 +10,6 @@ HOMEPAGE="http://ink.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=">net-print/libinklevel-0.8"
+DEPEND="net-print/libinklevel"
 RDEPEND="${DEPEND}"
-
-src_configure() {
-	# always use /bin/bash as configure shell, bug #526548
-	CONFIG_SHELL=/bin/bash default
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index dd4823c6979b..88ed7fb38ceb 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/iodine/Manifest b/net-vpn/iodine/Manifest
index d8996d47a76e..0d4f8bd657da 100644
--- a/net-vpn/iodine/Manifest
+++ b/net-vpn/iodine/Manifest
@@ -3,5 +3,5 @@ AUX iodine-0.7.0-new-systemd.patch 440 BLAKE2B d4d0f2b24cfaaf743f84f4003d5213440
 AUX iodined-1.init 1422 BLAKE2B 50e39490f37d4e74ae9e768459e1011d232e9673d87091a41d0f7bbee8ef47a6b4c716e5dfcb169582ea7299fb33e3d8b238ead1af690f41630f6482f3635882 SHA512 c146c16f10574a16971d81010ab51f6fa68ebbd3275e50f18bfeb4dde5976ab97a9817d26bbe7d2b8cce3c4a8624a7627674528b30a4e958b4523cee03d6e1c9
 AUX iodined.conf 1547 BLAKE2B aed2f5ee21d513cec4602031a739735f3fc13cc4ebd5f273603a0a67e6bcdcc053c68df128fc167f7330d1848195584a8249a4b77f02e19bcf6e9e4d3e3d3bbf SHA512 3aab274be5670e4dc59fbf4fa9b5d6bfb1363ea081a8cf5c3d881007ca6d54a725038edd3b06f0aa24fb71756c4a54e96374867063ac1310ef9ce3a2ff25943d
 DIST iodine-0.7.0.tar.gz 96181 BLAKE2B bc7b634f4060d0a3be259f1a0797263de65d6ee6bc2c777c0b74d789c60877aae2895bfda11f5fdd7e064ab137607abfffe689e0a01b2505878e442d08e3555a SHA512 49fe4f0cf614d3400cbfdade84eb4f50430f8f92004f663a08acc1514e8ff342443a8c3f855828bbca1864a3fafe419b5256f8a80fc4024b364d4c8c953fc0ec
-EBUILD iodine-0.7.0-r2.ebuild 1135 BLAKE2B df2c250b332bb3e2bba2555974d235db1e12caeb5c36a995930ef3823fa81c94204fd0bca816f1a7cb976491037e53b60f30629f83c3c9a130bf75bf9df976fd SHA512 34de728408c7ba33d5ce8ac403fcf7c5535d7cca89db057708b5b58af2d55253de4629221a37f7cdef5dc53bb207eb9438881b42bb16e43d1dfadbdea0ed427f
+EBUILD iodine-0.7.0-r3.ebuild 1018 BLAKE2B b50679f88e08f5c1f399e8d36f0b39a4b82aa63075ab8213d9a66082d62fb9c42c428fbf1503cca12f448f98f5c671e59adec2ba1e62eb7edec93e2e2baab1de SHA512 086079cbf011d555871bb89ecff830aaa4be9a10a3116df84e2645b4d8c21ebf419bb09a2d1516ffb66b6af987a3d4b7719b1604639f56b3e1e6e80ce6778015
 MISC metadata.xml 450 BLAKE2B 8c88db266968d064e71df902513f1621d0310d0ea2341557b5434b067e13c27a84b44e33d238f747b68b65f80e8c7eb90d0904de445aaa8cb62bd230de581d7a SHA512 caa5ec6e7129d114abbf34925ff87e8c772232d95f75bf6e33018786601e1a455f4eef49588c681a539ea32c3e4a4c34cdda9406ad2da988d65c303b1c3498de
diff --git a/net-vpn/iodine/iodine-0.7.0-r2.ebuild b/net-vpn/iodine/iodine-0.7.0-r3.ebuild
similarity index 69%
rename from net-vpn/iodine/iodine-0.7.0-r2.ebuild
rename to net-vpn/iodine/iodine-0.7.0-r3.ebuild
index 1309208900ab..0c944c2eeea1 100644
--- a/net-vpn/iodine/iodine-0.7.0-r2.ebuild
+++ b/net-vpn/iodine/iodine-0.7.0-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit linux-info epatch toolchain-funcs
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="IP over DNS tunnel"
 HOMEPAGE="http://code.kryo.se/iodine/"
@@ -21,9 +21,13 @@ RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-TestMessage.patch
+	"${FILESDIR}"/${P}-new-systemd.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-TestMessage.patch
-	epatch "${FILESDIR}"/${P}-new-systemd.patch
+	default
 
 	sed -e '/^\s@echo \(CC\|LD\)/d' \
 		-e 's:^\(\s\)@:\1:' \
@@ -32,18 +36,12 @@ src_prepare() {
 	tc-export CC
 }
 
-src_compile() {
-	#shipped ./Makefiles doesn't pass -j<n> to submake
-	emake -C src TARGETOS=Linux all
-}
-
 src_install() {
-	#don't re-run submake
+	# Don't re-run submake
 	sed -e '/^install:/s: all: :' \
 		-i Makefile || die
-	emake prefix="${EPREFIX}"usr DESTDIR="${D}" install
-
-	dodoc CHANGELOG README TODO
+	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+	einstalldocs
 
 	newinitd "${FILESDIR}"/iodined-1.init iodined
 	newconfd "${FILESDIR}"/iodined.conf iodined
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a2011cd444f9..3d1400aa97ac 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 973adb129824..22e99f9b6e6e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -629,15 +629,6 @@ net-libs/libsoup:3.0
 # Add support for OAUTH2 for those needing it
 =net-mail/fetchmail-7.0.0_alpha*
 
-# Sam James <sam@gentoo.org> (2021-06-01)
-# Possible issues with new ALSA release
-# See bug #793410
-=media-libs/alsa-lib-1.2.5_p20210604
-=media-libs/alsa-topology-conf-1.2.5
-=media-libs/alsa-ucm-conf-1.2.5-r1
-=media-plugins/alsa-plugins-1.2.5
-=media-sound/alsa-utils-1.2.5-r1
-
 # Michał Górny <mgorny@gentoo.org> (2021-05-31)
 # Requires removed media-libs/opencv version.
 <media-plugins/gst-plugins-opencv-1.18
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4fd76da6ef1c..8e52c4a7d3ea 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1737,6 +1737,7 @@ dev-lang/gnat-gpl:sanitize - Build support for various sanitizer functions (ASAN
 dev-lang/gnat-gpl:ssp - Build packages with stack smashing protector on by default
 dev-lang/gnat-gpl:systemtap - enable systemtap static probe points
 dev-lang/gnat-gpl:vtv - Build support for virtual table verification (a C++ hardening feature)
+dev-lang/inform:tools - Install blorbtools for manipulating Blorb files
 dev-lang/janet:static-libs - install janet static library archive, you must enable this flag for using `jpm build`
 dev-lang/jerryscript:debugger - Install jerry-debugger
 dev-lang/jsonnet:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index c0a62aad281a..71a6161bef91 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index b94e9b6238d7..1be1fa086c87 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,5 +1,5 @@
-DIST josm-snapshot-18191.jar 16013739 BLAKE2B 69ebf2e44d0b92b928adb3c17e5c99fd74ee305fe7d6888147a95bc62b5f33a0d4a6ff7af13e9781d8ffda36e04e237089439b00de4f329f1500d71cf8de88ff SHA512 1c1d04fe21e379004eb31677887550241365f6bf306286c3cd655044dfadd36d5cea5d54a77c09bc6cb3c648c3fb927f75d800776d9d92b85c1bd318621a4479
 DIST josm-snapshot-18193.jar 16013832 BLAKE2B fba7f88f9833a4ccdd24be1a2554681dc77cd5d810ca9d5b960df350987a138d43804770f5adc61d0ee6a553e5d54753a3b9353ff344dff2a0d4d33b3221a6ed SHA512 13caae201e543468d27e44811ce3a5d774c9942b702c995a3b3cf8b893e925d2b23392537b6338f5835e2014e2e08144015a210b12a553706983ac07e172308d
-EBUILD josm-bin-18191.ebuild 904 BLAKE2B ec7b93744ca9161baa8099a4404e98337b585de48d8b09d93edcf4100279d9a570599572bb8765cac701ae058214242b225f0c552d502fff00db30752e72e33c SHA512 08912f37e7287a51808ac814207a79af833fa6f851bfb7df2a4e35af37637aed7f28247ad3361589e3c43635ddcd60cdbbd2afe0ee82ff50b271d84c8e0f5e3a
+DIST josm-snapshot-18303.jar 16144437 BLAKE2B 95222aafb509af2614a43aedc7b95a466d2ea533a9148c61da4eb547642d8e7509657e680f3402add03fbea73934417a58fe74418c67df312317c4518ebb5cd8 SHA512 1c1de8b4c90445ee139c553bb889a6477065a40d8e4db1516e8f79edeb8bccbd2065789536ec697fbd430970c59584c791e886c7a02c6061fb57089db6946e02
 EBUILD josm-bin-18193.ebuild 904 BLAKE2B ec7b93744ca9161baa8099a4404e98337b585de48d8b09d93edcf4100279d9a570599572bb8765cac701ae058214242b225f0c552d502fff00db30752e72e33c SHA512 08912f37e7287a51808ac814207a79af833fa6f851bfb7df2a4e35af37637aed7f28247ad3361589e3c43635ddcd60cdbbd2afe0ee82ff50b271d84c8e0f5e3a
+EBUILD josm-bin-18303.ebuild 904 BLAKE2B ec7b93744ca9161baa8099a4404e98337b585de48d8b09d93edcf4100279d9a570599572bb8765cac701ae058214242b225f0c552d502fff00db30752e72e33c SHA512 08912f37e7287a51808ac814207a79af833fa6f851bfb7df2a4e35af37637aed7f28247ad3361589e3c43635ddcd60cdbbd2afe0ee82ff50b271d84c8e0f5e3a
 MISC metadata.xml 544 BLAKE2B 7a1610f8796ea0ea5772fccae64a2a91017c8701f847b03f61624240caca1b655b7865d649790b15b43fc565f5c26dc196c45053207c7caeae2601ec5f290840 SHA512 74c714e664fb2833868093bae98511b5b99955cc862c687bef981280fe86b3663acf8c093d34daa3b30809f1a57910797daf3b2cc79bca50e218213780612e0d
diff --git a/sci-geosciences/josm-bin/josm-bin-18191.ebuild b/sci-geosciences/josm-bin/josm-bin-18303.ebuild
similarity index 100%
rename from sci-geosciences/josm-bin/josm-bin-18191.ebuild
rename to sci-geosciences/josm-bin/josm-bin-18303.ebuild
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 852c73274134..ca3ab5177eca 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index ea70bb331529..827eeea13e65 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,7 +4,9 @@ AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb79790188
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-5.13.0.tar.xz 845236 BLAKE2B e1c148e2a720236163e7f4d46aa38d244a02ae36ad86571c5606d54c9ccfd8d0363e2fb793d48cf39aae322b3c36b9f8a43eaf570dbdb8243092926cef3d2786 SHA512 a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d
 DIST iproute2-5.14.0.tar.xz 853572 BLAKE2B 52544021798f2cb716a57998d98dadc2441142b02d38c7e274bc17a6e5f994bdb5bd3ebf0b896bfd7e327a44f00f92c2af8e67367cdc0aac70769d563082f543 SHA512 e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c
+DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 EBUILD iproute2-5.13.0-r1.ebuild 4864 BLAKE2B e62ccfe102bad1106e0345e5a986090408c8737ec3b96815250c07d54ef96fc14531d21a2389de46f68d64102a97568096038dadf4c899c0f1ad7f5257381d8e SHA512 681689226fda0bdc8947e2c26420cdad6e971eecb9816a562002fa6e2ce673859ee2b648bb83c9be6bfa3f86033314063b214dc36980ffedf9627ff4f5dfe889
 EBUILD iproute2-5.14.0.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01
+EBUILD iproute2-5.15.0.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01
 EBUILD iproute2-9999.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01
 MISC metadata.xml 814 BLAKE2B a74c3bee84fc81acfeee405c22b84ca9a10f2daf4be9d496202cbc5a2595f7222b864f4105f5dd46ec45e7de57b6ffff991f907da6378293267209b9eafe91d5 SHA512 74936295cae7e84f39ea6dd8e6bee613bed9e9716c6a96aa8f497be96b14367a2d8829db3ed108b760afdd196c5dbc9f32b14f29f5a0939e47b15d7a68aeca4a
diff --git a/sys-apps/iproute2/iproute2-5.15.0.ebuild b/sys-apps/iproute2/iproute2-5.15.0.ebuild
new file mode 100644
index 000000000000..367b3541cbfe
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-5.15.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl:= )
+	atm? ( net-dialup/linux-atm )
+	berkdb? ( sys-libs/db:= )
+	bpf? ( dev-libs/libbpf:= )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf:= )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	libbsd? ( dev-libs/libbsd )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722
+	#"${FILESDIR}"/${PN}-5.1.0-portability.patch
+	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+)
+
+doecho() {
+	echo "${@}"
+	"${@}" || die
+}
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	# Fix version if necessary
+	local versionfile="include/version.h"
+	if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+		einfo "Fixing version string"
+		sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+			-i ${versionfile} || die
+	fi
+
+	# echo -n is not POSIX compliant
+	sed 's@echo -n@printf@' -i configure || die
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# build against system headers
+	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
+	doecho ./configure --libbpf_force $(usex bpf on off)
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	HAVE_LIBBSD   := $(usex libbsd y n)
+	EOF
+}
+
+src_compile() {
+	emake V=1 NETNS_RUN_DIR=/run/netns
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		keepdir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	elif [[ -d "${ED}"/var/lib/arpd ]]; then
+		rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
+	fi
+}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 8a4aa14bd1f1..4fcf96898319 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -4,9 +4,11 @@ DIST sandbox-2.25.tar.xz 436004 BLAKE2B c9c7d351cdefbb2b1a585904c38742a5a3bde50d
 DIST sandbox-2.26.tar.xz 444412 BLAKE2B 3bc88d86ba4e2522895c4448dff6da2cffceb912e5ff9610fe4c3aea255ffd9b9ca9bbe8e45d94508f45e9c141aa6945a9a8d82cba0f3ca102ff6a1624c84161 SHA512 f20766daf2ce43753772a184c86a7b6847f96ab7b60b202616e15d791bc1f770162035a9b1ffe38765dff8d2567ad971a9a2bdeba9a8769845a758fcd95206fa
 DIST sandbox-2.27.tar.xz 448948 BLAKE2B 03a311c8c7c8719bac398e39ce49e7149bdaa1d5b2811f395eb2251a32aabba995f97c3d5d27461aadb64bf43adf2b0cbaa7c2f141dd86f64f8dd326422ac104 SHA512 2a53e6fc87cec975962737b1fadc447d86985d27b18ad2caed711116da2ba435f54db0f7dadb02664b2638b9dc77752831cd4820390f5c3e61a42429e13462a7
 DIST sandbox-2.28.tar.xz 450840 BLAKE2B 1a144db1dcd140ce393f47b224c4389693bd3db6d056749968a9e78730b1075192148aa63fdfd5ab93893dfb96a87bcc36bee8b4540abefca0590a8def8365f2 SHA512 eaac54fbc35f51da3c94bfa10e0556f0fd39c20660fea2aa7d3cbf76dd3e4c9fb4a16cc198425988b79313f9331af030e1dca431c3f057ee4a04927c96897895
+DIST sandbox-2.29.tar.xz 452784 BLAKE2B 388f5d9c49134696bafbc6b882581396a9fa2e7caa6ccfb4376706d653f836ce18e0d77527c4c4f2ff753c0b920ab5ab60e151dd8a4e399e13dbc3fe7c0533d6 SHA512 15c0e6b71e8b8547b8188f857568c99b1925d5a837a289b21c4f842341361bf7119b96083697dc83546caf530daab700fb8c2704974e7cfb804d64bb5257a4b4
 EBUILD sandbox-2.24.ebuild 1617 BLAKE2B 5bb22638ea5e5735242e538cb8e0e2598a38237001162fa0cd4d4c3dba6ddb7b9d4607b04ab20b00cb2e7b17c7a759808117d6c0c521a7ba6843fb42e29d1ab2 SHA512 845b5ae83d2c12dc7101d01b76af6693ae888237eda43d2207ef4a1fd3c121d79c554cbb1e7395365867cb96b6a27bbae1c26ff79c301ed00e536acef396dae9
 EBUILD sandbox-2.25.ebuild 1615 BLAKE2B b42f819adc73df7f3c7b0f2654eeaa41f23840763c3fe5abe64ba147b20cf74f1df7411a1309d2581b4264a9a5152eda6386551acadfc04125d31251557c10b6 SHA512 df4789dff85f482c7e9750d8581d2b74686bef82a5b4dd15d1a4b7923f7a2541f68afa5e5b5c091ccdab8234eba2708110401bad527c99e25e236dd8921e8abd
 EBUILD sandbox-2.26.ebuild 1455 BLAKE2B d1d05a952f34ec697b26176ba6183006d636d546af197277d30a1811b7200a45d1327db669ac411174e74989024f4c87d69ffbd68834e7a76fdf5a8ce8bd0446 SHA512 8fb95b39aad62153208436bb73c84fd6d891333cb251958ac2ee71913cdc59b98002f53dbb471fbbb2e76ae954b34c3cedc8c94b4f5d6e4fb65ffd40e4c8b3d7
 EBUILD sandbox-2.27.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
 EBUILD sandbox-2.28.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
+EBUILD sandbox-2.29.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
 MISC metadata.xml 377 BLAKE2B fcbc91501a4a61bfa3c3cc01b0746f5f638093933cf8a9ba1e6206071cb0482c9ba18c5c10541d934327cf805ee0e40c010b3f25a221ab63fefa2fd9f39da0d7 SHA512 92aa26a3200dd1508fb86da0e0bc70be66ccbcf66593ee6833102c9961ac17c8a99c5b070a2cd2e79dba8e5daa0316cdb6744baa3fbd9342953fcc00b1277d35
diff --git a/sys-apps/sandbox/sandbox-2.29.ebuild b/sys-apps/sandbox/sandbox-2.29.ebuild
new file mode 100644
index 000000000000..83e908988817
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.29.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+nnp"
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+src_prepare() {
+	default
+
+	if ! use nnp ; then
+		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
+	fi
+
+	# sandbox uses `__asm__ (".symver "...` which does
+	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
+	append-flags -fno-lto
+	append-ldflags -fno-lto
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	dodoc AUTHORS ChangeLog* README.md
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/var/log/sandbox
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 885939da061d..4017a29d53bd 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 66507b9ec113..06cfca1e088c 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -4,5 +4,5 @@ AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4
 DIST tgt-1.0.79.tar.gz 297898 BLAKE2B d0f18dac863d6983a00eb9513bcbe17b5cbed76fad998af74b65311c1ace6f281bfb1bf639713e10124a520ad3916ef79ca0a81cef97b5ef678c25cfa9a71eaa SHA512 d71b0a08bd1cdc717e22c4dd0a229e84bd19e02e01037231ee80d9ab24848bc7274050e1ffe7d9a3d50149c892ed1e6ea382e54dacc341650f4534629116be07
 DIST tgt-1.0.80.tar.gz 298256 BLAKE2B 3a678730b3c492832b96e160e9672354aa32a3cc463e2845b1b475c238172b99c1706d3d387697c199c4f3004d8b2c4230d17bd356ce9103028525f8007c89a9 SHA512 6e48013a7da527799f25dc224bb261f7c5cf0aa3893bc337b9f4878a45d116be701a373c533ab6fa79771ccd633501c83b48084828bf6167af72e35795bb1c4f
 EBUILD tgt-1.0.79.ebuild 1574 BLAKE2B 073d55d323fd8baa437414df07e42bc797cbcdf14f7d762e74d05a87d5d7b24d6c751931c2ff60fd9c416460dc7adddfdc75408e810c718a41c2a7d8c6d706f5 SHA512 027343c091ca27cb94645107034168f69306edf2831691c97b2f8b68ca362637f27eafd610682b36c64a985e821bb92951598108d376c457aebb3160bc6fc062
-EBUILD tgt-1.0.80.ebuild 1538 BLAKE2B 04339557816e5850810bca5a6abb861dcdac3e24a06472004120c65b6c89e676abb358cf867ec77b11f658c91f47608d768cd1cb2bd2659d1467549e63583519 SHA512 872dbc10b75ac48eb66fc45cd619ebcdb0ad500ca96b4e6c9900816b822b317cc35ee0146435b1d453e41cf10203d5372697f8173887ddecb9237294fb8a1aa2
+EBUILD tgt-1.0.80.ebuild 1537 BLAKE2B 471c1960bf84bd5beb3724ce5fe99a23e249597006c9908ee40517cfc6712a13b5f1acef1599eb72f4d0aa3332e089c495c44a85cae14b859290f2f83886693c SHA512 9e78e1ffe5a362e83984d1a0eba4bbaa46d877b2b4bb2c0f1d5e106d63f59d3bbb73d2f529bfb8ca130991709f9c7ebc577ff8f9d30a4982ff8e02617dacff58
 MISC metadata.xml 749 BLAKE2B 0bc71ded3e2d650bd34edcb3e5515926248ff71354db504d94c548ec951ded4f71e5af1d5127d8fa3a0a3b398204436743d016fbd1cc1e765b6303a8bd734fd8 SHA512 94f7b923adade87a471854f469731094b00872727c7a668ea7e34e558eb87e661ab01c42fbe920a885f28c394f2bc9bf0fba0e48b84893ecade9c3d967e4c2ea
diff --git a/sys-block/tgt/tgt-1.0.80.ebuild b/sys-block/tgt/tgt-1.0.80.ebuild
index 5d9009447016..ddb69084a054 100644
--- a/sys-block/tgt/tgt-1.0.80.ebuild
+++ b/sys-block/tgt/tgt-1.0.80.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 DEPEND="
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index de7536bcad45..a789b698a846 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 21d038d6a836..c91684bf0df8 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -11,6 +11,6 @@ DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc19
 EBUILD e2fsprogs-1.45.7.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
 EBUILD e2fsprogs-1.46.2.ebuild 4015 BLAKE2B 6aabd166fce82e441e6214fcc911033c3b58ac114870b221c29e4d55978adf8819d8dfa09d0b8549ca6fbd5e964fa2bb3de5afe8a1006e31c92fa4785949ace0 SHA512 6faff94db1cff5d1ae4c726afb9c8e5a31cb2f435f009af4b66668d65ffc88375d98ed4a187c744abb368d1804db6c193bceef7a76057d94df94cb4ad9bb61b5
 EBUILD e2fsprogs-1.46.3.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
-EBUILD e2fsprogs-1.46.4-r50.ebuild 4947 BLAKE2B af79ab63a28644bba952d48a8a77f3fb340b43fc5ad2296911de26657dd979e0613946f023e76d647b07a7497c6f3959cd31804140c9f1e52c7eafefb155f61e SHA512 6b952dc406098fb4977f2032ec5984777c3b4b4db1e185107703f44fbb2c5a5e1405d1f1d510a98758a875efe8fdf278620f767ceed3a547bb1a44cb1e97bd4c
+EBUILD e2fsprogs-1.46.4-r51.ebuild 4919 BLAKE2B aa332a2ab98952e301cf139d489b7421e8254c83b18eb9750fc509283fd62c02c2b9b921ddf592229cd1425d4922ef0c31c37b6964390b7cfbd0d9cc700940ec SHA512 afe69970b8f4b5077ed9ca2ced0d8d6d5d61278dc1bc367a90ccf7323544d39228fbe7ba51e35bcde747c34cd915106f864dacfb4fec91f424167ecc546bd666
 EBUILD e2fsprogs-1.46.4.ebuild 4011 BLAKE2B ed9e1b1ff7116c4a07c650978b42aa43801daaa530c191c2e3ed095d5a0f2938a2c4795b78ecddb577325ca3b125bbf6bcb08fbe4e957bf1bfb30cfcb34e4171 SHA512 26ef3f4a84c8fcb2b7a57b5f1377761cb137ad4c6f491de4579709987a1489ebd9f35d9bc00a2f10514483b3c0b0b605150bd6d836322b1c183cab771a7a3005
 MISC metadata.xml 782 BLAKE2B 6010ef2af50bc0ec4f7511d28e47cd6f0fc76e3ef88afed222f5a6775e3a1ac51940b2272c37713c0f594b10202391073776f1f8330bc9f45ce0c3a03548f135 SHA512 3a18335967f411f387ecdd066db068d05c90abd1af4a91b226d52a6b9507932528d006ef5e463a423bb635d88b12d81ca1e2d403bd9de2dd12c04a50abc94474
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
similarity index 99%
rename from sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
rename to sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
index d646b58c2e6d..c5aa51404248 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
@@ -19,7 +19,6 @@ IUSE="cron fuse lto nls static-libs +threads +tools elibc_FreeBSD"
 RDEPEND="!sys-libs/com_err
 	!sys-libs/ss
 	!sys-libs/${PN}-libs
-	>=sys-apps/util-linux-2.16
 	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
 	fuse? ( sys-fs/fuse:0 )
 	nls? ( virtual/libintl )
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 7b53b15205be..22c240e26a08 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 92e5d94cb164..bbff798e615d 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -246,7 +246,7 @@ EBUILD gentoo-sources-4.14.249.ebuild 736 BLAKE2B 50113efea7a9ad4aeb74ce16a3763c
 EBUILD gentoo-sources-4.14.250.ebuild 736 BLAKE2B ff516b3768604e325d603462914809b52d16db7fee81de910004eaccb0541be38c029411a38fee8840e3e36b96e405163f3df25552ece8742fadc53e2c1197a3 SHA512 7106b2d107cb771ee25a277a88a5cb46df7a44d36c4655442716c2d260d8f37943d6ecb84fd2d6059c40c4c9773f9daab89fc6aed49b12b6deec88935e60382c
 EBUILD gentoo-sources-4.14.251.ebuild 733 BLAKE2B 3ebf7e14467c82dd77401b47447687c171113ded2279a942bc82d3712a79cede9a8dcb79932b5f6690c66502afb905a1369eaff2d41d150f1853dc8e9b1b5cb8 SHA512 fb26d3404f49482507d41e04d5fcda4bee15e853dd644a77fdc2b88256b4525b52f6b76118e0b15df0796138010d2e0240f654a460a1782ede0cfba1cce42dcc
 EBUILD gentoo-sources-4.14.252.ebuild 736 BLAKE2B fceade077d05d0d17a306e34fd93d3e97594ce084fbf7ed1cef9f6990f8ce03282f3387e2e0d266451068383b37cfc4209ae96f178ca53dd3e60e9c18b32af14 SHA512 097067ae2a13b332227b82b725a02d23a425f0184bca8b2bb4ead9be63a61e4f93695dea182749849ea3ce02d0dbb64b21beb6e8fec4ac12d268f87e31729166
-EBUILD gentoo-sources-4.14.253.ebuild 734 BLAKE2B dd57629058e2b7f149dccccb5b15adc0eda7c786c53ed163afb342bc653b729049d57e839c298535441f06ac8db8028b2bbdb56805d29d96cd969f239f9ff6f5 SHA512 ddabae87262ab5d87af777b91ec7a8097a853111afc5fd13f3e8078f05874f304d8193f24c5940ff7ccee7e5509c3614695aff918222a1a704fc2e273f6fdfce
+EBUILD gentoo-sources-4.14.253.ebuild 730 BLAKE2B cb46028e1ee28e4e20bdb20e93ea574b56f043d4dc17a88c6e2213e9835c5d6aa152f0308316983785c20b1368738fa2fdabc82e95e0adc48904fa2a58ffd0be SHA512 1ccd208eb378084e4a22d6cb81a21ca123a62431335ae99c6c900280938e84a93a9a036913fe51fd4af933c3b0c09d9c9db10ea7552392a3cfe5cbf03f256dad
 EBUILD gentoo-sources-4.19.205.ebuild 730 BLAKE2B e26633745f7837cefdec382c62ef90403a570fc5805be06f81986208e58d5d3cce15a9222feadfee1b5c39e0e7178d445006949d24e1f01a2db5b41b3b70b288 SHA512 69fc976572fbf3e3abf07fccce9ce6ec57a412c34cf97142c904d45fe865e0ebca9a37369376cd7241d109e552a6eee27db2a8fd19fcf5625568ff85d11251a6
 EBUILD gentoo-sources-4.19.206.ebuild 736 BLAKE2B 0b3ceb4cf6b267d56918f19371dea92b2c32bb72e43bf60132bc0a684579fe8d41885bedbf2407bc19b7a54492956d07018a71eef9ef6aca867b6e5dd0a74b54 SHA512 a26178e35dcca0fd4a89090489cfa30e88338ee672297d6f59efbda880ef9f54852178457f2d91f7af7f320d1ff7cc72959edb00317df8909125bf80c86a42d1
 EBUILD gentoo-sources-4.19.207.ebuild 736 BLAKE2B 84f17c9101194fd936e3e9de75a114c2c81e2a72c5ab4f597210f892b5cb4ecf617e5837e7fdd12c51a18b63f34e26d88c1a41bf6b9d487bbc688c988282baca SHA512 b450d636f4f57f9f9e3aebdda40311e5fae4764b09492c7e09861e232ba08bf83617269ae53688c044d9274375ccc1af0c5df7561043421e802962c2a719c30a
@@ -256,7 +256,7 @@ EBUILD gentoo-sources-4.19.210.ebuild 736 BLAKE2B fd62031d7868023d60209d2f15da57
 EBUILD gentoo-sources-4.19.211.ebuild 736 BLAKE2B dc932793320253dbead284d33f928fe31fb97ffbe98f84e69be07c98292e14bc00b64e685e42a81e01542f2e860f1a2de52cba82534e0b1f42e7c0d1d0dacb62 SHA512 9584ad77e9424ffe18a77409458267774f80f761091e4e9f433ceee6d1fa1c363a3b5565ccad42cc9c391246530aea3a9dd97c44357cf3001d38e9aca1afd69b
 EBUILD gentoo-sources-4.19.212.ebuild 733 BLAKE2B 9e9707698b5a474e6a17d56834e725a80ca8aadc160bf76106ff56660a02de91914a1bef6ba175a002bee5453d8e27fe889852e3070afcab94f7e80d0f049f46 SHA512 37aa6ca5492ae0d04fa5ff5de0be8235edd7d0c4cdbdccc4f21892f017c65d6645f6ba83fb01b8389122c7d379415420e1cf14bd158a2b8465373e495355744e
 EBUILD gentoo-sources-4.19.213.ebuild 736 BLAKE2B 16e8267be5d1862207355a869531e1e7e35fcd0ca5515fe05a3949d59761e7d3802b1fb7ee1dc3d5ba273d538f30370b585eb84c3f829514028b9074d9773ca2 SHA512 79c404c71b1a976572a0f5f886eb96970c068c034eaac1e9d2a2008e88400523185dfe4d363056e7691fc3f1cb9adf40d7b5f6fa14760cd36a55624f43f10271
-EBUILD gentoo-sources-4.19.214.ebuild 734 BLAKE2B 81c1aedbe815241a528a8d2649943d737bbce6c6209eef4dd70acb7f94024a8f86803757aeb634d3b3884b1c3e583c9787825e9f1d78e5f41e7bd3d4616def0f SHA512 decb28dfa87f71fe95d02df579924e299586b3ebb5880ec8ee36d2e4f75d88782aac36d624a2c791112c1ed4f6fb3f988ba1877bd98a9f1d5b2dda44fd0bca28
+EBUILD gentoo-sources-4.19.214.ebuild 730 BLAKE2B 63f728d420b9676ec8c4f2af540c61efb74ec8b47abb99d4e95ebf926d9d4d345463f32f7ddb622660b476cb9ca3d008d3d656358e7a11a4d1e11a1c19f48d06 SHA512 fb9504bda5fc1c89e3141e910c0c18327fbdd45e674392e75164a35c536a0096bb97ba3790fb40b1debd65415a0f1d2844944aed43caaacbf9f8c49e64a51cdc
 EBUILD gentoo-sources-4.4.282.ebuild 730 BLAKE2B 15e9ef3dc54d7f7ef70e14782f343525a9c984e59854ff1865eb838e0a4de9d57f1a458660d8e4b8436dddc11aa4f79bba285471988253c99933c5a57f74c57f SHA512 35da1377e9ec9325324553a5dc32b8436ab0a9c2492adb767ca1eba9189b6bb98d3c989d2144ebc8c681ddfb27a4a4283150ef74ea05472c013f8fccdb1c1915
 EBUILD gentoo-sources-4.4.283.ebuild 736 BLAKE2B 8e89820b8438812976435e4b27aa3ecac2ecd50e1598f6eb64c46bf9a1c62f87792b44a660b2c683154c2763982f6aff7227605a610a0a776678940adba40159 SHA512 bde18ee0ad102e2b0fe7e3891e74cafe74c3708c000671e0bad6e89a85b7b8032a2e223216534ef21cc0cc63aa0a78c8ea137871db5cee014b0b29f471d7f5ff
 EBUILD gentoo-sources-4.4.284.ebuild 736 BLAKE2B 19a228118bd7958bd5f8f032acbee7f0e900c0b913c92a5a79ce33a861dd4fc19252a96f6415a1b6b9af5a57885442eea7a067b7807861cade5f2b632742597a SHA512 2ca52b0e27bdb017196d0a34c31a48d604dff2c5b4f113f91df50d89fa0b898cf1f96c8ee7a743fca6463bad9c584442570d65b6599975da18b4185dc538a482
@@ -265,7 +265,7 @@ EBUILD gentoo-sources-4.4.286.ebuild 736 BLAKE2B 89ec013fe6d5197865fba5256ada4b8
 EBUILD gentoo-sources-4.4.287.ebuild 736 BLAKE2B 07310b5f4801acd738cb52a4643872b4268a788b3a6011cfc21f40381fdb46a65832296db8c432bbe6573ea5680e006fb387f0256f1b451e5f031d0640d69be0 SHA512 3863851d6878d0e2f6497da852ab25bf85e73334323e4b41cd88926c18cd8d3e5a50e27e3eb9067407a7b64b16ed279492a891e5bce201ec6fb836d78f7f6e46
 EBUILD gentoo-sources-4.4.288.ebuild 736 BLAKE2B bc5eb541c40323e8eafd28bbefb7230b573328e76736c8b44a7a1bd71e9b9732bb6551e2df7ada6e19811297e5e38d7c841ffaaf872248f44c78ff5880f00702 SHA512 ade18b7b3abfa6f38da5123e116fca617e0dad28e6442b3cdfe044a354d0b7b085ba73fd699c272878a38b68f9a8c93020dafd7af2e2c73b6214b3f02c0334d3
 EBUILD gentoo-sources-4.4.289.ebuild 733 BLAKE2B 5ee9f296c53047949a46bc27e93d27f35c02005d00577db763ac27266ac52a0f0ac36f47c9ff7b11ae0f61e58a0094f9a83dd6eed99dec31d77366647c457cb4 SHA512 72828de3083bf4c5bc2adfb13bf66173e9ae431e3b36b6b2f7cc79ac68d2446595e78fc0e3cb4aaa1e86f41630856fcc8fcc6bc8394665ad758402ed6880cde2
-EBUILD gentoo-sources-4.4.290.ebuild 734 BLAKE2B a8b3c5215f949ba04f0acf694264fda22c4458a37e64c86acde81339c15f5355b01a01d3111f8d2a50e56b6ec0ae83851bae0f5f0fd46d96be33b75891e7f907 SHA512 b4367e794698a84eccd0165808742ce1499deb497fee9662360c19565692227f2e8b93bfa42c95c0d1444b59422e771fddef2cb59fd4ff38bbee54c290b762f5
+EBUILD gentoo-sources-4.4.290.ebuild 730 BLAKE2B 2ae0dd7a73a872bf87af43d12937632cd08dbd42194775cdb46964ef12d4844fbbf782d414f110bf7d3c360f5d693110e1e0c14ba98955002219b4e3eb8eb7fd SHA512 a6878cda87a0d5bf40a2c7b1c96b43606b66e79c3c9f14e149367c75221bdda68adbc6aed2af0fb3bd7aaf201bfed37d59c8ccdd01a6e445aa8351cfd96a8d0c
 EBUILD gentoo-sources-4.9.281.ebuild 730 BLAKE2B 3b9f86cd30f60a8ed6bfd1c1eecb703ce542d29e5ffce465c61d6f03608c9bcb6f492809fb52d22eab444518c9facef15888615a555bae44ea5e78ffe3a9a67f SHA512 32316ac1bc4db8150ba4ea09394689ab8c76ef4ee870ea76d9adaf6b8f0303cf11efe7b810e88a8a29c38e1a9d92850f4b8b5c222e9ca5fad901d57a9effb2bf
 EBUILD gentoo-sources-4.9.282.ebuild 736 BLAKE2B 19a228118bd7958bd5f8f032acbee7f0e900c0b913c92a5a79ce33a861dd4fc19252a96f6415a1b6b9af5a57885442eea7a067b7807861cade5f2b632742597a SHA512 2ca52b0e27bdb017196d0a34c31a48d604dff2c5b4f113f91df50d89fa0b898cf1f96c8ee7a743fca6463bad9c584442570d65b6599975da18b4185dc538a482
 EBUILD gentoo-sources-4.9.283.ebuild 736 BLAKE2B 749061d5af0ba7d1e258c73d85c57e41401147010000d38f8f55a97299e9af4bac445b2d9ed431e978e0f1901235484819300bf8103c96196ee5690c31744e88 SHA512 f4c646bcf23cec85bd024b732b7ab403ca968071ff84da1f8dba137979979c9c14757ccc5c3e99a729f3399c59ea982577cfec9186f845ed86904a0731d4f6b4
@@ -273,7 +273,7 @@ EBUILD gentoo-sources-4.9.284.ebuild 736 BLAKE2B 89ec013fe6d5197865fba5256ada4b8
 EBUILD gentoo-sources-4.9.285.ebuild 736 BLAKE2B 07310b5f4801acd738cb52a4643872b4268a788b3a6011cfc21f40381fdb46a65832296db8c432bbe6573ea5680e006fb387f0256f1b451e5f031d0640d69be0 SHA512 3863851d6878d0e2f6497da852ab25bf85e73334323e4b41cd88926c18cd8d3e5a50e27e3eb9067407a7b64b16ed279492a891e5bce201ec6fb836d78f7f6e46
 EBUILD gentoo-sources-4.9.286.ebuild 736 BLAKE2B bc5eb541c40323e8eafd28bbefb7230b573328e76736c8b44a7a1bd71e9b9732bb6551e2df7ada6e19811297e5e38d7c841ffaaf872248f44c78ff5880f00702 SHA512 ade18b7b3abfa6f38da5123e116fca617e0dad28e6442b3cdfe044a354d0b7b085ba73fd699c272878a38b68f9a8c93020dafd7af2e2c73b6214b3f02c0334d3
 EBUILD gentoo-sources-4.9.287.ebuild 733 BLAKE2B 5ee9f296c53047949a46bc27e93d27f35c02005d00577db763ac27266ac52a0f0ac36f47c9ff7b11ae0f61e58a0094f9a83dd6eed99dec31d77366647c457cb4 SHA512 72828de3083bf4c5bc2adfb13bf66173e9ae431e3b36b6b2f7cc79ac68d2446595e78fc0e3cb4aaa1e86f41630856fcc8fcc6bc8394665ad758402ed6880cde2
-EBUILD gentoo-sources-4.9.288.ebuild 734 BLAKE2B a8b3c5215f949ba04f0acf694264fda22c4458a37e64c86acde81339c15f5355b01a01d3111f8d2a50e56b6ec0ae83851bae0f5f0fd46d96be33b75891e7f907 SHA512 b4367e794698a84eccd0165808742ce1499deb497fee9662360c19565692227f2e8b93bfa42c95c0d1444b59422e771fddef2cb59fd4ff38bbee54c290b762f5
+EBUILD gentoo-sources-4.9.288.ebuild 730 BLAKE2B 2ae0dd7a73a872bf87af43d12937632cd08dbd42194775cdb46964ef12d4844fbbf782d414f110bf7d3c360f5d693110e1e0c14ba98955002219b4e3eb8eb7fd SHA512 a6878cda87a0d5bf40a2c7b1c96b43606b66e79c3c9f14e149367c75221bdda68adbc6aed2af0fb3bd7aaf201bfed37d59c8ccdd01a6e445aa8351cfd96a8d0c
 EBUILD gentoo-sources-5.10.61.ebuild 734 BLAKE2B b45954941fbee04fe5ef22e52e8dcf6dec19c0ce8960ae42f37b8c236d418589340aa63abaadb4531feaafb93b6326385851f82dcc8abfe584e2b67091dd279f SHA512 5bb91fb27d1a81cbe2e83685d7e231a46fd23ad08d9c77783dbcf710c6de7dbe5e20c42c0381e0e3dde9e55193dddcc89c965fe6159b8c536cc693d8c5f515cc
 EBUILD gentoo-sources-5.10.66.ebuild 742 BLAKE2B 1cf4a22fa28d505a964741a381eb0a07d73d1cc199b016c7bbb4867921868030d2e93ade96491b1acb0b7469bb42d3d93de48898102796850d2088e82787fd2a SHA512 0263007e35ad14c8dfe980729aace35b45abcbc48d9cbf6a739525cd948c6880e3201740f0e10f62d39bf3469a32cacc3be992c560104ffcfc9d530e65c99aed
 EBUILD gentoo-sources-5.10.67.ebuild 742 BLAKE2B 989a25ee17809f6b5c1653343bafc6e64f7d8853800acd48c173266d152b49c8d8bba5ffc60c38910addbe845c2dbc28dc21f341e1b54825c2a2120994f08022 SHA512 4c8123fe375233294d96fdcf76c4525aac214bff3c0365c98a22a58226bdd8cccf014c9a78bdd8945bf0bcf0977234504b33732787dd0a91b4b6600e14be7ad2
@@ -285,7 +285,7 @@ EBUILD gentoo-sources-5.10.72.ebuild 742 BLAKE2B bc55079aacc06fdaa0ac6db9f8395af
 EBUILD gentoo-sources-5.10.73.ebuild 742 BLAKE2B b7ebc095fcded6075cc2114f903750984cdebc89fcaefb0f68f4263c5369b71d1e540dad33b65374e54dff24a1128059ee06ab1c91e70d0262a3fc1457c45aae SHA512 6c7047f7edbc3e1dde144c709caf3c89bc8345efcdd52005b29a05044c5adc21f44950a1b8ec5551b62cb23684c02d06e7276d6393ce4c7cf9637007cb1de4ee
 EBUILD gentoo-sources-5.10.74.ebuild 738 BLAKE2B 8d5416df1f3a4756608eb4d1411288fcfe5c329d54de75dcb0720eb7fef571744f575106ed1d33b9c0e508992bf1a452e513a24648a3e70cd4c4bd34c50e8905 SHA512 e7f9f1031bf0fc1568fded529eb5e7c57853ff20597cb5c90d311ccfde125990769bc55302955e148d63e70eba264e244637bc5a222142c0881bb470eb91253c
 EBUILD gentoo-sources-5.10.75.ebuild 742 BLAKE2B 60d752e2fbf065c58bf68191d7d34f9783887472efa0a90a56b1fd44f7e809cb5b4025924cbf7f43119d94233337894355394a86ff9582d70c10e86ea88f7581 SHA512 88a1fcbea32902ef5994736463625df3de30260f2fbc37847effcfe8c0d9f8b343f055f06f69ac79f5de029f7fe90d3750bb4b9ff9817e0a3603a1240081de8f
-EBUILD gentoo-sources-5.10.76-r1.ebuild 740 BLAKE2B f60463cd3d5753725a90674f73c4434905ce5b6971eb07d2ecc4fdc389868805fe56c40b0b68b508fe09364fc83e22f030547b58ce138b158ea5ca507b7bcf14 SHA512 a727749fa26e1414a400aaf92bf4129ae7c83f8c60fd066105531533ba01c68c8d286bcb91c69b3e714141fb0a65ced14223edc8a348c24c853c4008a439f91d
+EBUILD gentoo-sources-5.10.76-r1.ebuild 735 BLAKE2B a4ecfb9a148b2043281f619251e3bf9ed8a3ca968f607aaaa0d7317a6ae2c896eda3d9c6a30c2bd20b0b2cd0f52359c519af4cffc32a7fa712d49e060eb51aa1 SHA512 54137c560f1c7bde5c56ebfbed316bd5bc87a141755fb4b2bfcd0fd9a1334a2b477fc889dd8e96306818800389554965972843a72362b3d25167d7cc7cd84ba5
 EBUILD gentoo-sources-5.10.76.ebuild 742 BLAKE2B 4c890b019e3a6b54c6104ec80b1ed85721099807f0a76d6182014d88163668b88842117e7614359848a59968311b512a5db16cff2bd3ce6191ca4b485d1c65a2 SHA512 4fb57d98c2ff16daae7dcc2540d833a30ddc9cafda1a082bf69e24a4b9de38984768291fafaf36352ecefd9edbfe85b7d254c579eab47196331bc1be4e6d037e
 EBUILD gentoo-sources-5.13.16.ebuild 742 BLAKE2B 74b6ec98e31d744b30da21175eb89e36165427733c343e869437aa296994837eadf47330ff7e323c2e4bc8c62d6ab3fdadc7483249440264096fe464d46f0712 SHA512 e66af0a5b1a115f1be4789d7b53b5f2ea3820e4b2436c7e63dd51a898093ff72571a46c0e3dd29b8f9bb73707e15257a0b67626ef5151e89ee14b710fe196822
 EBUILD gentoo-sources-5.13.18.ebuild 742 BLAKE2B 76265b2c2b286b698b37d822c8c63183de8b39eccbb7f0af70cbaa3df10e7958c824e28d531b393b83fc7bc8c93318ba8aa61e1a0af53616204fcbb6d3522e83 SHA512 a7dac6cf5bc99dcee0386434da8241523e64056bab0b219317ca44846d0180ed77682079d2705b6a06cc43e87003905f646a32b02ca48cefae79167f3a9a3974
@@ -314,5 +314,5 @@ EBUILD gentoo-sources-5.4.152.ebuild 736 BLAKE2B c7dcc4eedf6621a6c6b747f50304355
 EBUILD gentoo-sources-5.4.153.ebuild 736 BLAKE2B f9d7a159d00c0044d9bb100c9c8a146f6ba6cdb2ce08d3c8f1b9aecafd2a7d41b51a3fe931cb3c91ea925855b246711f14a3fd4068eabe74248ebf211c24a489 SHA512 85ff4e2d85725a11ec3b2f028855fb2fc86c6241280592aa91df348caa00ede2118ad4d1a6d154c76440393e25facbc46e22d5a0175a3477abb8a787f9884c2e
 EBUILD gentoo-sources-5.4.154.ebuild 732 BLAKE2B 9a210c925cb333ea9417dac25ebd24280ea0f41cded6345ee0bfd920b824be47ca477c0a791fd3767b24a8247e55446a7ff57d86def9a6224c3bd0bc44b6817c SHA512 8e78aceffa2e3115e74a117202eccdb1af949588614776e00fd4d239e4dc3f387698f4a190bdec866d4402d66d4066ba58d566745d330f4c8a0243560375a5c8
 EBUILD gentoo-sources-5.4.155.ebuild 736 BLAKE2B b4ead9cd0bb2c55c36f94a8285c37d83deea7c2b636f88969534729452b0cff361c60ac2ab9eeb28d780716c6a501237bcbd461d48c558cf89898f7c12fdd73c SHA512 4c9027def3b099999b290afb00822029b390f5cbd901d9b27a7db2f480964f09c71de87431f0a6fa85afff7dc00b59fc5debe8699a60097a12a9398de4defd14
-EBUILD gentoo-sources-5.4.156.ebuild 734 BLAKE2B d870b7f6c0d2eecded999b85a9de0fe84f0961bdeb8926dfc308fabe5198f26468fb38f652d76c404f66b9a2ad8d8a8eafabb42c35954121427ed799d99b9b4a SHA512 b1afcdeb0764f515cc6d7df61627a514e6109f87e3b0ec07c1a012cb5c5bdf271dfaba323ff75ac10bd2393089876094a1fdc9c9c856221acbf9ef05a734b33e
+EBUILD gentoo-sources-5.4.156.ebuild 729 BLAKE2B d490e0fec0a906e43b7cf009bc0ef206bd8cad29eb28b8168301f7e237083a9cd36665382ce1c02566354a89bd4f9409ccdb55d3def41e957141c397c42882af SHA512 863dfd211b3c1d0ca31a868cc145f50ab9778b434230dfbf414331836b4848e6924da8cdff17aaccd9fdc2173eca435695ba943649cbd7bf7e91dce7d57d9a26
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.253.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.253.ebuild
index 8c97a2cee296..39c4c513dc07 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.253.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.253.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.214.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.214.ebuild
index 5e1501270690..6475b8a94d1d 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.214.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.214.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.290.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.290.ebuild
index cdf06fdc2b4e..de7f0f204ab7 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.290.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.290.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.288.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.288.ebuild
index cdf06fdc2b4e..de7f0f204ab7 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.288.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.288.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.76-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.76-r1.ebuild
index 182faf8483a3..a055a5daefe8 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.76-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.76-r1.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.156.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.156.ebuild
index 6febf3c31e67..c9bcfda781d9 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.156.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.156.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 2aefa701bd9f..45aea52d0afb 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 97d551998442..2f2b3b865222 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -3,4 +3,5 @@ EBUILD rust-1.53.0-r1.ebuild 406 BLAKE2B 55a09e36f1d03cec045d994929ece183f272ff9
 EBUILD rust-1.54.0.ebuild 411 BLAKE2B 32e1e7089803d7cdd4eb3f4e31bb727a83f0b1af103cefa0e31ff479f8017f3be9d1fd4c595bf6e7d00541839b618f5ac51febd75537ce7e66991741998e2eae SHA512 a8d2f7491a8750c8f560c6b1c6f64d9c405deec340c7bbe8e3e01a2d137bd616caa2db2dbe45df1a6e37d0ee4c90a279f4c6462147a1544736c5f6b3eca6c48a
 EBUILD rust-1.55.0.ebuild 411 BLAKE2B 32e1e7089803d7cdd4eb3f4e31bb727a83f0b1af103cefa0e31ff479f8017f3be9d1fd4c595bf6e7d00541839b618f5ac51febd75537ce7e66991741998e2eae SHA512 a8d2f7491a8750c8f560c6b1c6f64d9c405deec340c7bbe8e3e01a2d137bd616caa2db2dbe45df1a6e37d0ee4c90a279f4c6462147a1544736c5f6b3eca6c48a
 EBUILD rust-1.56.0.ebuild 411 BLAKE2B 32e1e7089803d7cdd4eb3f4e31bb727a83f0b1af103cefa0e31ff479f8017f3be9d1fd4c595bf6e7d00541839b618f5ac51febd75537ce7e66991741998e2eae SHA512 a8d2f7491a8750c8f560c6b1c6f64d9c405deec340c7bbe8e3e01a2d137bd616caa2db2dbe45df1a6e37d0ee4c90a279f4c6462147a1544736c5f6b3eca6c48a
+EBUILD rust-1.56.1.ebuild 411 BLAKE2B 32e1e7089803d7cdd4eb3f4e31bb727a83f0b1af103cefa0e31ff479f8017f3be9d1fd4c595bf6e7d00541839b618f5ac51febd75537ce7e66991741998e2eae SHA512 a8d2f7491a8750c8f560c6b1c6f64d9c405deec340c7bbe8e3e01a2d137bd616caa2db2dbe45df1a6e37d0ee4c90a279f4c6462147a1544736c5f6b3eca6c48a
 MISC metadata.xml 351 BLAKE2B cf3c7f2e804dbe6ddce9380d9c7b32e734df16a04ea867a474a4e6868edfaa72abb79dd6eb47f67128a1b60cb4872c999949e8237102bc2117e581309307f862 SHA512 d32137e0b4549baf85ffaff35d2c5fb058a44e3fbeb7f560db3ebbfc1d44d9ce3651e033cb8434f211994218a85d5bf89f42ea9e3ab76e361c1014dcc6f25997
diff --git a/virtual/rust/rust-1.56.1.ebuild b/virtual/rust/rust-1.56.1.ebuild
new file mode 100644
index 000000000000..f9d87cdb210c
--- /dev/null
+++ b/virtual/rust/rust-1.56.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="rustfmt"
+
+BDEPEND=""
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index dc4c7ffdda58..dee849f51fee 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 7ef2ef98e3bd..18473f7979b3 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_95.0.1020.30-1_amd64.deb 115448340 BLAKE2B 01734fb17a065474a0dcd58432062be063dd0aa0f72e4c4ffc50bb6f1262fa0cf55b3cf1b346e8271dc6049fc43233974c4f1691aafff55f629b38d55a0a77ed SHA512 782a857c1e3a5d97b4fbe287c16811a98fbbef37a90c4478e5f6f49286cb5e585b35e7f444cbba9293bf28c504e90a8ebd38282190744bb77e1aa39fb43c036c
 DIST microsoft-edge-beta_95.0.1020.38-1_amd64.deb 115583580 BLAKE2B 78b45928dab47cb5c2d4ce4ebcc2d22cd186ea2c5aa1e0a763cada47ed1dd5df6d79da708a40be5607f5a01fc3407980bb6d34faf31cd5b2f12524f7d1741778 SHA512 186a0aa8348e5b5040a47a59c91a1b16c24e7ad11cc28d10b3aa9b83100bb70137bfeffed6cef2a37dc89592b7a513b7671f96a1e91f76fd4d1810ae09094b26
 DIST microsoft-edge-beta_95.0.1020.40-1_amd64.deb 115566968 BLAKE2B 74bfc80ffaf513706cb425d23ce34e7c787a959323d31ef4dfd8b73252de73aeca6ac3459a0787577b4d0209267076eb2fa5707e99f08745c9aa6dbc5f918d2d SHA512 2e7a8350ac5d9b60c09b290e86e28fc363a4e412c7b2c25a230d1a9240476b43effc3599e12e736e93d1cb37bcf0e21676c5fb94b5dd654516a88985a1c8fbed
-EBUILD microsoft-edge-beta-95.0.1020.30.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
+DIST microsoft-edge-beta_96.0.1054.8-1_amd64.deb 117817116 BLAKE2B 4804e1e42fd6cd4244f4139640c1f5fbf88d926a2b32c05fba5933cc09b8a61860c4e1a1dce2725f8766cab65ff39c74f65c9b633ced3f1583b202020547c7ba SHA512 e367aefad8f0828ac05000ad7e53f2edb1bb48a3b5bcd840fd870f78cc776b046e5f54f756b11f8aab82a9a4a4ddfe15c5a36011da4d5e33afb441368bac0b9b
 EBUILD microsoft-edge-beta-95.0.1020.38.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 EBUILD microsoft-edge-beta-95.0.1020.40.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
+EBUILD microsoft-edge-beta-96.0.1054.8.ebuild 2362 BLAKE2B 5ce274a4e4cac50f237072a6cc3b54cc47a79e336ff70a7aa92697e24646c37affe68171f6d163766be415a41bb0c160ec8f6ff53441a024c0e99582d2f8cd0d SHA512 0fd3bfb22627908068e26c36226b2c8927999f7be968c5b069c4bab6a52bfb25a601ffd144b2f1c912af72760a9ac6b4258a9aa581511ae017ce86d1bf74d377
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.30.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.8.ebuild
similarity index 94%
rename from www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.30.ebuild
rename to www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.8.ebuild
index a14f69804a04..098697866ecf 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.30.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-96.0.1054.8.ebuild
@@ -91,6 +91,10 @@ src_install() {
 
 	gzip -d usr/share/doc/${PF}/changelog.gz || die
 	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
+		rm usr/share/man/man1/${PN}.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
+	fi
 
 	local suffix=
 	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 10c76eb935ad..09dfe2209e63 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 a5b18f9528bd..da0f48fd4308 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -3,5 +3,5 @@ AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.20.13.tar.xz 5122260 BLAKE2B 4435d25d8b379142fcc4bf60d82e52417ac3ab22a77ededa1472785d67c23bfb95be8e10465fc4859645405b8e580d6dcb262caea39c408e724d0e5ea61b37af SHA512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3
 EBUILD xorg-server-1.20.13-r1.ebuild 5255 BLAKE2B 3b300201176f3d0a83991d48ac1a33aec5f68f25db717ab23bebed74b2c8402385508bf0f6dcfac86158970149ade4f815218d86141ba6582d9c269bf53ce1ff SHA512 794b98725fe94e07f133f42aaf757887881f4a5fb37d8a0a92f77ee7dcbff31d041af380898982dab2996749aa65c399c434d2eaa6f59a68b6d952abfe97e0f0
-EBUILD xorg-server-9999.ebuild 4772 BLAKE2B 63b150caa8dbe80fa8f32f6cba3e1e9442e1e61072f058f2f39fa3e6bac5df6311c5acd446d47697380c44ce790e6178d44749f3d8951cc28bf26ee2102e3248 SHA512 350c2d3997a6b2c2372bca73950b6da96641ee1587221a23be4e673e6925f90480297b72b04edaff9d11c1331b585cbea2a0a9cff0a89e8a2f58e21e58922c1a
+EBUILD xorg-server-9999.ebuild 4222 BLAKE2B 44ea47cbcb8f1e0d9f94c95b9f5809fe71726e342412dfd674b7de71295e0ca8334399e8616c3c9789abdc6b6f9a3880abbb1430460f1680990b207acd1131d4 SHA512 574fddb0803dd75730c80d81b73ba711098fd4fa28546ac83ca4a8e2cb821ffa32ab2a35900315a5a6631d018d7e592b486a429aca4d935e9108c7962a87624f
 MISC metadata.xml 896 BLAKE2B cdcbd8758222413b63e88487aa887654f80fac5e245563e99cc8fa9de5af6ab5da3da2ff499230a1e897b3e051a692e62100e8864fc0cfde128365f85d715d08 SHA512 51970dfe9c2ef9a00dd4095246160f344fa9df76defbd4f0c43e07062b36d4c4f027cd77d0de7d7d70a91995f3e898c4537111b0191298e331fe14586a2d8637
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 428f4355da43..27d63ee09fb5 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -5,8 +5,9 @@ EAPI=7
 
 XORG_DOC=doc
 XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3 multilib flag-o-matic toolchain-funcs
+inherit xorg-3 meson
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+XORG_EAUTORECONF="no"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
@@ -14,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
-IUSE_SERVERS="kdrive xephyr xnest xorg xvfb"
+IUSE_SERVERS="xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
 RESTRICT="!test? ( test )"
 
@@ -36,10 +37,8 @@ CDEPEND="
 	>=x11-libs/pixman-0.27.2
 	>=x11-misc/xbitmaps-1.0.1
 	>=x11-misc/xkeyboard-config-2.4.1-r3
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
+	>=x11-libs/libXext-1.0.5
+	x11-libs/libXv
 	xephyr? (
 		x11-libs/libxcb[xkb]
 		x11-libs/xcb-util
@@ -86,8 +85,7 @@ REQUIRED_USE="!minimal? (
 		|| ( ${IUSE_SERVERS} )
 	)
 	elogind? ( udev )
-	?? ( elogind systemd )
-	xephyr? ( kdrive )"
+	?? ( elogind systemd )"
 
 UPSTREAMED_PATCHES=(
 )
@@ -105,83 +103,67 @@ src_configure() {
 	# sysconfdir is used for the xorg.conf location; same applies
 	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
 	#	package it somewhere
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable debug)
-		$(use_enable kdrive)
-		$(use_enable test unit-tests)
-		$(use_enable unwind libunwind)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal dri3)
-		$(use_enable !minimal glamor)
-		$(use_enable !minimal glx)
-		$(use_enable xcsecurity)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		--disable-xwayland
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-sha1=libcrypto
-		CPP="$(tc-getPROG CPP cpp)"
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}/var"
+		--sysconfdir "${EPREFIX}/etc/X11"
+		$(meson_use ipv6)
+		$(meson_use debug)
+		$(meson_use unwind libunwind)
+		$(meson_use !minimal dri)
+		$(meson_use !minimal dri2)
+		$(meson_use !minimal dri3)
+		$(meson_use !minimal glx)
+		$(meson_use !minimal glamor)
+		$(meson_use xcsecurity)
+		$(meson_use xephyr)
+		$(meson_use xnest)
+		$(meson_use xorg)
+		$(meson_use xvfb)
+		$(meson_use udev)
+		$(meson_use udev udev_kms)
+		$(meson_use doc docs)
+		-Ddrm=true
+		-Dxwayland=false
+		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
+		-Dhal=false
+		-Dlinux_acpi=false
+		-Ddtrace=false
+		-Dsha1=libcrypto
+		-Ddefault_font_path="${EPREFIX}"/usr/share/fonts
 	)
 
 	if use systemd || use elogind; then
-		XORG_CONFIGURE_OPTIONS+=(
-			--enable-systemd-logind
-			--disable-install-setuid
-			$(use_enable suid suid-wrapper)
+		emesonargs+=(
+			-Dsystemd_logind=true
+			$(meson_use suid suid_wrapper)
 		)
 	else
-		XORG_CONFIGURE_OPTIONS+=(
-			--disable-systemd-logind
-			--disable-suid-wrapper
-			$(use_enable suid install-setuid)
+		emesonargs+=(
+			-Dsystemd_logind=false
+			$(meson_use suid suid_wrapper)
 		)
 	fi
 
-	xorg-3_src_configure
+	meson_src_configure
 }
 
-server_based_install() {
+src_install() {
+	meson_src_install
+
+	#The new meson build system do not leave X symlink
+	ln -s Xorg "${ED}"/usr/bin/X
+
 	if ! use xorg; then
 		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
 			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
 			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
 			"${ED}"/usr/share/man/man1/Xserver.1x || die
 	fi
-}
-
-src_install() {
-	xorg-3_src_install
-
-	server_based_install
-
-	if ! use minimal && use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${S}"/hw/xfree86/xorg.conf.example
-	fi
 
 	# install the @x11-module-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-
-	find "${ED}"/var -type d -empty -delete || die
 }
 
 pkg_postrm() {
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 5c65ca74be38..dfb0310dd75d 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 4e9c0a6a4cad..5c2fec5e6fe1 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -47,5 +47,5 @@ EBUILD nvidia-drivers-460.91.03.ebuild 11875 BLAKE2B edc8991dae9896d93f8542a7e2c
 EBUILD nvidia-drivers-470.62.05.ebuild 13899 BLAKE2B c9e9628a5719fdf216dac5af6a84d4823e1cf1226df54820557baf1f76e3e4ddb0e0da94a62e88bf77df2a9041b00b63337ce15784167dcd7d7c00ac9e6e5771 SHA512 c5901655c9448a015541be100dba5f9fb16d6163277a739e0c98e06ee822db8834ae74e06540f9410d4492875c237cce38cb3fd7ebc4bbc76b486bc21c100850
 EBUILD nvidia-drivers-470.63.01.ebuild 14027 BLAKE2B 76a764a4d160d520421e4947bb4bef20a151775c3c94175b84f56b0daba24d40196677684bbca84c2eecf35eb1d4e845007d76f4ff9b894619167bfba6d36603 SHA512 d30676d11c9478252df15a52faeceb65e35c3c2e267dea12ed6edd01a1fe1d1ad4a7836c0443972888764cf36caf8f9b522576aa4dd40aed959abb8429b6f604
 EBUILD nvidia-drivers-470.82.00.ebuild 13783 BLAKE2B dfb5a935fa136e8a47136a7bda0aff15e59afcfe5af4996371d1c26de04add832a2d3cbc56a338484f96f71b066c9dae269d624f6e2398130a12eef811d76526 SHA512 b14d55c7456f3607054721e36bf5b5f44b34135f1246e1c12bb76e6594a02adb0fc8dae752cfe6124add23a5041f0c95578a162476de2b9a105f5152f9a55bc6
-EBUILD nvidia-drivers-495.44.ebuild 14599 BLAKE2B 8e99a760d24e71aaa23d4f8aa3399994be60528e1945c8b868cc37f63b522a47a3e0181c5824b21e24530645dc3c4a379738f8829b84936c55ea1bb1731126ff SHA512 bd9cd7a6a59af0283dc389d2f6aa0c70aa63e903254a1d4b4a4955909b876f9e9d8f4d0bae92d8aa6cfcdaccfcac2d9cd62ebb240c8e2783ebf6f064175f6050
+EBUILD nvidia-drivers-495.44.ebuild 14599 BLAKE2B 168834d0277811dae270a1e413afcbad1cc215a44634e40f4c4e93a3c86e7c1dbb315ee58370ce16703ac1912f1ab73da27a77a79de5f8a42deb55c1f85a2c4a SHA512 f5e7bd25861ddba1caa40334402282987ec7bbe19994dea921378ad0e8321307997c279ed72f7a0b36e2ccf5a08f5dc1e7dc1e908b857faae9e652b7333de2fb
 MISC metadata.xml 902 BLAKE2B 4c8373f3c7ac73f1f2b18e9c4a9a95868fe2c780aa4b200e366823e6094cd28a74e7a6e2a4dcbe1df3b711ddc753d497e9bd43ae677f1bdddd0e20aa3997beb1 SHA512 0d165817d0cdb0bbe3c8c4e096e058ba8f4ba8bdb92fa4705b68412dce07213c73c522fd35b3f93da963a5f24f03725e32d6db63c75e01c93a8be4c7f2c1fa4a
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44.ebuild
index a4f8404fb0da..bc8689cc2750 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44.ebuild
@@ -467,7 +467,7 @@ pkg_postinst() {
 	fi
 
 	if use wayland && [[ ${REPLACING_VERSIONS} ]] &&
-		ver_test ${REPLACING_VERSIONS} -lt 495.53.02; then
+		ver_test ${REPLACING_VERSIONS} -lt 495.29.05; then
 		elog
 		elog "While this version of ${PN} adds GBM support (allowing a wider"
 		elog "range of wayland compositors, such as sway), be warned it is very"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index cc1dfa9d054c..c78067bab0d0 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 339bc92881dd..2588bfe7f3b9 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -7,8 +7,8 @@ DIST pango-1.48.5.tar.xz 1819476 BLAKE2B 8529e8cbcf0f33be56cf09229abe45fb3525e12
 DIST pango-1.48.7.tar.xz 2050880 BLAKE2B 2ee048d9713aed0972ffdf3feb96c7c0683ffa1494ac2b798a4f6b1f5797d689b0e0c06bcc3f4a10130d23279ed295a3a59141c75bd3a0f2da7facf62d6c3baa SHA512 e5680d628f531bea7633945bd74dc51a93c4c881dec58fcf9f6271043e77b82a4805e311355cb4d9f8cdfcdf52785a5a6391517a264b62416c26e82dff4aca39
 DIST pango-1.48.9.tar.xz 2063756 BLAKE2B d1610aaac783b95a35ad3e083b4bab33f3d4beff533386817addcb5eb9022de242087ffe4e62c043870b4aac1fbc0fe3e1c5d18744909a5a05015a702dfea2e3 SHA512 e3bba743bb596b0a34cedc893f9af0216bcc9fec521c2da09cfdeec9ad80a05b5c53c3fce1a225ab27536e9335725cffb87c66867d0522fd4632df00b1d4c056
 EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
-EBUILD pango-1.48.10.ebuild 2057 BLAKE2B 5d9d9507bdb3695655a2d181cca7ec59c89e827bc03fae07a4f6ac1fc51f37aa1b74de08444871a7172f9034be2f9472b08180572bf6d370dc77d87bb6f915da SHA512 064cc58be5b6a6354fa3e85fc476f5a16fba419fa2b059dfe359962a26b20d53916dc76fc5f4a219b0e20e65ec5320b8efdcef1dce0d14b3de1d62cc29c65b89
+EBUILD pango-1.48.10-r1.ebuild 2286 BLAKE2B 55034f42e682e0997522c44188be4599178bb1f935006413f5f1b5ef08e0f62bed95691bc5894b059356a9a98f9759f817104152e8bd61619c72899664c3ccbb SHA512 bc14e5ada67b6969b4b1be800a04bdc4b0a1bbcb4bd90c1ec20f47202594d525b0b453a528e3843ef6b4b9c00fb388b356b2ad7203824f25498ae441690fcecb
 EBUILD pango-1.48.5-r1.ebuild 2140 BLAKE2B e53a8cab9f9de8c8e5828fbfe3784877ef4c416ee39a1780a49b0978c5f4a85ff21e2a53a3204c65a51458d25b143ce8361dc8323fa34167981066040cb982ab SHA512 ebadd72e5bfb7ed5fccc1da685d6b973c7931fcc076c6a466e49e8c41980e0a781f3ff42272b83b0b9db02224b9a30881fd2f0c484c9f0f163101f17e1b5b3c9
-EBUILD pango-1.48.7-r1.ebuild 2044 BLAKE2B f41c95cf047f668bd702cb1a22423b714093a6c19d5c43f9765d6db78adb7d94948a13bfbd7c4d055524afb17d23016d15c279d09e8e84c4a6114ccb4e5eec21 SHA512 c852bffff4a6801009fa576fd9ad3f3d675404135f8d836dbfadaa34b2508f70db820e1808621ab953cb727eb901da0c020066ee658eed80c286a23a7034dfed
+EBUILD pango-1.48.7-r2.ebuild 2273 BLAKE2B 01b85b64743d399ec1372c34f8fe356cf08132a94b42ad3a6675088d90533d326cdb804bfca96cf52c197fef228574ef77b4d428a4102ed9dd0346a29ca995aa SHA512 25316916803bcfbb1f90fb6921d8d0596e70d1ea4f9eac9d35f612d55f3c53131d2f11d80469ff8b0244ad8758b54d937baba46f49fa38a29013430e48935d26
 EBUILD pango-1.48.9.ebuild 2054 BLAKE2B 487470875c5a78508292841229e1600208c73dcf4bf10accbffeff3f7ff04e85c2cf3623d085af116e753efc172951b3b9c168996859c6253430a9ca1ab4c369 SHA512 1c87f5774542d295a7f5ef2d8fe3445654493ce426af739d0f823c03732021df5667195462f498daf670f908e23558f43cb7e81802fbaa7faf98a44dcdc290c9
 MISC metadata.xml 523 BLAKE2B 623788e7504fe89c7d8604eaa2a6b1ab5fb022965eaa3044dd2a94b6f68638453011257659c0f17b7ced9b6945acb3eb4767f9fd3ce9686b69b3b60b867dcdfb SHA512 a60feab6e4e50cb9b477f388d4534eed4616fac6aca4f6eae450fac42bfa9ca0d7382e36b98a159732f9c6926162cb2ea55d72a644bc77629ff09fd0097226eb
diff --git a/x11-libs/pango/pango-1.48.10.ebuild b/x11-libs/pango/pango-1.48.10-r1.ebuild
similarity index 87%
rename from x11-libs/pango/pango-1.48.10.ebuild
rename to x11-libs/pango/pango-1.48.10-r1.ebuild
index 0c88d2262013..9eb3d082e26a 100644
--- a/x11-libs/pango/pango-1.48.10.ebuild
+++ b/x11-libs/pango/pango-1.48.10-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	>=media-libs/harfbuzz-2.2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
 	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 	X? (
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -73,3 +73,12 @@ multilib_src_install_all() {
 	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
 	doins -r "${S}"/docs/Pango*
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if has_version 'media-libs/freetype[-harfbuzz]' ; then
+		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
+		ewarn "lead to minor font rendering problems, see bug 712374."
+	fi
+}
diff --git a/x11-libs/pango/pango-1.48.7-r1.ebuild b/x11-libs/pango/pango-1.48.7-r2.ebuild
similarity index 86%
rename from x11-libs/pango/pango-1.48.7-r1.ebuild
rename to x11-libs/pango/pango-1.48.7-r2.ebuild
index aef9e1d9db15..cc225cce0cdc 100644
--- a/x11-libs/pango/pango-1.48.7-r1.ebuild
+++ b/x11-libs/pango/pango-1.48.7-r2.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
 	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 	X? (
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -73,3 +73,12 @@ multilib_src_install_all() {
 	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
 	doins -r "${S}"/docs/Pango*
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if has_version 'media-libs/freetype[-harfbuzz]' ; then
+		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
+		ewarn "lead to minor font rendering problems, see bug 712374."
+	fi
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index a67f0e61c3dc..4816f9d426ad 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 14a568439227..350a69aefcf3 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -2,6 +2,6 @@ DIST libxfce4ui-4.16.0.tar.bz2 837838 BLAKE2B a7e0612bb2a6e47fb9e03c69f1f014740b
 DIST libxfce4ui-4.16.1.tar.bz2 785811 BLAKE2B d1267b328b7e2d07bfe85ce320da6a60d5a7d739c5ded9b213b83b0cde2061d3badc937e71c4353291ed435fb9d1294cadcc99402cdae69f4bcecf412dd525f2 SHA512 c183bbc75539c777fe704d0a1c4e533fdd2efb6cbc980cfedc2eaa80d0e6223db038498774ffcdc720d7f991dd8d9634183a757a4c4d1728cc9956a33cb187d0
 DIST libxfce4ui-4.17.1.tar.bz2 805413 BLAKE2B 008ab4988e66bc4f3dff3a9071ff1bcb83b7100193a5b10bec123a3c55ae94a21e43cb1bbf9723d5b736bede32f96425ff3e1768f43d607142d0b42ece5ddf29 SHA512 4ec6da3c454752c024e8ca26a84e6524d5fc12644a36c77a77375d533faf8f971d95dec555db7441ec100a17dd9fffd094144226efe27a155490a7c2bdea6484
 EBUILD libxfce4ui-4.16.0.ebuild 1727 BLAKE2B 0e00b59daa3ff407dad5ec02f09c7806160a4a80f08b5d1c1d9ca89588b77a295aee83dfd3e697bc87e1e4bbd8a2dbd7b0852494f783a2439515dd171bbd4d2d SHA512 1c3910d58274816dd82ecc058218a33f64eb5f99509912e127fab2b3369f3e64bd6b0a70afd6b1fdd1af84939c197b18d48bf24ee15e530233117bcd978450c3
-EBUILD libxfce4ui-4.16.1.ebuild 1728 BLAKE2B b8e85c2850acec67551670d538023e3bfd2e5829ff0031824968ee6184d6d58412b55bbdf10381eae065ab7fe1724631593340aaf0a1ef271c0a70e0cb1fdc91 SHA512 c676624436d11200545cf8c84684aaaae07264cbe2312013ce262a69b0dbabe4911b45f7908a4a16868f4ab3db4a427a3de88529f77b5ed26ec36ab75d5bbb61
+EBUILD libxfce4ui-4.16.1.ebuild 1727 BLAKE2B 0e00b59daa3ff407dad5ec02f09c7806160a4a80f08b5d1c1d9ca89588b77a295aee83dfd3e697bc87e1e4bbd8a2dbd7b0852494f783a2439515dd171bbd4d2d SHA512 1c3910d58274816dd82ecc058218a33f64eb5f99509912e127fab2b3369f3e64bd6b0a70afd6b1fdd1af84939c197b18d48bf24ee15e530233117bcd978450c3
 EBUILD libxfce4ui-4.17.1.ebuild 1734 BLAKE2B a324f7bcc500a5a6373db94ee3bc6bb58f7bfcf98cadd8dff70e7aed0fbcb6ab1f6dedd4bc5668f4457987e38248371263f1eb76c5123ee628ba798a94f48316 SHA512 c47195bac879cd7cc6629f7b9ca8de0ac08db5706dc7bc592d8d408b266f8fdabfa507d3e222939d1168307d1da726b4ddb3225738af98877c269c3eaa71e64a
 MISC metadata.xml 415 BLAKE2B 96ab20930d257e21f8cb46d95f24e7d0fe7568aba5cc097ffb9ec46a5341d58dcf366522de79d8c04b575cd0cf6b96724ed969b8d6338cb842bd50787620ea9b SHA512 9712241bf2f9bb14ac6969f02768e7c4a159f7349eff4a7c9bc8fb779955a555b4cb5770ed32203933e603acb2fa9456cd989a62e274c94320e81e820555644e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
index 7f55ffde5102..3914cf85dbfb 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug glade +introspection startup-notification system-info vala"
 REQUIRED_USE="vala? ( introspection )"