diff --git a/Manifest b/Manifest
index 5258f807d0ec..cc66ffa00df4 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29267 BLAKE2B 0f55e0cfd981c45ee11df056e3d18452934aff743c15d05d75315825f2d7003d39dadb0c230926d3bbe9adc7a6164dc1e05e221672a8ea1ae79914ad885e38d1 SHA512 2fce2d50681d2319981a69574a1d8334cd9dbb7d44a75ea9caccc5f7e6a41b3aa33d9427cd6c249b911ee0947afd2d43ec215d5584d5d44ade703af0766406ad
-TIMESTAMP 2021-09-19T08:09:07Z
+MANIFEST Manifest.files.gz 29276 BLAKE2B 26dcdfb392bfd7e1125ce588b532e365d6c057b64d43060b9a754aa4b8fa16d78db7bd99c4667c33fe9ada479862e14f1785d4c693679c397670050c14c555fa SHA512 e6b5a103bbd19587dfaac30cbba561ce07cb969b57f9fdd68eb49c5fcef46729cc1b993b4ab8b3d5c7dcc73ee28580010054587c7d2db9409e08c9d1f07f21c2
+TIMESTAMP 2021-09-19T17:09:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFG8CNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFHbrdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAtOQ//U9i9hBQrlwv6MRvisoEggiDBryEoYrEV8ZkVeIxo22HTkNAmg9tvS+jR
-aWhC3M4EUs7i/8NI2glodt9eJozmy/N0D8v41AWQPIj/e9WIOfUTIWMPmwzfd/Lw
-h+nfK1S3ZyrAewsrJpMKNUkCxCGOJWPdojG4sd1hAorkTLipfATDu37kAsXVKDVO
-vin3XkIpc1QcStPy8M8vEeFpsAJBycyynRtcb33pPm1OohrZdJvOKVPHabrUpBvm
-8U3+M4TLqEzAlz/nP2FZDWt1ie7VKg65kxHo7/qwgLJSj9/ulXciexQqF6sD339F
-H85ddQPNH/hbdx8evOdHNV5C1V9GM4kRs6AuD6nvZ65mwszVgOyqVFXlFzB+e0A/
-YLOv+xWPfOk3u/hdO12AgT52ntfj+yw+GuubrO7YszKrWe1bBEymGtgabgODFCiV
-VaJ1s72HnMwjbA39wowSMfSn7B1MhtmWznBS34MWyvyM/EVOIHo2G3E8xjM6YydT
-7gPTbhAkpWnj6mxzYR9IQ58bgDgbAW3gEsEsH10wQzIJzL4NbfnbS9EU5x56Ljst
-+h8ugXjGYn+U0eJYnKtPzAnN/MJuXzIRcwokZUM6Mt2VuoAfFrNlisbzwLJvvvkW
-oaiwyN7b/zToXsnp8jeznMBEsj6dNv566UijfV/Rfud9qWJnIBQ=
-=vxtP
+klCdgg/9GoCOGr8V8g5Foc9Z46B8swVjekD3LyApaM/dmy2dMElzGEweT1o3cHGu
+3ubBMbjPbmI7WL6LQW6z2AtkwfAmP9/Taqx8UMvFzQnd3zf5LRoWI2XOIHrMfBxJ
+upLQGlbrbVM9xtWm87fiOe72fkSBgzwTK34pJnZASgpx9ofhhmkaVWHkGOIr5STq
++DO8wn1ucHn2lpmFmz82e3/hqejJaPPmoT5SnUOjX3TVjmzszwfOOlE5N9Vp7fr1
+cZNDz8hRIvsp+/hxf1rm0JvL0fwC8vM7tzz4DSVX1gdqcj4ev5Y6843YSix6qvzz
+00F9VBkE6chAVaPkli6Wizgt+hHiNthwEjZposkNzcTfEt68XhjS/9nPzQORhNaa
+lR7pvkQILCb2h3WbHpP0m1IRYZag8apmZSZdBwoHGXXj4zYklOtnUVA8wHHspXpL
+2wm826OzF0KX1T+fVKENRv9euq7dey1w1VKhDT2TDBjAHSrZJxSoW/pB4NMSFV+z
+5Pey6WZ3seDCcEB8od1dYW2b44kKAGHOBTfIIBUwjg5fVPub8fi/cwjxPDilzGmD
+/+9Ha8/UiX2b7VXGGwPNLnULpOjDSd7qHzfsoB6kHaI3MxB2pUldTjax/TXhb3GJ
+5gkyRhpfvh3k310uRrTQ34iHd5Zu847ZDtnpEI+DUfu67sk5M9A=
+=eCCc
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0a489897fa6e..9d7814e81bd0 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 19e8fcce5f28..d624ac48ab12 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 13d34993fad3..ad6e446a178a 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -7,10 +7,7 @@ AUX lnav-0.9.0-bug713600_1.patch 914 BLAKE2B 407c737471d4cda95c12aff862dbd3a1709
 AUX lnav-0.9.0-bug786456.patch 12017 BLAKE2B 0200e3b741e9b5d62cdeabf83c96d94be091f4895db492990404dfc0f41d8017aafe1afb8492688061c497e98bb0ea62bd96ed8c36f365782868ffed04904281 SHA512 94ae1e0590dab749923ca51bb407efc37db555c891df402f07143901077e8907b6bf90c1a6a7ec2d8365555d22e38d772ad39d7d4db86f0e76fbf98f5c10cffc
 AUX lnav-0.9.0-bug792582.patch 3148 BLAKE2B 8392a375e0d47996a9e2afd6d34a5c0b38efd5ad187e83ecfad9d4badec3565cff549dbe5ad64ae7417e1c2bedeb4f5461dcf96f54e6301b3ac0496a1ae7326e SHA512 4bf60c52f8678189f6e61415d5ca1859122f67603ccbfddd991ad4f825fcda4c01ae4992f2696e93c726f19d83488231da83b02c8d20bf6ee3f7def022e73547
 DIST lnav-0.10.0.tar.gz 5678120 BLAKE2B d64957e94cc5415e663db8ab5722e6424381aa83a2c9430397baed782b47064ed8f460f27bec6256206cabb43f20eba9318aec1991115b577fcc9c37585dd932 SHA512 d07f4e594b9b905453f4c0ac54db2612e3bed533b47f4fd5b6b0da4e27a2d3bb611cbdf9801c12b6edae045c58881ff1f458f144981fe3d8a41f8d113e847efd
-DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7d16fb618aeb9857ff86d1cc9c982d23bd172cc95f5e200afe84b488422ad4fc0aeb440cf2a96506829198e SHA512 fbb61d454dc89388aeaaeca6ba1366f84cbd75260ef8e2f26a4208ab22f175886438dad7f40e4c21089209c7713c1ebcc3a722a248083c8d55f264cf139a79fe
 DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151
 EBUILD lnav-0.10.0-r1.ebuild 868 BLAKE2B 21f7e1abdb467c1dcbeae316d3d8f96fe844ad9ff9dd13ae2208ef4e81688664e71918217ca0010c88082a536807dfe7dfa540ada306cb46f6a6e9c134ea49bf SHA512 b01777e82754e0300582edd9037ccd1c478b97ccf51f1fa51756bb305d0cad62a0b29fc0a3df5d001eb13c6a86738413677a6ef23df794997be6ec0aaedbb29d
-EBUILD lnav-0.8.5-r1.ebuild 771 BLAKE2B 609d5809483dfc348a4979ed7760e804bf3b12f7391c4ef54e3df7062a33deccbaa538f72d1ba743cff7d1ffa7c582b5415bd6b7d0e4829348ef959a44f7d19b SHA512 9e17a7aa378d23baeb26c55c74e947b868f60fbcbacda28795add54ed6f83d5f6e12f5562b5bb01e45e9be62d82e7071d6d8f944296c863ae90de893404e2ef4
-EBUILD lnav-0.9.0-r2.ebuild 946 BLAKE2B 2588e27c8d698fc0f225327433a9a740d46f5137399586bf66466d99ec3d710e04b57c46e6da12fb1478ca962633456cdf5d46d3b8452190dd8e7580dd652e48 SHA512 b38de5ff9bf039a45ef8ab9e2444a9395650b99a684b8c80cce8eea58f5686fae55d19bca9c595541d0801c7706d0a8028bbdbeae075ffed5c2288d2096347eb
 EBUILD lnav-0.9.0-r3.ebuild 1129 BLAKE2B 28295e39ddfdb4fb151132c61e0928dd9ab53853206d6f1cd4bd378d45ca07826eb8fa7c64efeb44d6cd1c8af252d050e36eabffff3bd9232b6825ba977b627c SHA512 2801635eebd830873063750792af5b4d441166432bb064cecb562f9f5cd27ef2249574dade33e53c066e3b044f0cf00831d9246e2dab350ed9c0a57d8e298e6b
 MISC metadata.xml 781 BLAKE2B 6c7ff3da9a9dc1a5369ca51771ac4f11185426296f806e674a67a95a341ee5b466261387913ccc96e1d9c1b10c3719ae52f529f24004f5a464cb3f6d884e9fdd SHA512 b928e1a51306e3e48dfb27a50b240f2d855380988b6bbd4650cc04583b73385cf052f947cbd7ed089efa4e1131d23503f4c3fe539c20c724dd29c6e43195a48f
diff --git a/app-admin/lnav/lnav-0.8.5-r1.ebuild b/app-admin/lnav/lnav-0.8.5-r1.ebuild
deleted file mode 100644
index 2e91e591669e..000000000000
--- a/app-admin/lnav/lnav-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A curses-based tool for viewing and analyzing log files"
-HOMEPAGE="https://lnav.org"
-SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="unicode"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-db/sqlite:3
-	dev-libs/libpcre[cxx]
-	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:=[unicode(+)?]
-	sys-libs/readline:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-PATCHES=( "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with unicode ncursesw)
-}
diff --git a/app-admin/lnav/lnav-0.9.0-r2.ebuild b/app-admin/lnav/lnav-0.9.0-r2.ebuild
deleted file mode 100644
index 6849f2beec08..000000000000
--- a/app-admin/lnav/lnav-0.9.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A curses-based tool for viewing and analyzing log files"
-HOMEPAGE="https://lnav.org"
-SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="unicode"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	>=dev-db/sqlite-3.9.0
-	dev-libs/libpcre[cxx]
-	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:=[unicode(+)?]
-	sys-libs/readline:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.4-disable-tests.patch
-	# bug 723242
-	"${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch
-	# bug 713600
-	"${FILESDIR}"/${PN}-0.9.0-bug713600_0.patch
-	"${FILESDIR}"/${PN}-0.9.0-bug713600_1.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with unicode ncursesw)
-}
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 3e46abca8b4a..554ccae607be 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,8 +1,9 @@
+AUX 0001-__init__.py-Make-NetworkX-dep-optional.patch 2242 BLAKE2B 63815b66a6b5051ca084fcb265a6eb573f4738288376dada16c86c04ae3dbf4d58ff33583ff323d1096b321f0d410ae3b956b9e82caf710f78baf82db1a769fb SHA512 eac87e9335643b5e2f0de05b6e03c03d250c799e994edd52368b3a50e201beeebfbf40b7bf016200648fadf9c3d5c3708ac94ff158ea327cf2ea73f773ac8653
 AUX setools-4.3.0-remove-gui.patch 879 BLAKE2B d8c61405d96466fbd2f1704477dfbe64477b7cb26f2a8aae66c6d7ca0ac73c4a6372ce02917ef2ef424bb8faa2175bcad7c2eeca1c84d292005d5426eb3db004 SHA512 de125a4bd4fa8aa1aca98b33449d9b11746b2aa6ccfa202ed9711b253a9da98c1200b075e7b31a27b00fe3277557d29c1be8971a5fc079be572d61c25b64bec6
 AUX setools-4.4.0-remove-gui.patch 1015 BLAKE2B f81872b140107337466e1d57bfd3c1935adca838756a0c1a2c4f2d0f42b7ae0ecb60d5c6db0889998bca96d46c08979d03e989a79461bb6ceb3c7bd4ee6fa56f SHA512 6e2b3d0dafbb4b0966f04cd592fc14800755ea4f585ab4d1bf0516cd25f16185b0923045762ce88df47f7264481fb9dd6588efc38d7280e14b5f015192f12924
 DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
 DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8
 EBUILD setools-4.3.0.ebuild 1261 BLAKE2B 2bab4af1c52f47255c6b54fb533084022005c875c7c7dd73738d60c4a8510d3e37467a11a19e5d3380ec2e677e8e2d65b4ba9c12ed51a8502cb2709be48ff308 SHA512 8ef6976367724748118cd44c4c1c8ee1de6d2f993e78193a45163ec7647c6949bf1226eea600d5a9e4f0fb12ac17ec4e6a33feaf5e10f5bd14662823d22f1d09
-EBUILD setools-4.4.0-r1.ebuild 1363 BLAKE2B 44d3bc2c3c9abc7d34f128adce19b4ba4f3f5dc50c1945986a18d22a0a55417394e056bd5029b3b69cd9f333baef89aedba099907c39e0f627f5e72f3d020984 SHA512 56fd9ef1d0b5f3429ed499e18ac4c178eae013fb1dcf241ad895d624a2ffc4c53cdf154a6ee8f05faa502c0efec84eaab651d19045322dbc4d891f4b51cf34aa
+EBUILD setools-4.4.0-r2.ebuild 1441 BLAKE2B 8be0a3e114117d067678990094abef9dd22eaac53b2673fa92ac8ecb6189e51e42d6204712ff64d97c78244a7921491adff4598dc5346429d32fda367060ca5a SHA512 a65fd8a947f02b46f7048853cb80fe80b63c23f1b74087888f1f014bf30ae99fd82c143fca7af4795456ee52ce899565dcc7985c0f050475eb895be77f236856
 EBUILD setools-9999.ebuild 1365 BLAKE2B 127420df824469dc42686a5d13915b98e23fa82174b8cab2a98ae66764437acf8f4cc1e074359b5e1b8f747cf58d859bb13a7d7df1c9556178b90d4fcdadb34c SHA512 80d58742b61e04fbc35b87da9259efd27c609d4fadcf44b3aadd2f1dea948fee0672e7f2ee8c9c3ccbb42dc82434f9b1cc3c500083a3e31e12add281e65cc751
 MISC metadata.xml 440 BLAKE2B 5ff05dac3cb6a27d99c7ebb2e4425afaef2275aaff5e109feff6870e2e51c55c27dd8baa3d6ad3a2a9a292a20ece18dfb2f0ad61e30cd1dc7b74afaf20d0104c SHA512 f61bdc193e411a635c35e7244fad44b68061c56fa26a1b995f79fb46784d09f52bd85bcbc8caec5043390a72d8548fb4ac0dd84cd4a613dbbdb5fd49e3efa71f
diff --git a/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch b/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch
new file mode 100644
index 000000000000..3137f1a89f9a
--- /dev/null
+++ b/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch
@@ -0,0 +1,62 @@
+From 32eed2ae8fcd868179a317d48cfd61d828c834df Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Sun, 19 Sep 2021 14:12:44 +0200
+Subject: [PATCH] __init__.py: Make NetworkX dep optional
+
+selinux commit ba23ba068364ab11ff51f52bd1e20e3c63798a62
+"python: Import specific modules from setools for less deps"
+Makes userspace tools only need specific parts of setools so that the
+NetworkX dep can be dropped for minimal installations.
+Unfortunately the __init__ still imports the parts which require
+NetworkX. Wrap them in try except to guard for missing NetworkX.
+
+$ semanage export
+Traceback (most recent call last):
+  File "/usr/lib/python-exec/python3.9/semanage", line 29, in <module>
+    import seobject
+  File "/usr/lib/python3.9/site-packages/seobject.py", line 33, in <module>
+    import sepolicy
+  File "/usr/lib/python3.9/site-packages/sepolicy/__init__.py", line 15, in <module>
+    from setools.boolquery import BoolQuery
+  File "/usr/lib/python3.9/site-packages/setools/__init__.py", line 94, in <module>
+    from .infoflow import InfoFlowAnalysis
+  File "/usr/lib/python3.9/site-packages/setools/infoflow.py", line 24, in <module>
+    import networkx as nx
+ModuleNotFoundError: No module named 'networkx'
+
+Bug: https://bugs.gentoo.org/809038
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ setools/__init__.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/setools/__init__.py b/setools/__init__.py
+index d72d343..e583737 100644
+--- a/setools/__init__.py
++++ b/setools/__init__.py
+@@ -91,11 +91,20 @@ from .pcideviceconquery import PcideviceconQuery
+ from .devicetreeconquery import DevicetreeconQuery
+ 
+ # Information Flow Analysis
+-from .infoflow import InfoFlowAnalysis
++try:
++    from .infoflow import InfoFlowAnalysis
++except ImportError:
++    # NetworkX is optional
++    pass
++
+ from .permmap import PermissionMap, RuleWeight, Mapping
+ 
+ # Domain Transition Analysis
+-from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition
++try:
++    from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition
++except ImportError:
++    # NetworkX is optional
++    pass
+ 
+ # Policy difference
+ from .diff import PolicyDifference
+-- 
+2.32.0
+
diff --git a/app-admin/setools/setools-4.4.0-r1.ebuild b/app-admin/setools/setools-4.4.0-r2.ebuild
similarity index 89%
rename from app-admin/setools/setools-4.4.0-r1.ebuild
rename to app-admin/setools/setools-4.4.0-r2.ebuild
index 5ae05f843c9a..54c34d2b8fc1 100644
--- a/app-admin/setools/setools-4.4.0-r1.ebuild
+++ b/app-admin/setools/setools-4.4.0-r2.ebuild
@@ -44,7 +44,8 @@ python_prepare_all() {
 	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
 		die "failed to set lib_dirs"
 
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
+	local PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch )
+	use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 90259574cd35..77337726555f 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index 912b9636c04d..aee7ecb3aadc 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -2,12 +2,6 @@ AUX bonnie++-1.96-compile-flags.patch 611 BLAKE2B b4290c150cd7a84e3b3f60efb1999f
 AUX bonnie++-1.97-zcav-array-indexing-fix.patch 1474 BLAKE2B c31575b33594c310884d95c0030867706dee2598b49c9943e8ca6af3e6ebef5454f1cc786c487f8970f8be70df54830b54ab02ccd061a8bac2daf100d77b7578 SHA512 f26a3873965d70c3cb1b0ce4422daa1a9b3152d189a532c81ec4764aac1a04fadf45f1c562fedaaa6de443eeadcdc176ed7b5c1353eeaa91ad340a1560e96d32
 AUX bonnie++-2.00a-gcc11.patch 5975 BLAKE2B ca83a0e7815641f67926ed49b7e80a0eb4819ee7988213f472e8d441c70a45169725614ac73b0b7225f017444d34e2066168186809a1aa8aebfb3d83dc8423e6 SHA512 86b681fd1420633e50b75a200def5a6696216761064f642a47aad648b7ae932d8debcbf0f499e4f66c122a462a55a18bebede548867dd005c358708e6501d5f4
 AUX bonnie++-2.00a-makefile.patch 1680 BLAKE2B 9fcf5496573df14ad37a73426b4e05ce6348ec4304d529d03c2e12ff98bd643ed0121774a7e4e28e4f9d6a233d7d6df2d6ba59c1a3843ef7e10a7976d60a4c80 SHA512 b03c747b93dcbf1bd405052c1e5c73d1f9f35b59f053fd106f4ffddfed89ea7579b60201f007c174f81e20fa4ee316ce2a0ae4e529ceb31c8143b9d7893cb44b
-DIST bonnie++-1.97.2.tgz 102533 BLAKE2B 019182c08b9ff7ba60e421f94039c09d27855f9e5b313f451721afdaedc9dc694b468bb30e78a04b655ec9a358ace3d68b13fc8f4d80ca3c48e0ff9387525b57 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170
-DIST bonnie++-1.97.3.tgz 100166 BLAKE2B 30feca43a2ec37b795168d37bb941241777718222d7e0681dc85a34f8691e76b4306850e41dc6bbfb3f0ad34123ecd1c12396efea99e2ade12206aa6e78708e8 SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893
-DIST bonnie++-1.98.tgz 100339 BLAKE2B 2a75cbeb881fd12727b5edf4e67789e64bd624b1885cdaf83fe3fc920fb2346e98faea2d9ce5da6fac8a84318a9cbda013afa2c9809892b23d3cf85c5a70982b SHA512 3cf70be4a20c58c80e29a140ec6d3c3884f1b4101e0fb63da0ea831fe4a5eb4e275bda2ce4eaf7d9c2bfb65742e985249b491cda8bdad85984a62f2fc19756c0
 DIST bonnie++-2.00a.tgz 100502 BLAKE2B 8bf9105dbbb1137485d8f24d4b911ca6787d09e3926181b460c18ceb52aea11ddff8f8edfefd1b2577fb1b59e658f4835cc865755faf739389f78fa855d13815 SHA512 1776f8406ccd0341f13bd952830f063e7df8fc2bd6d5c837de875dd5f817e29982b2a6358049221bffcae8faa7489560d2a1af46d79d8eb221d515d797236bdc
-EBUILD bonnie++-1.97.2.ebuild 951 BLAKE2B 43567c5542dcee95e2db0d85b2489de1ec616d37f1a846da79617b9b93507d6926e35755e82b1730f4e3eb4c4fba4e025279082bd30ee85992ba93906d9d8d03 SHA512 3d627625c700fec0c5ff3582dd7d080e0c900c7fe60859970e12330526416604c00cb933722a2386ae84a3e8e252e545afff6f7432d71fa9678fbde37986ccfc
-EBUILD bonnie++-1.97.3.ebuild 950 BLAKE2B 7c53c91c578a093ff0af144521520b6733003b4b6d9638e14c4f8a6950eae01e8fe1dc0028e4dff0bfdf9fdfb48e5f6aebd56c7db8a18af5ed3463d11becfb3e SHA512 00435788b509443f193d51fa443127f2d2614cb79cc02fab13c6f4979b0fd6f67d25df525ab3a5fc0842a60c625b48ce313655b7b5bd72ad03bb316ff631d697
-EBUILD bonnie++-1.98.ebuild 954 BLAKE2B 6e526aa665af274640f705b2423dd5d22742a9a0b81aef5b824960bc2ff377886aaca8ae80ea9788247a5d6e4b76b3f7755d3da8c3bd8e499a83cdfe16a30743 SHA512 438619d2734cbf6ce88d7a380ed94b68036485871a9ea8898134e248e2877e0833ae11db209cfb6bd2bcc4c9efdcc54670c66bd738678a6274f42cff3735d280
 EBUILD bonnie++-2.00a.ebuild 925 BLAKE2B 5c91b2e4679171289360f79f346534394b586d17a93ee802d7c90eaaff04363864d13a61ec478cb6a0710610b15f96959d3c1e6442fe293a057e670e6c63936a SHA512 f0d1f78578e72615ccf4ffdc6e7d5a61d237ac8015305134c3d445db6add6d1c84d557ea02def28db1c66e0b06dd705905c29e4cd26932ae76217a27b9b27329
 MISC metadata.xml 611 BLAKE2B a8dd9debf30948ef91c6c759a74d50dd86ff2b9ebed7bc79941ec3a8fc2d71afe317516b529e0e6bb3083d7eaff6c2058aacc6de7b31ddc90a33add334f9285a SHA512 85e2c3478dad820e840f0b255789ac0d70576dbe721020b46b5a70a4c6b3c04cb3f41a2d2132329867401f3826c22fb1c4061a89a551a3c2e3238ba263008754
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
deleted file mode 100644
index 232563e5bd6b..000000000000
--- a/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Hard drive bottleneck testing benchmark suite"
-HOMEPAGE="https://www.coker.com.au/bonnie++/"
-SRC_URI="https://www.coker.com.au/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug"
-
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
-	"${FILESDIR}"/${PN}-1.97-zcav-array-indexing-fix.patch #309319
-)
-
-DOCS=( README.txt README-2.00 debian/changelog credits.txt )
-HTML_DOCS=( readme.html )
-
-src_configure() {
-	econf \
-		$(usex debug "--enable-debug" "") \
-		--disable-stripping
-}
-
-src_install() {
-	dobin bonnie++ zcav bon_csv2html bon_csv2txt
-	sed -i -e \
-		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
-		bonnie++.8 || die #431684
-	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
-	einstalldocs
-}
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
deleted file mode 100644
index ba2aa0078ae3..000000000000
--- a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Hard drive bottleneck testing benchmark suite"
-HOMEPAGE="https://www.coker.com.au/bonnie++/"
-SRC_URI="https://www.coker.com.au/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug"
-
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
-	"${FILESDIR}"/${PN}-1.97-zcav-array-indexing-fix.patch #309319
-)
-
-DOCS=( README.txt README-2.00 debian/changelog credits.txt )
-HTML_DOCS=( readme.html )
-
-src_configure() {
-	econf \
-		$(usex debug "--enable-debug" "") \
-		--disable-stripping
-}
-
-src_install() {
-	dobin bonnie++ zcav bon_csv2html bon_csv2txt
-	sed -i -e \
-		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
-		bonnie++.8 || die #431684
-	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
-	einstalldocs
-}
diff --git a/app-benchmarks/bonnie++/bonnie++-1.98.ebuild b/app-benchmarks/bonnie++/bonnie++-1.98.ebuild
deleted file mode 100644
index 3a228eca434e..000000000000
--- a/app-benchmarks/bonnie++/bonnie++-1.98.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Hard drive bottleneck testing benchmark suite"
-HOMEPAGE="https://www.coker.com.au/bonnie++/"
-SRC_URI="https://www.coker.com.au/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
-	"${FILESDIR}"/${PN}-1.97-zcav-array-indexing-fix.patch #309319
-)
-
-DOCS=( README.txt README-2.00 debian/changelog credits.txt )
-HTML_DOCS=( readme.html )
-
-src_configure() {
-	econf \
-		$(usex debug "--enable-debug" "") \
-		--disable-stripping
-}
-
-src_install() {
-	dobin bonnie++ zcav bon_csv2html bon_csv2txt
-	sed -i -e \
-		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
-		bonnie++.8 || die #431684
-	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
-	einstalldocs
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index be5f2184f1f6..fa832ad36c5b 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index ddd4a27626dd..952716168891 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,4 +1,3 @@
-AUX wine-staging-6.12-winegcc-equals-args.patch 666 BLAKE2B 1546e146a5942c46c01e72d06693e0875dc84483159a404d1a13824b29e2539f2abe95f2086509de049ef0477a0846be7149e82949f5c55aa5c8da925679773f SHA512 6377b3f86966a19c1129c75da6e2bfdbee2c2ee7d7c38460778239adc01fd56328a20b74b9c73d5b757f0d53abc91bc498d71f988eba316267bb508234a98a8f
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
 DIST wine-6.15.tar.xz 24751680 BLAKE2B f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028 SHA512 bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
diff --git a/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch b/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch
deleted file mode 100644
index 562b63af063a..000000000000
--- a/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.winehq.org/show_bug.cgi?id=51413
-https://bugs.gentoo.org/800809
---- a/tools/winegcc/winegcc.c
-+++ b/tools/winegcc/winegcc.c
-@@ -1982,7 +1982,7 @@ int main(int argc, char **argv)
-                     if (strncmp("-Wl,", opts.args->base[i], 4) == 0)
- 		    {
-                         unsigned int j;
--                        strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",=");
-+                        strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",");
-                         for (j = 0; j < Wl->size; j++)
-                         {
-                             if (!strcmp(Wl->base[j], "--image-base") && j < Wl->size - 1)
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index dc251e7517b4..958b85ece7f8 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,4 +1,3 @@
-AUX wine-vanilla-6.12-winegcc-equals-args.patch 666 BLAKE2B 1546e146a5942c46c01e72d06693e0875dc84483159a404d1a13824b29e2539f2abe95f2086509de049ef0477a0846be7149e82949f5c55aa5c8da925679773f SHA512 6377b3f86966a19c1129c75da6e2bfdbee2c2ee7d7c38460778239adc01fd56328a20b74b9c73d5b757f0d53abc91bc498d71f988eba316267bb508234a98a8f
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-6.0.1.tar.xz 24210540 BLAKE2B 2075e59024e75594e0be0851db33981ebfcc57477bb9864055a938db0e39b8480f3c501b1d1fc39a9eee52303ad71ef71d24a0fb546697eecf3bb098f13317f1 SHA512 06b720d6adbbb7e2f15b963e4f3f1ff06e6d0d3973064d866ae720e6380bab8881fd1ebf16665435f5f7976b2c6dc72fd20631678a28e9d4d7b068c30cd22bb0
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-6.12-winegcc-equals-args.patch b/app-emulation/wine-vanilla/files/wine-vanilla-6.12-winegcc-equals-args.patch
deleted file mode 100644
index 562b63af063a..000000000000
--- a/app-emulation/wine-vanilla/files/wine-vanilla-6.12-winegcc-equals-args.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.winehq.org/show_bug.cgi?id=51413
-https://bugs.gentoo.org/800809
---- a/tools/winegcc/winegcc.c
-+++ b/tools/winegcc/winegcc.c
-@@ -1982,7 +1982,7 @@ int main(int argc, char **argv)
-                     if (strncmp("-Wl,", opts.args->base[i], 4) == 0)
- 		    {
-                         unsigned int j;
--                        strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",=");
-+                        strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",");
-                         for (j = 0; j < Wl->size; j++)
-                         {
-                             if (!strcmp(Wl->base[j], "--image-base") && j < Wl->size - 1)
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 98e8199bb857..d01093fa8179 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 4b354153b3c1..9460ce4fef70 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -6,5 +6,5 @@ DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fc
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
 EBUILD htmltidy-0.99.0.ebuild 1970 BLAKE2B 3070aed3a7fd97500449b0a9d15e94310d0fc6e1132031eb780c219341906c9c28d18c17510768a39f7c0abeada96ba536281d4e363cd9a5dee333cf05d80ef5 SHA512 c2daf06a319549320e4510df60f240e9f6a9504657fc230ca3d6af535804b1daf47fae2c6f92bab84fdc31b3968683e30228196249b60e92d480540006c89c2d
-EBUILD htmltidy-5.8.0-r1.ebuild 1494 BLAKE2B de2b8586b9c894b89e8d9ab3b9faf2b3f8f784dbaf99b4a7243fa335dfc4433fab1346f2cf45d8ee3379e29d657ead73a09c00b2d63735c67fecdeb998311b8d SHA512 c7251f63d0b9f8992056e4094e55088328bdcce6983f708f8abccdd35c83c0027a2a3761e9aaccfa34f74f8c264ad47b469897019292e222f9fac1065a60f1ec
+EBUILD htmltidy-5.8.0-r1.ebuild 1500 BLAKE2B 2c8ffa8c7816e971ebd1b1f8fb0cf58953b2c90dee92391f147596a21d71600186dfc0c8240366c721a972cf5fbf24790869c4f64a1eda9f0561e5006bc4395a SHA512 f2bbd45a64d5dbc8ff7a04bb7ac531c006216df8984b02c07e4e68e2f137cf114b0887166e81c57b80059edfb16e58df0330994a95d9030d80d5d7dfc968a2ec
 MISC metadata.xml 608 BLAKE2B 7fcc3eaa3f24191606776cc3a92f97d58f1ba27c3ebeea50727bc334d504ef09ff4387208222080574856db1e6d1d8689a9b22f1ef0f0347f3bb82d9a38a6afc SHA512 adc1857b273dc8bb8fd7215cd733e56dd41eb7e9eaf82ccf183f001afeeaafd2ba4cde4f9b75c2882427ebed7cfcb60a16408d19f9f6c6ad91b6beacc9edefeb
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
index 5dcdaf488f75..daa550a98022 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/htacg/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0/58" # subslot is SOVERSION
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="deprecated test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 65c869001360..11f91beed78f 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index 47c446d38e71..9cb377af475e 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,4 +1,4 @@
 AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d918094397702d6b7f9eaa9e2edb39d754d12beb23b2b6b0a55012773767915c2dc3bd69db850558c8c3afbe44dd5 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9
 DIST asis-2019-20190517-18AB5-src.tar.gz 6173053 BLAKE2B 2ce8ba783f5d58503f6b792329779eb8a5f99746b3b03225f13da058ed5a757aef49c6ae8729b71079c67da6537c35db1c7173a569a2d7063421da5d2adee2c4 SHA512 3ca32fa2eeee10ef2d0e6eb8ab555c3e31b417bdab6749fdd8bd264efa2c93a388a5731c40705782a3a28f16e0c385af195f69d95020e265b2230ead1c91977f
-EBUILD asis-2019-r1.ebuild 1213 BLAKE2B 8460b7c7e3185d15d2ee21f784a01a71c91b35af39be467b39b80c8e1649a6f38e84c199d8db255a073c0f7ef3952c0eb401042c63152a8ffc82183f426f6548 SHA512 8f6212f5612a12a463d894351fb1848ad2fef415e671b9da066bb7ddd0b6c39cdf3ceb848f6b4173650aa137b1140b5521a3a9069b46ac0a8d8133d8a70c832f
+EBUILD asis-2019-r1.ebuild 1207 BLAKE2B 02002b6d758c758a305a96538bcf8dbc17a2241b370e25340ab21a3e348e5f6811b465cc2c29c83d81ec898fe6ff003c879cadcefbf8324ae318033b8fe00702 SHA512 b4cb2635493cf9b85037d5568a7ae568b9d295a46db9e4376ffa2d25f00d8164614a2a5ed5081e28da51cdd23d50f59f9b2cbe9b8323a70a50d90351f9ae668b
 MISC metadata.xml 508 BLAKE2B 15964fe3bd9f54ebeb251f7cda5556a3c3da9f9f5c5568b8ad46e647157beee7e8a49981a94e312515696099335912cd775662a99cc1c8924195c39a9f398aec SHA512 6edf9a3b75e80f055d05280f5cab76c16f97f5e2f9c726d59f1069dbb60ab0af04c56a8d4d28e265aa48a581461f65fc2df9f763d7d831bc9bda4745b1eee1d6
diff --git a/dev-ada/asis/asis-2019-r1.ebuild b/dev-ada/asis/asis-2019-r1.ebuild
index ce52378a7851..e7cccc68ec91 100644
--- a/dev-ada/asis/asis-2019-r1.ebuild
+++ b/dev-ada/asis/asis-2019-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7,8,9} )
+ADA_COMPAT=( gnat_2019 )
 inherit ada multiprocessing
 MYP=${P}-20190517-18AB5-src
 
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index a32999d45442..fac031cc8a1c 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,6 +1,6 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
 DIST aunit-2020-20200429-19B6C-src.tar.gz 615443 BLAKE2B b7d31dc8e198b3ceb94d043d701dceadbc1e20596a71a4f25a140bdd3f9ad54f7d7e4d4bfb587fbc31b9a6a046407c2d0dbd77dd2d045878e9aa2da3954d2964 SHA512 2d61db882cd7eaf66be101ffabafafdab1834578df162f0ef1947b517265033285cef3d84a76a3b0f1cb05d0adf12a1910b652bfbaeb56fc022157f44b34de86
 DIST aunit-2021-20210518-19DC5-src.tar.gz 625153 BLAKE2B 385478bcc889d5f764a3498d98915928671a546c7345d8ca3e4f092d85a92c7b196d2a3f7a81f2199237f472f691d30b05b2f3308f063c509d8e9f3e834d620e SHA512 c365ed5ffe4ff60413969e92989396c6d2849a1f16ceb4b8b3fd666153f6cb480f4d74c42362fb751c522a29a555996e3bc5fdd0e80ba2e817940599f8be4798
-EBUILD aunit-2020.ebuild 1157 BLAKE2B dfff70a9ec5b111355f65f820529781aa5c2041109095310b31f5780738e330d5a0dd2228e889847f2d39f9db5a7d4a2fa13166a6f1fbd63b470dfdc944999a7 SHA512 165e1398966e92da28f0f8c23870b2827783471e735f545f0f62ae54b56a4c9179a769161f68eab407be35f676a19b9390e1986a4ac21cead3120d2e0a8a7815
-EBUILD aunit-2021.ebuild 1205 BLAKE2B e26780774bf852591f459c766b29aa336dd4dbc7d3163aa529dac15a3e553c4406ed82e420b71c941c93b2c88350542a229bc4e08f6454866976f5d58f502815 SHA512 20ff7a5126a02a1fa9406f599096dc2519655ed9e3ff20a01a01e17ea69e4769667da6f65850f3d0fd94d7377119a065ec3a696bf35c0d86291c01d76a72bff9
+EBUILD aunit-2020.ebuild 1152 BLAKE2B 02f0e97a436b42824cc3232faeb655669be1834ba43cfdb5b163e1bd5f738e25e8a8f86c01740d6ae3f0367fdc1280607c606abccd2a101452a97880b2282ea2 SHA512 6612fb1260c5ddba710d5f1c450887098d38b6be78edee3bfa9a45f2264b7a404573313fe48747fa65c5478f7fc0d8e53effac55a710b09698c1437a0fefa523
+EBUILD aunit-2021.ebuild 1200 BLAKE2B 0d1f32cda4c0b5cfe40feb02c614a266abffbabf3ea9eb822b698ed79850385739153eabbbe65f7b283800feab59e1f568ffdfcb256605abcca03c57cbf999fa SHA512 e4828ffb77d40ed4e6ce5a03062f3859071437cff1785b657afef55a22b32b2fceb1e3ed7321d7fc2f9f7c3eb36c50c8c5c1f103b509f01da648e1944e4ca6c8
 MISC metadata.xml 765 BLAKE2B 2c88223f93f67e6e6568faf85d8c7319f06d238dd7697bd0c0c505100a398445b9eb4853e0b270f9422215d16f9c24144cdc5385416b8a5160342921f3fdb1d8 SHA512 6aa62fa9278a592b7a2d175ef785e9a6d9da6d39f9e0a1019d8c1b2d1a483c894f4b9989ec2b194ec42c70d159ff06040cdc4a4f3c285566db697641a5f3cbff
diff --git a/dev-ada/aunit/aunit-2020.ebuild b/dev-ada/aunit/aunit-2020.ebuild
index 4bf0db12dc93..af6cc9bb9aa5 100644
--- a/dev-ada/aunit/aunit-2020.ebuild
+++ b/dev-ada/aunit/aunit-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} )
+ADA_COMPAT=( gnat_2019 )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19B6C-src
diff --git a/dev-ada/aunit/aunit-2021.ebuild b/dev-ada/aunit/aunit-2021.ebuild
index 32626cbcbf1c..cddcfaa703b0 100644
--- a/dev-ada/aunit/aunit-2021.ebuild
+++ b/dev-ada/aunit/aunit-2021.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
 inherit ada multiprocessing
 
 MYP=${P}-${PV}0518-19DC5-src
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index afe87d11cb7f..43d564bfb468 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,12 +1,6 @@
-AUX aws-2016-gentoo.patch 1255 BLAKE2B a2b2d944a131d83b789fe91a1b31b062f039b2f6bafa870d524aefbdb59146a26ad5e7cc39222318aaa8ae9ccca663bead98e198aef845ce86d3195568a15d33 SHA512 53b4156f9c025969a8e2f603e1672949f7f2dd58a4c3d1a4ee8b17094a399bb207b6a242419ddd5e5a7e151ea3a72baee1c67f132aafb260ab5f89d8d12ad377
-AUX aws-2018-gentoo.patch 2097 BLAKE2B cbb0ed91c632292994efc2bec19d49b8ce62b0ccb04b052d201cf698c71c5adf0b699a9dab8df92f7a8787af1c7147b53ac620f4d98466bd04d3b05b8224d3ac SHA512 08bd51c90699e8d64acd1947c430ee2dd73c3fc82e754f8330be5a58525c0fce7953bc55e3d3a42078e717bc935db4b49bf3d73f154ff1e8695e1567644c8182
 AUX aws-2020-gentoo.patch 450 BLAKE2B db6858688b2a9237efea0bf82f39d62855a0d126f3be7174981700bf4964e053c0715cd2e5f9f0cc98c5a884a89af47b7f83e6a7ce89d491073bf4c2370ee91f SHA512 80862c07fec63999ff531981c843e463888bb2f78310e28fa9ade6814553cb3cadad548d896a643a819bd5904b7056486ff372ad101c6919919fcc6895f14d02
-DIST aws-2019-20190512-18AB9-src.tar.gz 4241817 BLAKE2B 1054c17c0e79ea4992a7e29fdb1996caa663321407b64ae88cb76cb03d953b7ea36a8c91a28f60328ea2ec3223c1d7f8c2f052f4f181f03b1f59cf33443ee27e SHA512 989043f75504ee8b3736800fa36f4d3a98a6bc745ff4bef38dd4f7c8a7072d5d1ea383dfd2fc090d8558a6d6442953e5f3c65e4633ab16bfb3dacf60ebf79a3b
 DIST aws-2020-20200429-19A9F-src.tar.gz 4120886 BLAKE2B 44156b532dd4382995e5b33eedbb39b4d4fa542f57f3a7d596875a25c1eb59c3e4cc0085cfc60f385566842f2b047086a66a966dc3b9dcd8f48ae7da0c07c01e SHA512 284331bcd07955737ebc6b95a0a72984ace55a1911f1ed809b0ba8e525b03df57a668ccd92d0edfde42be2e06c09a3225e84f5d0501a488a004eb3eeaa746a61
 DIST aws-2021-20210518-19F65-src.tar.gz 4351625 BLAKE2B 227e1af5423c7cbf8b15b2ad37b5fbea862daca10dd12e79edb6cb1392f502b8b665d0cedc151a4190723c6aa795801b65c5807592d0292511a9a80318f0a722 SHA512 1820750daf2ba2e95479a8280aa0eae0d38e1d86a32570b4caaa845498ad8f0e8ac8c91f6aef0d5ef06fa1b33bc2b2b264cacb7101ca69fc81f36ab8cb17c65f
-DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
-EBUILD aws-2018-r2.ebuild 932 BLAKE2B 3fc7a96afbc603efc81339cea628ee55739a93859cad07a3255103daf04635280d6d2329a1532dfef2156ee9f53e4d020bb03d5901720c9570a0a851d727d24f SHA512 27b1a91ffd6b9c30099f3d556d4443deb19ea6970fd943e3c1cecb1ea83611ddbfef382b2d45b4ba0762bbeff36e9e0f5677255ef6fc511032cf128bd4270d2c
-EBUILD aws-2019-r1.ebuild 892 BLAKE2B a364986dd0a40544fb4915ce6484d517f62437468a55c01189751b3d9c0818acea43df3db2ff29de97736fc045da9c3346bbeff77ccf73e146cf80e68c433c7a SHA512 c394e76af5ba613cb8d817b563947f8d12a988f1e2d024ea31c95bd0f361a342ddf30a769bf77a8dc9c001d404e65afb609997130f3a08cdf63940497e0f3603
 EBUILD aws-2020-r1.ebuild 949 BLAKE2B 4e1c7cb3283d45871e84b3eb13d92e2dcf1a20ae3bf49c69fe1e028fa9f570e18e62238f62070c685695b5ef2ce1113caf3b66e8dec1a3a3cea0e03a04c07b64 SHA512 c72b085268de15d8373f1bb270f9171e483056532f90e79d1ae259943baa0354f37a6f31ee4fa11c8dc950cae830c689205451cc7990a4ead4a7176e78b2253c
 EBUILD aws-2020.ebuild 900 BLAKE2B 4e8e25a6008bab2738c23883c55680c99e068604f00f6f1900bb03e410295c6a591fc8ddc728d19f376c2539f0d6f31bce4bcb438c3b349b9b50bccdf55f18d9 SHA512 125aa34b8f5046cdd56e7111dbd2a53bd39b46ee2e6ead82fdbf04d0e62d1d62d570494fc6fb803e8f8864b443f8c1ea8b14b356be2b8e518b1aa1951ec8db60
 EBUILD aws-2021.ebuild 944 BLAKE2B 9380715d4fd6011d36f87675cc1a5ad9ffc4eeae9218636068c35e7f74cd1aa33830e9eac4b8cca8c9eeb76f2dceb2bb2c6a7cc9ce3b0712253f4fb6c2fed967 SHA512 97dc2eebf62c2c25ed1ded30eb536f152199192aed8dcba8939de8c747b62ae1ede6ca3380b3bedebe399ffb7473b469674464cd6ee9d252391600dc16df746f
diff --git a/dev-ada/aws/aws-2018-r2.ebuild b/dev-ada/aws/aws-2018-r2.ebuild
deleted file mode 100644
index 9e567177b601..000000000000
--- a/dev-ada/aws/aws-2018-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_201{7..9} )
-inherit ada multiprocessing
-
-MY_P=${PN}-gpl-${PV}-src
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd
-	-> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/asis[${ADA_USEDEP}]
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2016-gentoo.patch
-	"${FILESDIR}"/${PN}-2018-gentoo.patch
-)
-
-src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
diff --git a/dev-ada/aws/aws-2019-r1.ebuild b/dev-ada/aws/aws-2019-r1.ebuild
deleted file mode 100644
index 536310bea463..000000000000
--- a/dev-ada/aws/aws-2019-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2019 )
-inherit ada multiprocessing
-
-MY_P=${P}-20190512-18AB9-src
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf85a031e87aa2cdf16b19
-	-> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/asis[${ADA_USEDEP}]
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2016-gentoo.patch
-)
-
-src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
diff --git a/dev-ada/aws/files/aws-2016-gentoo.patch b/dev-ada/aws/files/aws-2016-gentoo.patch
deleted file mode 100644
index 8894e014e333..000000000000
--- a/dev-ada/aws/files/aws-2016-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/shared.gpr	2017-01-30 20:00:39.022743691 +0100
-+++ b/shared.gpr	2017-01-30 20:01:20.524985069 +0100
-@@ -151,11 +151,11 @@
-       end case;
- 
-       for Switches ("aws-attachments.adb")
--        use Common_Options & Debug_Options & ("-gnatVn");
-+        use Common_Options & Debug_Options & ("-gnatVn") & Adaflags;
-       for Switches ("aws-session.adb")
--        use Common_Options & Debug_Options & ("-gnatVn");
-+        use Common_Options & Debug_Options & ("-gnatVn") & Adaflags;
-       for Switches ("templates_parser.adb")
--        use Common_Options & Debug_Options & ("-gnatVn");
-+        use Common_Options & Debug_Options & ("-gnatVn") & Adaflags;
-       --  Disable validity check on this unit to work-around N728-028
- 
-       --  ADAFLAGS and CFLAGS should come last so that command line
---- a/include/include.gpr	2017-02-17 22:09:14.361695926 +0100
-+++ b/include/include.gpr	2017-02-17 22:11:36.497215517 +0100
-@@ -54,7 +54,7 @@
- 
-          when "Release" =>
-             for Default_Switches ("Ada") use
--              ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Global_Options;
-+              ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Adaflags & Shared.Global_Options;
-       end case;
- 
-       case Shared.S_Target is
diff --git a/dev-ada/aws/files/aws-2018-gentoo.patch b/dev-ada/aws/files/aws-2018-gentoo.patch
deleted file mode 100644
index 5c615d32dba0..000000000000
--- a/dev-ada/aws/files/aws-2018-gentoo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/config/src/aws-net-std__gnat.adb	2019-05-31 19:03:42.565961279 +0200
-+++ b/config/src/aws-net-std__gnat.adb	2019-05-31 19:05:23.895245892 +0200
-@@ -132,7 +132,7 @@
- 
-       if Reuse_Address then
-          Sockets.Set_Socket_Option
--           (Socket.S.FD, Option => (Sockets.Reuse_Address, Enabled => True));
-+           (Socket.S.FD, Sockets.Socket_Level, (Sockets.Reuse_Address, Enabled => True));
-       end if;
- 
-       Sockets.Bind_Socket
-@@ -263,7 +263,7 @@
-       package SC renames OS_Lib;
- 
-       Option : constant Option_Type :=
--                 Get_Socket_Option (Socket.S.FD, Name => Error);
-+                 Get_Socket_Option (Socket.S.FD, Socket_Level, Error);
-    begin
-       case Option.Error is
-          when Success                                       =>
-@@ -439,7 +439,7 @@
-    is
-       use Sockets;
-    begin
--      return Get_Socket_Option (Socket.S.FD, Name => Receive_Buffer).Size;
-+      return Get_Socket_Option (Socket.S.FD, Socket_Level, Receive_Buffer).Size;
-    exception
-       when E : Sockets.Socket_Error =>
-          Raise_Exception (E, "Get_Receive_Buffer_Size", Socket);
-@@ -454,7 +454,7 @@
-    is
-       use Sockets;
-    begin
--      return Get_Socket_Option (Socket.S.FD, Name => Send_Buffer).Size;
-+      return Get_Socket_Option (Socket.S.FD, Socket_Level, Send_Buffer).Size;
-    exception
-       when E : Sockets.Socket_Error =>
-          Raise_Exception (E, "Get_Send_Buffer_Size", Socket);
-@@ -709,7 +709,7 @@
-    is
-       use Sockets;
-    begin
--      Set_Socket_Option (Socket.S.FD, Option => (Receive_Buffer, Size));
-+      Set_Socket_Option (Socket.S.FD, Socket_Level, (Receive_Buffer, Size));
-    exception
-       when E : Sockets.Socket_Error =>
-          Raise_Exception (E, "Set_Receive_Buffer_Size", Socket);
-@@ -725,7 +725,7 @@
-    is
-       use Sockets;
-    begin
--      Set_Socket_Option (Socket.S.FD, Option => (Send_Buffer, Size));
-+      Set_Socket_Option (Socket.S.FD, Socket_Level, (Send_Buffer, Size));
-    exception
-       when E : Sockets.Socket_Error =>
-          Raise_Exception (E, "Set_Send_Buffer_Size", Socket);
diff --git a/dev-ada/gnat-suite-bin/Manifest b/dev-ada/gnat-suite-bin/Manifest
deleted file mode 100644
index 48c0511da06a..000000000000
--- a/dev-ada/gnat-suite-bin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
-DIST gnat-suite-bin-2018.txz 337235688 BLAKE2B cf1b8f0253907b8fc97b9c7218b23dcda8f1557be5e12293eab59e09427418a8814c1bafbcb3f89c1e5dd755a161c5dfa8a852631d137f17acb3167bf51dadbb SHA512 9b57709c05a121b0a0adabe3232128e3f27659d1928857fbd6883b73a7487c3d457317e8f236df3d16ced635514af8afbafc584cc74d865e11288820ac9c4f77
-EBUILD gnat-suite-bin-2017-r1.ebuild 3056 BLAKE2B 084b833babecae00b2abde0201d5d922f505512f1a7ebef21fc804f965e7e33f6b458bc378b9bdc29352b646e2d0cbfd779c8b42ac93da2034678368039bbc8a SHA512 13cf9b0bf38f0571931e122eccf4163e593465478487946ab400e756013a81d7c1d3561028aee7a68b09b268dc475197c1cd6489b2fca37a2593d0506036bcbf
-EBUILD gnat-suite-bin-2018-r1.ebuild 2635 BLAKE2B e27bb365615e90a06bfdf0a6cb63a1c1983c63bdcc5b2733f2fd071ce01702078dd98e4be4b123dd3ea1bbd0293afeabff7493b14058fcf9b4addc74e7603d86 SHA512 2b5664186064527292120704bb4c4e9ec39a82b15afae22c8c3454b149c3806da8a2a483608812a5cc2cfc4a9bd08901d7d4df0dd27d2151032031d05074e434
-MISC metadata.xml 216 BLAKE2B 921055d990617104de7e3437bc9fd4598cb830193bfcdc34254102a1df2c6025916af7025843f161dff8de731f9726641906b86f831375c5d29303ba64991da2 SHA512 8c43f5f2be76799c8ace4df222de22380c389e058bc7e36bd9b19564cbd4b90ab7515b90f822139a18b3a2cba70e76d3b4eb5426f88a0508798175893073d732
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2017-r1.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2017-r1.ebuild
deleted file mode 100644
index 0c084228c8e8..000000000000
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2017-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MYP=gnat-gpl-${PV}
-DESCRIPTION="GNAT Ada suite"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c6d80c7a447af2deed1d7
-		-> ${MYP}-x86_64-linux-bin.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="${PV}"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-devel/binutils
-	sys-devel/gdb
-	sys-libs/gdbm
-	sys-libs/ncurses-compat
-"
-
-S="${WORKDIR}"/${MYP}-x86_64-linux-bin
-
-PREFIX=/opt/${P}
-
-src_prepare() {
-	default
-	rm Makefile
-	cd share/examples/gnat
-	cat header.xml \
-		full_project/full.xml \
-		options/options.xml \
-		other_languages/cpp_main/cpp_main.xml \
-		other_languages/cpp_pragmas/cpp_pragmas.xml \
-		other_languages/import_from_c/import_from_c.xml \
-		plugins/plugins.xml \
-		stream_io/stream_io.xml \
-		simple_project/simple_project.xml \
-		starter/starter.xml \
-		xml_stream/xml_stream.xml \
-		containers/anagram/anagram.xml \
-		containers/genealogy/genealogy.xml \
-		containers/hash/hash.xml \
-		containers/library/library.xml \
-		containers/shapes/shapes.xml \
-		containers/spellcheck/spellcheck.xml \
-		containers/wordcount/wordcount.xml \
-		containers/wordfreq/wordfreq.xml \
-		oo_interfaces/oo_interfaces.xml \
-		oo_airline/oo_airline.xml \
-		altivec/altivec.xml \
-		footer.xml \
-		> gnat-examples.xml \
-		|| die
-	sed -i \
-		-e "s:PREFIX:${PREFIX}:" \
-		gnat-examples.xml || die
-	cd ../../..
-
-	# Remove objects from binutils
-	cd bin
-	rm addr2line ar c++filt gprof ld.* nm obj* r* s* || die
-	cd ..
-	rm share/doc/gnat/info/{as,bfd,binutils,ld}.info || die
-
-	# Remove objects from gdb
-	cd bin
-	rm gdb gdbserver gcore || die
-	cd ..
-	rm -r include/gdb || die
-	rm lib*/libinproctrace.so || die
-	rm -r share/gdb-* || die
-	rm share/doc/gnat/info/gdb.info || die
-
-	basever=6.3.1
-	machine=x86_64-pc-linux-gnu
-	rm libexec//gcc/${machine}/${basever}/ld || die
-}
-
-src_install() {
-	into ${PREFIX}
-	dobin bin/*
-	insinto ${PREFIX}
-	doins -r etc include lib* share
-	insinto ${PREFIX}/share/gps/plug-ins
-	doins share/examples/gnat/gnat-examples.xml
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib
-}
-
-pkg_postinst() {
-	einfo "GNAT GPL is now installed. To launch it, you must put"
-	einfo "      ${PREFIX}/bin"
-	einfo "in front of your PATH environment variable. The following"
-	einfo "commands enable you to do this:"
-	einfo "      PATH=${PREFIX}/bin:\$PATH; export PATH  (Bourne shell)"
-	einfo "      setenv PATH ${PREFIX}/bin:\$PATH        (C shell)"
-	einfo "   Thank you for installing GNAT GPL Edition"
-}
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2018-r1.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2018-r1.ebuild
deleted file mode 100644
index e2b10d6fa1d7..000000000000
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2018-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MYP=gnat-gpl-${PV}
-DESCRIPTION="GNAT Ada suite"
-HOMEPAGE="http://libre.adacore.com/"
-# Extracted and repacked from http://mirrors.cdn.adacore.com/art/5b0d7bffa3f5d709751e3e04
-SRC_URI="https://dev.gentoo.org/~tupone/distfiles/${P}.txz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="${PV}"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-devel/binutils
-	sys-devel/gdb
-	sys-libs/gdbm
-	sys-libs/ncurses-compat
-"
-
-PREFIX=/opt/${P}
-
-src_prepare() {
-	default
-	rm Makefile
-	cd share/examples/gnat
-	cat header.xml \
-		full_project/full.xml \
-		options/options.xml \
-		other_languages/cpp_main/cpp_main.xml \
-		other_languages/cpp_pragmas/cpp_pragmas.xml \
-		other_languages/import_from_c/import_from_c.xml \
-		plugins/plugins.xml \
-		stream_io/stream_io.xml \
-		simple_project/simple_project.xml \
-		starter/starter.xml \
-		xml_stream/xml_stream.xml \
-		containers/anagram/anagram.xml \
-		containers/genealogy/genealogy.xml \
-		containers/hash/hash.xml \
-		containers/library/library.xml \
-		containers/shapes/shapes.xml \
-		containers/spellcheck/spellcheck.xml \
-		containers/wordcount/wordcount.xml \
-		containers/wordfreq/wordfreq.xml \
-		oo_interfaces/oo_interfaces.xml \
-		oo_airline/oo_airline.xml \
-		altivec/altivec.xml \
-		footer.xml \
-		> gnat-examples.xml \
-		|| die
-	sed -i \
-		-e "s:PREFIX:${PREFIX}:" \
-		gnat-examples.xml || die
-}
-
-src_install() {
-	into ${PREFIX}
-	dobin bin/*
-	insinto ${PREFIX}
-	doins -r etc include lib* share
-	insinto ${PREFIX}/share/gps/plug-ins
-	doins share/examples/gnat/gnat-examples.xml
-	basever=7.3.1
-	machine=x86_64-pc-linux-gnu
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib
-}
-
-pkg_postinst() {
-	einfo "GNAT GPL is now installed. To launch it, you must put"
-	einfo "      ${PREFIX}/bin"
-	einfo "in front of your PATH environment variable. The following"
-	einfo "commands enable you to do this:"
-	einfo "      PATH=${PREFIX}/bin:\$PATH; export PATH  (Bourne shell)"
-	einfo "      setenv PATH ${PREFIX}/bin:\$PATH        (C shell)"
-	einfo "   Thank you for installing GNAT GPL Edition"
-}
diff --git a/dev-ada/gnat-suite-bin/metadata.xml b/dev-ada/gnat-suite-bin/metadata.xml
deleted file mode 100644
index 91e8ad9f5e33..000000000000
--- a/dev-ada/gnat-suite-bin/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ada@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index 7f724b35051a..0224f2d6377f 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -1,8 +1,4 @@
 AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0dbba2280ecee060a690f8c06104a7224192045bf4b43d2028cb25d9b336e085968169b3d79d10767ce0694ec8b042 SHA512 b1ba5dbbfa86c943143e570a3ac871935e1e6f6104883abc56d1f8b9395d0e2b5e6317356b309497c6fa942e30f25f2f2f1b8cfd7cf801f40b5b1b64b036154b
 DIST gnat_util-2019-20190517-18c94-src.tar.gz 906682 BLAKE2B d00ae8b92429f9a7d7476ff6437148a869555fb66435f9355b8ba1ec3d827cd32063e9b64a6862b99a4b26e570e1a1a7b4dfabd67d1aa1b997fb5510e9b43324 SHA512 fbf9114a75f6f794705384a67581f1630460292b8d640c34323c8147bea280bdf2ac8b6097313992d27716f2edc814e587d9396d85d28158ea82ee6002e47425
-DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
-DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426
-EBUILD gnat_util-2017-r2.ebuild 1228 BLAKE2B 47907bdc0106854b80ac911b7a8c1512676f77c71d864820d740984fd126a588d4d0934bfbe28286fcf69bb72f625a22ab4704ea3f672aa61f3a655c6a9c386b SHA512 93d275f64be15b2bb5d1ac1307dc3e8d4489e4ac9d1548e09b8680ade7ea2608ba8b1fcaa659ab0f867492f406c0fc8b44beab6a300404dd694fe1d79a583694
-EBUILD gnat_util-2018-r2.ebuild 1237 BLAKE2B 8021f8b6113644cac10e029336185b5b9739a51686eed0e671669bbdc8e83484d455027be4138db61113c09ea24aa846ad636af3c7837c136530f28aa016154e SHA512 2b36c13be69b00d781f43746ca7bde08704b1350bd03c82b06ae8397f9d084f3b3bf504f25d2d64f33fa37c9044f49c0f6fbe5c100502cc2998206626ec40ae2
 EBUILD gnat_util-2019-r1.ebuild 1243 BLAKE2B 1eae3fa58005af2b3f61c606f894433882f1daad8b38a96316afc0ec843f506b86aad3016eada750bcf33f9ab2fff6c9d60f1a2a0ee54bb01c4336dad2b4a75d SHA512 20a84b7a46541e838d476ececd6b0825e7fc8e335df44ba5e806730ade5933b0aad4909d9e1cbbb37c8fc7122444bfce1c3a7964233e7e71be44e08a41a8380e
 MISC metadata.xml 922 BLAKE2B 2c9337d3cb0b8289bf47ec558e1aa8199fc524d02a7e4fa50fe2e4cb50d8612a4c31ba593448c743d5bb28a63b47a801f4cf3c2bc25ffdfef4b93a403028e4f1 SHA512 00f10156833dad1e5e5768909aef76e50ab18c19a2ea16e84051370912461722017986da73dd7c6a595c89c26421cd8013c4c4011a8976bdb3263e12fdf30722
diff --git a/dev-ada/gnat_util/gnat_util-2017-r2.ebuild b/dev-ada/gnat_util/gnat_util-2017-r2.ebuild
deleted file mode 100644
index c289a5d9315d..000000000000
--- a/dev-ada/gnat_util/gnat_util-2017-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2017 )
-inherit ada multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	emake GNATMAKE="gnatmake ${ADAFLAGS}" \
-		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	if use static-libs; then
-		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
-				build-${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr install-${kind}
-		fi
-	done
-	einstalldocs
-}
diff --git a/dev-ada/gnat_util/gnat_util-2018-r2.ebuild b/dev-ada/gnat_util/gnat_util-2018-r2.ebuild
deleted file mode 100644
index 8dadc2eae5a7..000000000000
--- a/dev-ada/gnat_util/gnat_util-2018-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_201{8,9} )
-inherit ada multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6b
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_compile() {
-	emake GNATMAKE="gnatmake ${ADAFLAGS}" \
-		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	if use static-libs; then
-		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
-				build-${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr install-${kind}
-		fi
-	done
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 31c03d961be4..3c29a4d2e0c9 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,6 +1,6 @@
 DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B 5441c277d5888b040930960ed656a1b1264c7de02834995c6040c891b99bf7e8773029b9f722d5a3ed30036e7bd441318989ce3f7839d47928af5f4f7c396f90 SHA512 2b723ba4327966dc06594ccff45da3a01f65b8f8b91130ddc44d1b727d23ccbfe35f082c73810418da9d0705f1dc8ca9b471748eecee42adce34be722a4a201b
 DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368 SHA512 c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
-EBUILD gnatcoll-bindings-2020-r1.ebuild 1932 BLAKE2B a3dcc82fb183975570d60417c7d6691c133b0203864a084ea97f48ffe537689afc712754ebe2ea73a5f154b41f0aa737b4e4b7426e24c813dae01dc73ce1eb49 SHA512 b41118a136a68f33e705498813c8c165fa1855eb08f92502565201345d9031f88dfaa7a3f17e54e8d95320e2126d8fdaed2fd3dcc0f8456b222aa2beead9ff52
-EBUILD gnatcoll-bindings-2020-r2.ebuild 1949 BLAKE2B a52dc3351a55b7b42d970bd3ab54301161dc9390281fc25d60e8bf87ddac66f48947c70aa4e083f0898ce39d13ce2ac10a505f580fab0f4ea5ee6003e92c0f8a SHA512 720ec7fcc5546614b1f0ce7e52647236a9b693b0167bcc9466d69cfffebf91f86272981d6db2a847939ef6376ee35700f1cf440ceeee209fa5c954ac7120e636
-EBUILD gnatcoll-bindings-2021.ebuild 2383 BLAKE2B d3e66d1029eaa0e20c5c2da565d41f7670e4aaf34183ebc0d3f2aff2b805052c4bfb17b28a8a5622931d4fdce1ed672c91efb5f83673db415ed1cdd03cd3bc40 SHA512 dd905702948839859949ac482541b509243d4a6bb1555ef21cf5367620d28e241d83c7391b42b34940333df97690a87eb6b453a6edabd43ded377f56757f389c
+EBUILD gnatcoll-bindings-2020-r1.ebuild 1927 BLAKE2B a51c29508961f0d088352e5e873f09db02049e9918bf98ada681bcf2ca70c23bf936120c2c603f63194ad9803d308e6f13948d446983f525f91b6dda71e290a8 SHA512 cbd7bd02d2489450f1d92315f6d514c5ed31df442b54603055694095e55977fbe4c4433574efcf748c904443ab6fd9769a419e0e2a873c067cf80ee319f6f82b
+EBUILD gnatcoll-bindings-2020-r2.ebuild 1944 BLAKE2B 9dba24ec94b42ae34d4170b37d6b08de7da200cbb1e37ff29de0fe8f3947f265485a861cbf9e9a684128da4064907ece4bb7aedceaccac8dd52d60719ce611d2 SHA512 dbed3391c529efb37cd321a7d97cec5f01af7708ab6595c4c28e47143af493cacfc2e48b5525dca31f27a2b5fc0a2d6fadadb11c7a7b614b6a326dae8f632033
+EBUILD gnatcoll-bindings-2021.ebuild 2378 BLAKE2B 2bb0f2e36a966a0c9976602318e6f232cbf50395adeaad7b192284572a9bda179de4389c86f120c7073167f07bbc33ea58d1daed47149163b0bb366998c593fa SHA512 554d34fc258f86960cf79d173bedd3280876d21957b3f1df5d39159f04ab8c852f7f9f58bb7246cb2c572e4f3f75f64da3fe03f265b0f623342a3bdc2867f813
 MISC metadata.xml 1082 BLAKE2B 81d44f46969b4ebfeb13a2ddfbe086a0b9d59087869dbd5cbda17d923c16d2f6be0f3abe147311e477c6cac66a18b1ea8e41511e289f251ed4029871aeebdefd SHA512 f644094d9fd65a65495dcedb3b6b442193b243aa09a6f893d83ee342623a9e758449fa792470963860db0d24db37fa1304396727c664bcfcbd78238a0391f0f4
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
index 30a4f8a166aa..1b70824a09bf 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} )
+ADA_COMPAT=( gnat_2019 )
 inherit ada multiprocessing
 
 MYP=${PN}-20.0-20191009-1B2EA
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
index 0f06a47b2fd0..5ebbb4aed05c 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
 inherit ada multiprocessing
 
 MYP=${PN}-20.0-20191009-1B2EA
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
index a92e77430dc6..f563b4f9ac7b 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
 inherit ada multiprocessing python-single-r1
 
 MYP=${P}-${PV}0518-19B15-src
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 5dc3ddc4fd74..094b2e397b38 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,7 +1,7 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
 DIST gnatcoll-core-2020-20200429-19B7C-src.tar.gz 1396475 BLAKE2B 329e7f799ad62dfc6f71ca78a736bfc8c768a576f817d03b0d73e25b6e97ae0de0ad5a055bb800f7b83d7449ef8fe703c2779f73fc13a09bbcc1d3d8cc880fd1 SHA512 320878335f2ea1ce91a7770cc181e9cc228c80b1f7a3926a4e27c3822eb8f58726c62a014e2fa4c3f8699851ea87424be26d619ab4931b2e969e3a2e96e58b73
 DIST gnatcoll-core-2021-20210518-19ADF-src.tar.gz 1460647 BLAKE2B 42954ed9dfc41914f34973fcfe950b4415af455d8319e802a213994107c7d7a45a6a42b2d260f165fe5ec6589873a7a2c75665b68b97431b13d7694f48273b8c SHA512 6a58920a057dee656df9f64f610f9f1398bc3cbc4ed74a740e8693f2b45da83628c3ce8f76f624bdb101d348603a24bccb47aa770ade1ffbf24da806f4d1de20
-EBUILD gnatcoll-core-2020-r1.ebuild 1590 BLAKE2B d91ea0e079e7c1d2d8c200a8c96bef3b3d157e6e8408b3f51e8c7a546389a186762939e3d5a9cb90c501441929fd50a2554774b30dfc3639aaa2ab19f1a70873 SHA512 b2b4c5df7f7eb3ca474963e1fb2ae793cf0a26b111e53c6fbf5a20df74f6d5c407e1742d6aecb66c8884f9f16a3b5c9c33b191df10b47de491d159243139b031
-EBUILD gnatcoll-core-2020.ebuild 1578 BLAKE2B 5481ee650d75cc3f963c0c8992c46133e5b9db29d95a850f915ae7183ee0c877e48e2247ab9e7a27cf80ad181557b64eadc3c71d3e4f1fd66005b90b61312f95 SHA512 310d4563b3f16f60a893ecfd4cf28cb2425b7d0c33c1b9402308c76876cd6f2dc0016cb4e1a3b74ec062ac7ad723ce4ff119dc9c16011dc2bd0469c4a294a7ee
+EBUILD gnatcoll-core-2020-r1.ebuild 1585 BLAKE2B 835b0e6f2dae3a73e4d18554a606c40c088810346df1a5116155c8da39afeb6ffb7ab3815d7223a919e90e34a7ffe9b0557adf9cf13ed36e4dfc4d0916da4f62 SHA512 77a55cb51bd96e189e6abbd9ccc90d1d9dfb0301083539a71969525da9d056e7043a3c36573a8292abf552e625d6c7a08b33789a615fad965c4580ef35a2f44b
+EBUILD gnatcoll-core-2020.ebuild 1573 BLAKE2B 4e2332ec87600073b8aa9b513d4e1534cd00af5dff7315b845d5b28dc9bc1bd142c7a482a916760ed7848746990f3e03d404327821202bd0aec3c91c541efcdd SHA512 9c5d122937bb63179482f61c0c2dd53e657316506ebd6eaedc4ecbc4122e015af944461957b127eba25ae21f91881b1d217792e36edbbb4e72ea7d2cdf979b6c
 EBUILD gnatcoll-core-2021-r1.ebuild 1704 BLAKE2B 97467428c37b61dc0546b8dd9885156492ad404cd7c4b7fc63fd25403174f0bae37103da809bddcdc3fa796deb9bbb363587a486f7353c09bc2a331ed5daa680 SHA512 78e5b08df25c8bfd8c60e8dcbdc7c13f0e6b2f00ba21731723678d28ff1bd5b4488ac24350f5a9efe17341ea2d7b388551b022d7cc6fb77cc068bb175f54d85a
 MISC metadata.xml 1096 BLAKE2B 138ba19dde84f957c6494fc1971672c8adc96feb4af484296aae720aa860132b0b709a9e5fc8ae8d391604dd8fd0c8d3f34fb11e836629a837463d311c68f677 SHA512 3bfb17c3531f6c3f66047534316bbb906214067208695b2e61594649f51842de82e6f2340d59acb2da9d8ac401cfcf95f8e9326b5ab07db5f794a4fe7a4898a7
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
index 1d815b25b355..11d0ca89579c 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_201{7..9} gnat_2020 )
+ADA_COMPAT=( gnat_2019 gnat_2020 )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19B7C
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
index da03ee877522..6599a50b8f7b 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_201{7..9} )
+ADA_COMPAT=( gnat_2019 )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19B7C
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index d3a6f59dcde9..356296b60704 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -3,7 +3,7 @@ AUX gnatmem-2019-bfd.patch 690 BLAKE2B 81fecbd5eb8743a91699b98f73cc63f7e3112544a
 DIST gnatmem-2019-20190429-19745-src.tar.gz 80136 BLAKE2B 8ae3b41827416f951abb0d0a1fe533946fad2ac8d67ae6aad2b14495a3c068718befbbbf11800c1864f3becaa0ca6dfb838aeec3b3d715b250d4436ccee93c69 SHA512 4354a30efcf95a013f481b3519a79a22f85348840f074c734013d6c73e00fd771118b84eec416260983c383484f7a404217a32c012ca0bd7c37253ba17f2eb85
 DIST gnatmem-2020-20200429-19911-src.tar.gz 80400 BLAKE2B 0367e4b40a3d0cde1002b49a330db3b5c27a08074bf9687699d0fe6b3f046562c4758865fd30a3f99703d209e24b0b5b72902cc4bcd4fd1c54576a0aa082b0fa SHA512 9d5e2bfab73ff2f9b6864bd8b1f2844587a21352a782f1dd52a17eb911d4791d93806a423c702979636dd402e372ed7954ffd33d3882c8703d0f6e8fc056babc
 DIST gnatmem-2021-20210518-19F7B-src.tar.gz 81001 BLAKE2B 618c5e0fc300e1ea53456b776372a06603ce6b71269ddbed8cbd0bceefd957f726ceac8a045f12f2a50e0f4ebdf47d4c60ef65716ba4bcc9eb6fc220a3670bff SHA512 ef938cb7c2b6cda12a68a874218d47acdee214530534114da6490475dd08e21dc4043c9a3f164074a8010e50d0a9c91b4fbabffdc8329700629407644fec46d4
-EBUILD gnatmem-2019-r1.ebuild 968 BLAKE2B b6e338b6c5d0d456594fe1d18f77ead2011783483b0144fcb102882e29bbc29efef08f85b26fae5a7610aac4772d56ef3bf51698c71db0c7db856898291aa28d SHA512 51a720b4badc759b66aee6923e506670a516da634ff7a20d16a04aa3e2d2daf9ac20226d46a528f02620039392e9c99d0019ba676827d875355fce1b1da0b880
-EBUILD gnatmem-2020.ebuild 1001 BLAKE2B 7366b48b6a930b755b4b414d826467912eb2d347d40fdf0c1f0aa8b9ee305162883febfddd41194327fee664a437b559630c3ad2ac5ca7c135a1652dd0474de8 SHA512 668b3d17b8cd32f990dbde400533b59bd7e2662d8442deaeabf9e954ff726d8ae5373495e4ae6002dd0be91de4ac3dcbaf539b1f66dc281d056fce440a560e4a
-EBUILD gnatmem-2021.ebuild 1035 BLAKE2B c2495ebc9a31ca8f5b4af739541f870f607ecaf82ce58b1e811f5562fa37adf21caaea33deb35d6ce9a99f3035c66affab1b253689b6b8c6e7b816cb3fc83e22 SHA512 15c8aeea14068a6522ca5ef1b8a7eacb75a9103bc990afc3114c5f59a7bbc2d892020fe7c0c20b8f0f60e383e3ad6104035b4ae0c2f25ab5aba69c934fb5ddb7
+EBUILD gnatmem-2019-r1.ebuild 963 BLAKE2B c789717934dbfb1740be8ae3834b1e05aedf7861ac197b87805c14c69ff7ae77748ef8a52ed62dfcf6518e9368882ef23f1ac9c54a24303543080bf0ebad4388 SHA512 70470635549aee72ca64604bcc7ba604325e194758f8555a66348d27b4457c0b2d531914859c4e61f428eb784c307b4db334a1ec198396ac6303d72d217c07e4
+EBUILD gnatmem-2020.ebuild 996 BLAKE2B 4b36c0bdb9db4ff2667353e71884e3586934519000f3b2d0fd3b4782ab1c7db3beb6c5844d622379aae3fcf3e7a2190d397d9c34192eb0e62ccf63f9cea3b952 SHA512 df454f56ed340b86f444360afc706e88d19ec1ff1011aab5085f5602b43592ca58a7d5da69d42622c8bf79f6c665e44e751fd6bd8efa5d09c4e675681fe1010d
+EBUILD gnatmem-2021.ebuild 1030 BLAKE2B 56f69a410ab8ffcc6e5583350818a8515e7fe45b3cd259341d7fd7c591876c9c716a4cd16a3a5df576505826f711721ee31f98f1fe1a54bef60875f012d7e6e8 SHA512 52d0a960051f8318cb6ecbe4bb73c2181d3e21cef7c84f7a5ebddb0a3d599cb34e5f3281baa974ca74fbd41bfb4cc898709e04bbf0e8d7e2abf6f0fa65d4e52c
 MISC metadata.xml 956 BLAKE2B 07881059585f6c26518d41c31bcbf7c271f7509ab2592bf46f1dff8817514c32521fa88d2aa901704ab5c494a1e072e0bab96517375687a1caf30310e526b7a9 SHA512 292041c6876b22abdecee29b525fbb9ccf2b9069e4c4dd5a22a051bdb69502b905951f235bb5423d834e70df2100153cf5e97c17aa855a12ad5dcf588ff33d8b
diff --git a/dev-ada/gnatmem/gnatmem-2019-r1.ebuild b/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
index 8d03df8f5400..d320637c28c3 100644
--- a/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} )
+ADA_COMPAT=( gnat_2019 )
 inherit ada multiprocessing autotools
 
 MYP=${P}-20190429-19745-src
diff --git a/dev-ada/gnatmem/gnatmem-2020.ebuild b/dev-ada/gnatmem/gnatmem-2020.ebuild
index 62a7881960d1..2d88a77686a3 100644
--- a/dev-ada/gnatmem/gnatmem-2020.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
 inherit ada multiprocessing autotools
 
 MYP=${P}-20200429-19911-src
diff --git a/dev-ada/gnatmem/gnatmem-2021.ebuild b/dev-ada/gnatmem/gnatmem-2021.ebuild
index 9bae3b87c458..8c1cd4d4e6c4 100644
--- a/dev-ada/gnatmem/gnatmem-2021.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2021.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
 inherit ada multiprocessing autotools
 
 MYP=${P}-${PV}0518-19F7B-src
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index 9134b13828cd..7d6a67687f6d 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -1,7 +1,7 @@
 DIST gnatsymbolize-2019-20190429-19761-src.tar.gz 14297 BLAKE2B 8ea689266abc485632c04a696c0d30632fdfcc123153ae006158700514ebedd6d067124e59e519a0ebe35569eb0e2fad8dd48a33d49551ba608e14d3ec73d636 SHA512 68e8c9bb2880738160722a2c413c6146c86efd0822236019ca5824eed4a2b392252676d0f96c035830b80068b82344b44953006fc96ea208f6bde6618190336c
 DIST gnatsymbolize-2020-20200429-19987-src.tar.gz 14121 BLAKE2B f67e3735cacc56eacf9f7c9972f9108f95b3fbc3dbac14043356dd3da5dbd9548b1b41063465e025c9616bc059c39021999b1790b8f2cda2b9199ffd8154943b SHA512 839ac0ca514123261e8dc379484195eda3c0bed3509aecc9919ed9710c3fe3478b398697483085de69d0435728b9bf1dc60e6c7c1a51252f5629ed9e1b222739
 DIST gnatsymbolize-2021-20210518-19D3B-src.tar.gz 14263 BLAKE2B b5f8c1829e42f9b2dee4cf3c74287a5c11eab90f1a1d2575cd42fe4ad2078b99a46c641ebbf747b02ed8f22dfcc83e76c60ebf07eb45e561175f480a5a056ca2 SHA512 c94b569733c596679f1422660af51b3c0ad5b6955727f6dc6a4b076b39b19fc13fb779b5610667a4c2c16abab08d2633785e184ad5e15037e66cd1c8e249c159
-EBUILD gnatsymbolize-2019-r1.ebuild 658 BLAKE2B 5494f8e6986b4b13eeae44963b1747c0e3790fb4c24aaf59dab66b22cb52e89cd86d056b6075a151def0a4c72d5b8b1b345ebff00df000ff743aa4eeff97caa4 SHA512 2a28b5a1904463d21a6e5076c25ee80d67c5398449d694b1a86f423c8a50cc419eb496b75a7081542318a32c76ba8d649f06e74bf401efe1bc6dd17b685bf270
-EBUILD gnatsymbolize-2020.ebuild 809 BLAKE2B 594a8b3787cbeee74e2a0d763dd4c9be08350034bef33472455e31a08818a7811d7941f188498febdf7c933486e96e5f3437d72768ab92883e731fe014f8d1b2 SHA512 55f517ad46fdabd4131f5d440f532fa47d47fb7a0304dd4e9756cc7f2a5c72c67229354df3112727e9a2da89c79673f0b0951d9c2ce9e92a2b77e4d7e1e0f72b
-EBUILD gnatsymbolize-2021.ebuild 752 BLAKE2B c3531a6483e9adb0107dd0abb89ecbb3c76ae52be65993ec0945d8a4a63adcac120f3a7f4238135db4af5cffc264c2f5cd2d2c1695ae6647dc5bd6f469b07d33 SHA512 b10a2b861500c0e5a0e8d204834b2082b7f2fa1a58fc801b3bacd9de06fa452de994dd78b9f8433832ec7c0bbd150406ed03e3ca7855f3dec9eea9e86eccd11c
+EBUILD gnatsymbolize-2019-r1.ebuild 654 BLAKE2B e7df873a536710d44ebe8155487495da953b0be4bab6c8e52e8f6840e067dd903f114ecad13f98c3481eb117f88ce0a6e7d3687382255cee4a2054b21a67c514 SHA512 8c0c6197dea96a93f206e08b6b40707cd227d2b21eed4dc719e5ba8059d445f20177ef518e28eefc1c0dfeeae6ac87e381e172e8853ee51828db55442c1e18ef
+EBUILD gnatsymbolize-2020.ebuild 805 BLAKE2B 6e5d15ff7f9c9d1d6d82821377086cae4b7fc305db0b1d2dcf075b376bb81e5da740ed22228d39266d9f294d8f0250aafdaae607a2de0f50f6c6c2afee29810f SHA512 91c2fdc9cdd40edc9730d74da6e00cd55db367881917d267bc8f759009bc2a5a486539453b2970739f2aee963f9b4b9ace27973072b414108b4bc31fc51e5568
+EBUILD gnatsymbolize-2021.ebuild 748 BLAKE2B 33f11ac54f310fa3f0f81d1e029aa7746b9b672d970287892ccc871ca655a8f9052fc7ec824474a16c6f3b4d5fa6ba6df9a9b273a9aad8ae07d6f169544e0d63 SHA512 752a3e0f1a591f0779a3e6d37d364639af7dce0d87a4fbe0579fcfb6c11a16b277ca93269e75919e6fcd08330416e89fb7c758ffc033347c9b0788297d4a586a
 MISC metadata.xml 391 BLAKE2B d9e0444e176d262c87f289990d11122e4a06bd7f17fdf65d4e24fd7d6f09d1f36ba05c4f9896d8428e089ca2d85a8366f2e834139dd48c5a3626d2e9f4aa11a5 SHA512 fa7efd43d05a874d3b1733ded27ff6cbb245b9c03e301bef82d2962fc5ae7a585d2e49b49e9ceeecb92bbc8a08fe18cfe6a50a7db060b85a2ba54c65e1e5eda8
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild
index 45f5e8e30e9e..4f35033568b2 100644
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_201{8,9} )
+ADA_COMPAT=( gnat_2019 )
 inherit ada
 
 MYP=${P}-20190429-19761-src
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2020.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2020.ebuild
index a8cc74990167..67ff105637bb 100644
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2020.ebuild
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2020.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_201{8,9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
 inherit ada
 
 MYP=${P}-20200429-19987-src
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
index d1c9dd81f2ca..f04d557b48f4 100644
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_201{8,9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
 inherit ada
 
 MYP=${P}-${PV}0518-19D3B-src
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index d2d445c2f0ad..74228f293aaa 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -4,7 +4,7 @@ DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af6
 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
-EBUILD gprbuild-2020-r1.ebuild 1928 BLAKE2B 4f67f4f87442c27b908acb6ef9bfa9ddc2465c6a068564e4e5c77661d49736917e72a5939ad2e34e760611c5f4e5c57118a383792467241d121757fbfa3e480f SHA512 3419a7c48a7573381de30e03bdea94d68f9c096a5446da2b065e0e62990f684cf978cbca9a54fec7415b48fd84ebef7f7babb61961ccf8f3700f858493c3886e
-EBUILD gprbuild-2020.ebuild 1917 BLAKE2B 91d15965f3035fd02825effbac09ac19830261dcc0c84b4481fe9308c58b356bbdecd053635b988f55956f3ca34b464304f4ce501fd1d1493d24c02186fc56e5 SHA512 cfc94355d2d2ffd9fc793dc98f56a656c4bb5e571f464f5f82a0cbbec74233ab796e11c52bc2d0c85a714220840a46474efcfc55201e4ec5c479a75fc0d66775
+EBUILD gprbuild-2020-r1.ebuild 1923 BLAKE2B 94b007dffd8270920598122d1b2e303d465bb2dff5b7a50a6af3b686d998bea8548fdd23d738853034c02a7398f59a717d24590eea4f318ae3aa04ef8def5700 SHA512 484b6a3a994d291d9b49573f6d45058c641d148bfc2774e5894c08382978941adad3cf480ca679ff6247d436c0dd2efd45ac745a09a79753d675099d44481f03
+EBUILD gprbuild-2020.ebuild 1911 BLAKE2B 4513a765e20e8226476be5ca62e588a4d1a4570ea7e3e1e932ffb7547054ba32e0fca6ba0e09b95a7c65dc2fb2fe47b5b6c87d7d7571abb4653d2c050eaec7b2 SHA512 216a3186f2666c6bcfcae001503d111ef28f74d665a5d00855a7e80de743b37ed0f16052bd8a4d0d65831fff0856372ca88cfd69b2a0c0e6ab50071669b0c349
 EBUILD gprbuild-2021-r1.ebuild 1939 BLAKE2B b8631c09b20aed1bdc9c6fcac21f52a3307595fcc11d296d4819d2c8fd5c5ee046fc7377e30d821a619c0c46017987b946c9ec4de08ceaa9e09954dce348b600 SHA512 f1e5b231152cf236ef00142be869af09c3424c97c65619def0045863c7ac21fffc56bed6f003c0af4e126b82f638304c870bbd45769e9c23edce2e113579ea82
 MISC metadata.xml 807 BLAKE2B 4d7be0178c11d86a1fd7ecff2f61240da32dffdd640f42f44dff0dd076d45931dabb9a5d713cc246f43ebe864d1f9d0d08063ee66d0ad6924a44190778563a15 SHA512 f295ecd254a6b58801e0b4dc40dc2e3257793b804fb29e5a7e522fadbcedaf7869ffee2fe3d233e8dc58e701a7bbbfd9ab52911de234e5afb669639e8aed88ca
diff --git a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild
index 55116e70ff6f..0a8c906e76ae 100644
--- a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} gnat_2020 )
+ADA_COMPAT=( gnat_2019 gnat_2020 )
 
 inherit ada multiprocessing
 
diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild
index 09a4684b639d..8b3fd0402cc9 100644
--- a/dev-ada/gprbuild/gprbuild-2020.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7,8,9} )
+ADA_COMPAT=( gnat_2019 )
 
 inherit ada multiprocessing
 
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index c8b20e5f0efd..2dc678372fdd 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -3,8 +3,8 @@ AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bf
 DIST gtkada-2019-20190424-19D98-src.tgz 12273911 BLAKE2B e2d0f3c410973d0412bf433f2e1cc60a5b00e9f34ad0471cb583596587e6073fdeb9b6441aa50dfa81894ce692101fe51c7714090477d585721571261737a823 SHA512 aed0758b42ee8eac752c2c83a0974ee0c7cddfa15149879472ff2fb8ee7565456a225ce783739ede76bc0f47340e97af5b5d1149e244611bcd3b3760e20f8cf5
 DIST gtkada-2020-20200429-19B96-src.tar.gz 12232938 BLAKE2B fcd5fdfebced2fc2b4dd1251f81a61b1564a72a3cc1854a78c4d9e32824d55188dd440bceddd4e86f3dc03c455b1db109bc68d5cb29e2a61d62bf59895b68895 SHA512 d9405d03cc3bf375ddddca54f2fb935ecd64cdf6eedb32efbd994a6f8a7693c6ee7aa10d558cbf89e9ad3174a3ac9a0c8f0ea7e444ff5d2a8b9af76a6ff64d4b
 DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6fc28743bf313163f30bcde5f0deba7c02a113340e2e73458cc98a8e9d9277f131cb4e28280fd69afa6797d47312c61e7d73929fb5a11 SHA512 fb5db2886a26c15b58180e53f22d4ee25ce23c19240b27352cb47becf19bb76b32c90a10f5085165913360d1cf87bf52b4588d8cdc2b9681e717f9af71ae86a8
-EBUILD gtkada-2019-r1.ebuild 1129 BLAKE2B b9804325b08da5a66a4423b5f8f2c987b374a8ec8e1153d0f5ad4b0ecdd619c076a3219ffa8a3d1ac55df34380ef8877064e7b74942e39ccc185d3f45feb796a SHA512 482b5b22512b81b6e2e7f26b488780a9c7eaa54fc3252ceef2b34174bd3f2eb71f108ac41a9408d37f735bc89750b2a946c9516ece39162e12bdf723e40feb32
-EBUILD gtkada-2019-r2.ebuild 1141 BLAKE2B 0e31527469b36e1194f2cd3eddb2e44f28bf93e5ebabd5b39ff24bbb778154f8190d63bb70f78028bbcb0e1260f8da64eb1f9ffa33afd9114774ebfbb32ac475 SHA512 ab530fcce187433da2db5e27530e8dd5b6919f4bdf6273fb808e62fef51115e30e7bc03a276bcce4c5406cf1b0279007d561df317277776d41627cbf5b676c70
-EBUILD gtkada-2020.ebuild 1236 BLAKE2B 57fdd5cbdfdde03705661dae4bb405c4aed6119d0057286a1774a820bbb9459b57f37da4eea54fb4b98e37aa5043d91d897363f07628936213fad47f7275929b SHA512 654d4ed98b2b528cbdd7d5df7cb45d0e5dcc0c1cded18946b1f950061347194af090f1c9f2f181e4d1d14be2f72eb817acb12b12399b399bdba49705cd79daee
-EBUILD gtkada-2021.ebuild 1235 BLAKE2B eb4393fa225fdd499068ad239a9ebf8ab43eaa8567fb6c2f36d98298268ff38beba942ac659c788767cdccff0eefe500ac488a331b349ec0ceff530f9110d4cb SHA512 e61c460c80f4623fab044677c7d74b96633af6713e16a26b6171d05a30c6296329a1c6419a89f039a2705c71d6e8fa85a8c7fd89aae5613605644c46d1dc31c2
+EBUILD gtkada-2019-r1.ebuild 1124 BLAKE2B 4b96339a78d35a83e6d1363d4c6b852a1fd7b0d186d6080468a3513cfc2d18409d0b86147b4d013833f32f619cac688df13735c6778db2b4292b3a901191e32a SHA512 f76e0218376a9937b3ec834ba534e77e72ec22e33a1638af2010ed82e8550b3025e1965f766dcdff30ac90c61761fedff2ee24d9c2958c9922b56b9e2d20f403
+EBUILD gtkada-2019-r2.ebuild 1136 BLAKE2B d9598bc658732e4a04e577225e749f1e83a608841cd9882ac7c84368d53e04ba27c709f759b46bca3af50761ad62596ee29977afe2fdd56dfe5d785264006b8a SHA512 7c5b4cf398be8fb1c716639fcdfef761eabc97fc9b574d37d23751a21d812a4fc0d5d9fa91186d5fd69020e25c60f5d991bbfd56e0649c5f56d25ccba026a15e
+EBUILD gtkada-2020.ebuild 1231 BLAKE2B 36e187bacd5d07498c5df71112e22dbd7d3415668f70c325df7cbde798f600bfa96dc890535d1d9a861eb46210ad586e62fef9cac2a8493b1b4510951f9abe29 SHA512 533473a043ae4f9807d15fecf39177f6c526f0f34a2ecf84d6addb1a0a92171d64c73365512c1d5ab6718c865dee0468043e7973068af9e7694e14633ca151c3
+EBUILD gtkada-2021.ebuild 1230 BLAKE2B d40eabb324a62198b8fa4a4110e775b1c0a6bfd6815687dc3be6a7e31bd9a5ecbd9f75264c602572100f7b6d1e272f556997777dc0b38b39eeb04299b6be7b2e SHA512 1b7c35e91616509da839ab01fbc3bfb1b4b2487555cc52b4ff7cbd20029f865f03390dc59060be3fa1a6c9cd7d88c81a3094fc36d39b5c5b9c6fd40a91b79da1
 MISC metadata.xml 537 BLAKE2B 2504eb7e8c0fe1a143ea8f6f4ba3ac530245d3781f906536dc7680e775cf8b546e7019d43adbc78e1b7793825eb9bea849d78ef482325ccd16bc30d96691ea7a SHA512 4e683dd78d8d81851116548db6014157fcb363d96fa4df04e45c35705505ed3b3a863a3b082dc4a7e814df8587b7f5fba6e696c8ee12e14d0d04a71199977d17
diff --git a/dev-ada/gtkada/gtkada-2019-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r1.ebuild
index b85d3df230b2..f0aff578faf6 100644
--- a/dev-ada/gtkada/gtkada-2019-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} )
+ADA_COMPAT=( gnat_2019 )
 inherit ada autotools multiprocessing
 
 MYP=${P}-20190424-19D98
diff --git a/dev-ada/gtkada/gtkada-2019-r2.ebuild b/dev-ada/gtkada/gtkada-2019-r2.ebuild
index a523439d409c..1943cb59d20b 100644
--- a/dev-ada/gtkada/gtkada-2019-r2.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} gnat_2020 )
+ADA_COMPAT=( gnat_2019 gnat_2020 )
 inherit ada autotools multiprocessing
 
 MYP=${P}-20190424-19D98
diff --git a/dev-ada/gtkada/gtkada-2020.ebuild b/dev-ada/gtkada/gtkada-2020.ebuild
index 537344fe613e..53c519056488 100644
--- a/dev-ada/gtkada/gtkada-2020.ebuild
+++ b/dev-ada/gtkada/gtkada-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
 inherit ada autotools multiprocessing
 
 MYP=${P}-${PV}0429-19B96-src
diff --git a/dev-ada/gtkada/gtkada-2021.ebuild b/dev-ada/gtkada/gtkada-2021.ebuild
index 1c9077302c5a..58576d667746 100644
--- a/dev-ada/gtkada/gtkada-2021.ebuild
+++ b/dev-ada/gtkada/gtkada-2021.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
 inherit ada autotools multiprocessing
 
 MYP=${P}-${PV}0518-1A011-src
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 8d4056b16628..373697c1d313 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,7 +1,7 @@
 AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c4392e6ecb8bbcb07091e9971042368ee134112d9550ffc9fd2a0ab23371e7bb760b3d8e53cd4ca0e54e0522f604 SHA512 2bcae85d30a41333664f17f097f31cf21b270c43092e823dda256098c928d4ccdab62f9d349b57f941b50bb676649aedf5f978a05f3afaf1ee234e4515c305b5
 DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
-EBUILD libgpr-2020-r1.ebuild 1468 BLAKE2B daca0cf0beda6f7e4281df8d4412fc7113f84f155faa5a89204450b13ee8ab1f73024d3e5339bdd49cd2492d5994794bf73dd4c24fe57be7980645aeac5f9e1c SHA512 a99144d268da9ee3aaccc9a88f4c5f2ef60ac370f111cb0f1d9502e21827f4e0a8f5b5cb090cad518b58cc5dec7acf50bff96c9270da66271d3b6b2732f2dff3
-EBUILD libgpr-2020.ebuild 1456 BLAKE2B da077724789abb69633510ccc9ce13f9fb322b9b5b30e267662be3f10feb6a263ec2d40d4343574d65ca8e627bbde6b2b81995f4c1c3de6067fbecca5e5931ed SHA512 6d3857c8610bb044910f3dd0c8617cdf0b9d8ccdaa13e4d434b27c9da458ddf7f4ffab8bb700c1a45b61aecf562481bf7352b2f90f973caf3f3dbd1e78906f34
+EBUILD libgpr-2020-r1.ebuild 1463 BLAKE2B 4e9c08c8149d25ff2ce9adaac7c6ca70e9ea7eb37a5230d8b3429c8c82eacd738f93c1d49d4d06ced4a501d7f513ad0eeae489d9cd6f47a4762f67bbe6545747 SHA512 b297de3578231bc995acb4cddc52b10afa7489e8fac4f2f4cd87de3c8248e80e62f5cb59ce600626e3e8a17089e1dee5f871096189dc748dd936b4ec31a25e1e
+EBUILD libgpr-2020.ebuild 1451 BLAKE2B 7d79f56f139c6043b036528efb8bd160245f9f8786d003f99b5f93974a9e42c61d16cc107cc494500174916778f8c2b709c6d08dfbb985ed70ee6283f5adbbe8 SHA512 b50db347e1d97c5cf0b2c3309be7a992905eebd0c97087cc065189990df3db149c3950c17af43ec4dfa4e88158fb30d0e4b78860a16784ae564a1c8e652b336a
 EBUILD libgpr-2021.ebuild 1494 BLAKE2B be464001890e3ae92f0942ee6f7dbe9f95236236523d2aaaae932dc7924d0470c1fa5af72d651ba6fbdf6b7bdaec1b7f5b4c24fd8d2fbd07ef02c9e9fa632cc3 SHA512 958a45707b2706d25da8cbc6e95223ddd3775fc8e1173b471b9280dbaacf16c33742b68bd43f18625ff698f894c0e380ad66b9ab4096a04666b8e77c918a2513
 MISC metadata.xml 940 BLAKE2B aaa252e5e7455d29591e45927ccbefc9f7a21367af3f1da9a9341695f722dc6cfbf7f52ea6630e392439684fc8ecba06f2de6372c6624c2f53b2712533772490 SHA512 8bc90bfb6ae6ed3847b8809ef1e1d35ec8a1abf4a0b0353dac86c62c5fe5593a9523984988b723a3f9c9424285b2ab30bd45ef3b746956bc8be7751b63a35704
diff --git a/dev-ada/libgpr/libgpr-2020-r1.ebuild b/dev-ada/libgpr/libgpr-2020-r1.ebuild
index f03d793a24cf..7da344e05d7a 100644
--- a/dev-ada/libgpr/libgpr-2020-r1.ebuild
+++ b/dev-ada/libgpr/libgpr-2020-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} gnat_2020 )
+ADA_COMPAT=( gnat_2019 gnat_2020 )
 inherit ada multiprocessing
 
 MYP=gprbuild-${PV}-20200429-19BD2-src
diff --git a/dev-ada/libgpr/libgpr-2020.ebuild b/dev-ada/libgpr/libgpr-2020.ebuild
index ae1686a1fa59..f1f677ae6017 100644
--- a/dev-ada/libgpr/libgpr-2020.ebuild
+++ b/dev-ada/libgpr/libgpr-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} )
+ADA_COMPAT=( gnat_2019 )
 inherit ada multiprocessing
 
 MYP=gprbuild-${PV}-20200429-19BD2-src
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index d36fb17dfb7e..b2aecbad5c28 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,6 +1,6 @@
 AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e54df1d4620231813519932b91522c6d17f4f1774b84f48975cb5ca1e14cb01e87607da86df5a005b6766c9b1ff SHA512 0cdd0e9ff1cafcacaaeadb541ab0fa6a783dfd4b2d51528d18eeb99fdcba4a0a1f005c6210d5ac6b0c3052eb67e777f5e481d7fd8ef723d93be1561fba2afe26
 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
-EBUILD xmlada-2020.ebuild 1983 BLAKE2B c0a5071421bea52e92e98b9aaed78674ef99b27e2d025e9a6e802268329ddd10e2d98155f51d96591d2c2efc55fa1b58d4f0684b04580061a4db6331e0c432c8 SHA512 8398141057cfbb291b4dd11b54d11186068e141d3e8a06ef9fe4eedf256d1a868baef2ceb5d595d54a2396c2ceec70dfb0c4a0a446c2a8a964a821b5b66be6b8
-EBUILD xmlada-2021-r1.ebuild 1996 BLAKE2B 56c8f0f6383c45a97f9a21ae2c6061339ba04d961394c405c47bc00eac0b23b51704281f487964ef7e08385dd37770582970a815a975ffdd2be7d6355bda1d97 SHA512 7a91b20c80eb51c3ac1739637f8d728f1ebb3eaf7268767cbb90a799d2ca0bc2e29d6f119682943ebc1ae99edd01ddea12dc5e751413243bd619bb5ef83ccb3f
+EBUILD xmlada-2020.ebuild 1978 BLAKE2B 80246ce9388d25e62c38d48b76e404fea38c71865a1fb31710b7caee425dc453139e158243fab8ac65315e2c6bdb6556d6f15f7551fbe04f538c7dfe432890e8 SHA512 7ca808b394c9fd8ef70ec27789513ba315221f1eb472ac8b5f035a6c6bfb21a747e350b26714eceffa01d62f81be0747ebfb314874c45466ec3eae417075ea7e
+EBUILD xmlada-2021-r1.ebuild 1991 BLAKE2B a06bad661ab9c55fb081ae4de2696f0c48a34bc58be767bd73505635dfea84c69699a0159138d12e586c911a421f8b361e57ddf5be82d11be9e2cb3ff902e311 SHA512 762472ffd8db6a9fbcab6fcae2a63e98663e1f9b4873b94dfb30afd61f282e7bcb06762a7e0fd97d2145e2e8dee4e31df30851323d66ef95b8116c3b228ee6c2
 MISC metadata.xml 908 BLAKE2B a29e2bb61aeb10e05688b87817fa6ee4d7bea40d1aafc6e417c925237cc499f6688bc0d4d95ddef435ada059df9e982378e82a11069e8fd0037cb03da851837e SHA512 dc34947845e621b35021fa15d049757ea1a48aca68f40126d1dcc3fb50e02a34b5319028946944c4e7f432d4899c701da8c7dad28ea666766ab0197ed196519b
diff --git a/dev-ada/xmlada/xmlada-2020.ebuild b/dev-ada/xmlada/xmlada-2020.ebuild
index 9d23c04dd7f6..a91080c028ef 100644
--- a/dev-ada/xmlada/xmlada-2020.ebuild
+++ b/dev-ada/xmlada/xmlada-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} )
+ADA_COMPAT=( gnat_2019 )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19A99-src
diff --git a/dev-ada/xmlada/xmlada-2021-r1.ebuild b/dev-ada/xmlada/xmlada-2021-r1.ebuild
index 13c8b4190f26..8c8e6b9ed1dd 100644
--- a/dev-ada/xmlada/xmlada-2021-r1.ebuild
+++ b/dev-ada/xmlada/xmlada-2021-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
 inherit ada multiprocessing
 
 MYP=${P}-${PV}0518-19D50-src
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index ae3544c0f2ae..710015a1966b 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 36d21baac3f9..a8b1c3a9ba1e 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -6,20 +6,10 @@ AUX mysql-connector-c++-8.0.24-gcc11-numeric_limits.patch 348 BLAKE2B 509e869dcf
 AUX mysql-connector-c++-8.0.25-fix-mysqlclient-static-binding.patch 9557 BLAKE2B eda1794a808a2bfd43a044fe05abe93d41ddf98b917e4ff22dce7d795fe62c4d53f102bbcecf5b0c2ccdcf92f49ff100f6586c1c2131ba492b0a7095f202967b SHA512 963cb123e813e8eb305210f4804b5c67bfe2ebf670c85bddfbff8d3df7b60825cecf004d2e9b45ec38abe9af9f118c88b1d121d3290cae49557208ccb309da48
 AUX mysql-connector-c++-8.0.26-fix-build.patch 10080 BLAKE2B e14bf201a44c3a0fad775c3c40daf56403a35485f804c6bcac005b40e79fd798cbecc410a189b19bebafb3f6fdcc9bf9b27b5395e5f30f5e7567dc459b5a4e1c SHA512 cd0184d6d52bdd1bb8e22108708fd6489074b5d3d1510a3f38d1505bd4eebc7805327543dddaa429e635464234229e758c75c482133e198bd299e092c9301ea8
 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
-DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0 SHA512 5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1edecccc75da15d7bb0bd
-DIST mysql-connector-c++-8.0.20-src.tar.gz 3774428 BLAKE2B a06114432ab21c36fd0b3b91df2382198b2a48871e8e0bfd8c7a94729ed0e29f33599c078c97670fe9d744b13042db52fb89de2294c75eae670a77112d11d251 SHA512 3edb7c3d4ccf218a3f76afcf83a6d233b7accd236c05105ab3f7a6610cfd8809a78c78142c82fb60fb0931d2ae0f0f8fdc3ce9caf5f0cde7ef54067a7e20270b
-DIST mysql-connector-c++-8.0.21-src.tar.gz 3788740 BLAKE2B 1862b4f2c6e2a2bbe8e3044eea2c1d3c8fdb0a319e3758ca44686b79e917a65617e2cfd0e4b698d858ed9ef12c892b4f658eb287f2a8505a5daeeb79d9544c25 SHA512 8a64dff2efd16d2891f613fd416ec42ecba2490b428b1778e99822a3051d9c5af3b94006577e9f38a6ebd146d2f3be522cb876f1e42fbf0ac82001b0a62ffa62
-DIST mysql-connector-c++-8.0.22-src.tar.gz 3795112 BLAKE2B c5d6f0ebeb4649857f3217a35f3ae885d62be63af4da09815e7eb156538ece4f805578db24bfff3dd44a0e320c025a9936d7edacba69a2786d84dd932c5abb8a SHA512 1975b43fa3f3806cccc685a695f84783164c5b17da10ac14a6013d27c837cc9c63fff01b1ed4b31f22dae60afa68d34ec56ca9c45ca3dac23635e8f0fa845aa4
-DIST mysql-connector-c++-8.0.23-src.tar.gz 3798295 BLAKE2B 923eebbd7f9cde0252c84de4c70863b40c0dd93ad98a93e2ec14c935b2f3f0b0f251828a8bbbd0f23a5ec03491db06020294e19455901d15181c84fec9fb3d7f SHA512 f8eb8842e199d7373f4b55644720ac63b93eb33be19294c433f57aaf556ce1b5752223154194469fa28af52adebe930f0a7b4e8f62df92cc810b545aa7bab928
 DIST mysql-connector-c++-8.0.24-src.tar.gz 3797356 BLAKE2B e509e04f6c93893948c573401188567bcbda91db0e608d53b1795593abf043117e1a525d3abe5c8396068a2ef750582cde15b64412e556e89762d08032abb602 SHA512 5507bc562e8263ee17efb9d4e2f52e471da75e73a1fc4dd1bc0a2ac1c2a593be889c4b042037cf6d3cbff854ae5cc865a8800251da475aed0f31710229af26f1
 DIST mysql-connector-c++-8.0.25-src.tar.gz 3800065 BLAKE2B 67546b2d7d9de25ccb440c22bd58ee83e6fae78710e6dfa802cb0446bf5be433c56458424f0ee81c9a899bbfd5f464712d2d0b43dceb4205b492c7b1a79f7858 SHA512 44dd7f4296d666801be55642e53cb5181d9b5c3b080306975a48eb6280e555d9b924b42b14b44dffee4c54fab3f662a7b6bb6584d9a1ed710f0026788611c525
 DIST mysql-connector-c++-8.0.26-src.tar.gz 3980027 BLAKE2B 86ce0d94db588ed86ce7b21851f866da26268f7c9059b57697cbe1f5c5d031a3eada2f55042feb7b2888b538277c773215c0d19e8a1968ff70ce363e8f95bd77 SHA512 e3a08551a4245bf886cb7e3775a256fa379bb781b523a84d30e0d0c16cae73c808a3413b08b09998eba9c0ea3ede19e505b6392ed71712a8e9a2df31f07e4c79
 EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1576 BLAKE2B e1835aadf499196ba42dcff6a1671bc32a4224133d68630bea249fb22ef35db6275f448bb1c891e0dcd9934fd66b3a7ebbe9935573f7f85a1d00e2613bab98fb SHA512 983abc70a156b0b0c39bd693c6ac62a149897f3b5bfddd54bc52463a5fa84397692134a16045d640db3d4797d3264803c0563a282495c21f54d4b48390223d39
-EBUILD mysql-connector-c++-8.0.19.ebuild 953 BLAKE2B b5a6d20cf1e7ac2bed882ca26d0ab5c3f83c12c506f61cac9554e0add2b83cae697994f23d289169441bdbecee862da0f4530f40e704f9ff45cda1f84e0fcd9c SHA512 076a5385ed228b5b559f2fe4a4d94498c6ded0389a302d049d6732ccd7b4a78b3e46a7ddfe9689aa624eb09560b8e4ff96414af752d14405c5fb0993e4440da1
-EBUILD mysql-connector-c++-8.0.20.ebuild 957 BLAKE2B cf3c430cbd0454d785eccc3c573d739ed9bd3ed0a6e3047d362ddd738e8abb13f4dcdf9e150ed6130c96a367e34ed260bad22b4b3a301441b69f0ac9c6254e63 SHA512 19bff24bc2d0f5336f705f651f7d9ca834491858d7bee94f7cdd5cde0da12ba1025647d3070f6da55b8442094370a13f1db5b3adb1c92a2a0925c7a931e1a9d8
-EBUILD mysql-connector-c++-8.0.21.ebuild 941 BLAKE2B 47888d50b869e6f62452ca2146ad24ced6fbcda19ef3b6ee2b318e48c88bcb0aa5f1d996ad51ae563360b654ac884f794ea9ab75d83c35dce27c6154dbb2b4d0 SHA512 e8c4cf0a041e985c62d059c7b807e83f4800b57e6b15f650f844971f2f0ffb6bab04d2c3872079d61e86bbb8675c1b6209f09ecab9ce0b229676958ced9a666b
-EBUILD mysql-connector-c++-8.0.22.ebuild 942 BLAKE2B 479d3ce48c9bdecb155bb28c2b054124e716d9a8c4a90e496f4166e31fa7dfa072a0dd4a29cc4a2c67c1e82c9fa6afca900db82ecbcae12378fd73c8ab161e9e SHA512 4b1924e9e2bfcd08db957785c534cb7acfe440cc33c82ea845b74e4d848acc80b1489af5a8358e5102c8621b0169ed79cf9455389ec7133025b69bbf0532ae71
-EBUILD mysql-connector-c++-8.0.23.ebuild 943 BLAKE2B 91199b0deb991b1275377ee17c7ba55241265701c260443c845c6c47432c7cf34ba55b3227b65e234550dac37e08aa359fd5d2cd043951a804b8fdb2a9b4b9a6 SHA512 3fb54ed0135bf6727e5bb7f161947de858abce3589f3ca2c80fa402aed790b4e91e28af248a4e6a33cf78b7da684edc2ff1db6554b5c5ba7027eddeb009f87e8
 EBUILD mysql-connector-c++-8.0.24.ebuild 997 BLAKE2B 184b385509ec362bc962357f9c54dc554d6c1d66500154b6c8243ce2b8d2a01bfeb68d0e1c01c0e8dd98f16ef718b587b407e44a68010ae7bcb6f7583b32285d SHA512 df28ab886f014f30a44898b72f8a12e41bae8bc7109952712d7b44fd451de4b32babc0c5aaaf8142d7f90aa8b07a4f80ffe3d0cf34694be003c6234705acf6cc
 EBUILD mysql-connector-c++-8.0.25.ebuild 1063 BLAKE2B 1ce9e11fdcd814c1e464098ffe61027e36136562adbd1efa9a4ba10c252ac04eb5602f47abf5ec94f5514c778c38b3f0d81d82a66a113e647b3f02baf2a4eeb7 SHA512 db6ebd66158eadefa3a355d5add58e015a62587f51b07484fcefa8b59d28c199ee81d468a51f534b7be37a0246331edbf845680181fa3e27ff6ce086397dc940
 EBUILD mysql-connector-c++-8.0.26.ebuild 945 BLAKE2B b25f6d25971355f414cacd22507fa53b3ad056a41555157328137d36b9f269b4c99e2574bf9246ef79527e18a5a8a4556c040ec8fb58362020a19d81a3369ef5 SHA512 de38a9ab31d08db5220a8ed0698377e7fdf135d8ddada619ad026a91b9d2cf132a805e49b7fe5a01236ac860cc4d5ca02083d9c30e3d5de08ea4315d98b4d55d
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild
deleted file mode 100644
index b02bf3f85f04..000000000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+legacy"
-
-RDEPEND="
-	dev-libs/protobuf:=
-	legacy? (
-		dev-libs/boost:=
-		>=dev-db/mysql-connector-c-6.1.8:=
-	)
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.19-fix-build.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSL=system
-		-DWITH_JDBC=$(usex legacy ON OFF)
-		$(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '')
-		$(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '')
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild
deleted file mode 100644
index bad1c840c8f7..000000000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+legacy"
-
-RDEPEND="
-	dev-libs/protobuf:=
-	legacy? (
-		dev-libs/boost:=
-		>=dev-db/mysql-connector-c-6.1.8:=
-	)
-	dev-libs/openssl:0=
-	"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.19-fix-build.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSL=system
-		-DWITH_JDBC=$(usex legacy ON OFF)
-		$(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '')
-		$(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '')
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild
deleted file mode 100644
index 40911b8f9442..000000000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+legacy"
-
-RDEPEND="
-	dev-libs/protobuf:=
-	legacy? (
-		dev-libs/boost:=
-		>=dev-db/mysql-connector-c-6.1.8:=
-	)
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.19-fix-build.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSL=system
-		-DWITH_JDBC=$(usex legacy ON OFF)
-		$(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '')
-		$(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '')
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
deleted file mode 100644
index 99d319d98c90..000000000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+legacy"
-
-RDEPEND="
-	dev-libs/protobuf:=
-	legacy? (
-		dev-libs/boost:=
-		>=dev-db/mysql-connector-c-6.1.8:=
-	)
-	dev-libs/openssl:0=
-	"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.22-fix-build.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSL=system
-		-DWITH_JDBC=$(usex legacy ON OFF)
-		$(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '')
-		$(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '')
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild
deleted file mode 100644
index 629a5b274f44..000000000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+legacy"
-
-RDEPEND="
-	dev-libs/protobuf:=
-	legacy? (
-		dev-libs/boost:=
-		>=dev-db/mysql-connector-c-6.1.8:=
-	)
-	dev-libs/openssl:0=
-	"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.22-fix-build.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSL=system
-		-DWITH_JDBC=$(usex legacy ON OFF)
-		$(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '')
-		$(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '')
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4264a94add7d..4b92ef441e05 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 0b96493ea299..9ae47eef9bf4 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,3 +1,3 @@
 DIST fribidi-1.0.10.tar.xz 1147588 BLAKE2B e40e16b4b6167d0c7cc26b72ed21a7b4b2ba78dcce56eaf5dee94835cd2d4770401ac17bc2b5f13227e41e8f19513a0616f49edab07ea8fb2969eab30e24f653 SHA512 cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360
-EBUILD fribidi-1.0.10.ebuild 1030 BLAKE2B 8d517a9538fbad03b92c83c6b8a39b37b2ab105a6429490f19e089bbb9404a92ba8f08c9032721f97dbdeaafdadb27fb6998608171a097777d8bcf2c628bad64 SHA512 795ba74c90e1e6f2f4fede8596fed12c33ec8f51fde311b3a62cd2b3bfcb2f306ede32cdc55c0e1921a6cc773b771729d856f571a67cdec1c3430a2e93dde99c
+EBUILD fribidi-1.0.10.ebuild 1036 BLAKE2B f2e1ee2d0d667379e2eb4b73636059f8f965c88e398af200ed67338ef7694c08ba84ac1668a8d97c957b5fedbe7a889b0fe331d37990ab7ee7b693b49fa558f3 SHA512 e286612b3598892cd735c801084113d9c0efa301141e55c02da4463cbf8893bb7c2bac63b99bf4d24f8861b87a2bcd012d31695cc6cb70657b1562b660bd2c60
 MISC metadata.xml 342 BLAKE2B 71ad2adf0909be22d8d55ed37c2ea05e7e2fdbdb14e2eee4bff83447d400b89996403a2c4875d30330e56fd857d3672574006c36ba8b23b91ae0de3e801609f9 SHA512 a4b5a69dea823758640fd15374ddb4e5840bec92cbdaff8f8b62554b472a9b7006f77f0771d8410fc076e67da005a4e153fde7443059ccf9d7d85244c8cf2912
diff --git a/dev-libs/fribidi/fribidi-1.0.10.ebuild b/dev-libs/fribidi/fribidi-1.0.10.ebuild
index e0fa1b580528..c05c3f823854 100644
--- a/dev-libs/fribidi/fribidi-1.0.10.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 7446c0854e8e..a36728d5905b 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
-EBUILD gobject-introspection-common-1.68.0.ebuild 928 BLAKE2B e70715e34256971a5d6b05ae3f1f15d48de78f43ce692fae64af86deecf29c84aa89e011d41293a8ad3a31b1c45a318ba3611c8efcbc6f066acfb16e7eda99cb SHA512 8d31a0da92b8b3c108941a55fd52e2f3bbfe474c9d76e794543aace9756cd8300465d6dd21dd1a161c392153cc746c23d6337830773b0c22772cff4cfe0beac1
-EBUILD gobject-introspection-common-1.70.0.ebuild 936 BLAKE2B af10d956a35e545df5668677594a4f138f89d5fea027dc7b17ac5a54c9f7bd1f764b13445635809914adb1f6dd7ff1749fe40ee43d2550bb1240dba33858d1ce SHA512 d4a952192a343d32ea4c33ade3aebcf58efa6ebbe05c4234f4db2c1a0a12f1468f5815bacc01e0098f104b05ed61104f1a779c7db0580534b2451af7a23bce12
+EBUILD gobject-introspection-common-1.68.0.ebuild 934 BLAKE2B d3c587bb7e72a9f43887f1b24c0acfa7f41efa1da917d87a324dac1332000e6a79a774611dffbe4edb889554bb2674bac8d0ae655c8e2666a474d7dfbe916c48 SHA512 39db2039abe991a4e52b5031c8908199985fd475476d8ffb9c740c2c3905df165815188bf0a2700d9e3c8c51939d26c362cba501b5208b1f0ad92a14fb85bed6
+EBUILD gobject-introspection-common-1.70.0.ebuild 942 BLAKE2B 083b78fb09d8c47a080a1eb7628e8b4f4061d3f21b5e03d29c09a3b15213f137b60e1a7d5a46c1867e258f851a76beaaafac9d0894930e6241db812589faa0da SHA512 89f61922204bdc2d672e060e2d0c2720d841042d065573cdb3cf0c271b2d3c327b7157f205b297602509b01acb0712d6e08df3f5941e13aa564134f8889cd40c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild
index 483d8f843f5a..ce767c863369 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
index ff6157de2f64..b34baf454cc7 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 21934ca368f1..a2d946a8db6b 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
-EBUILD gobject-introspection-1.68.0.ebuild 1961 BLAKE2B 55f144f8d0590b66cbf656efccf5c97bab4f4c2bf1da0df6bb900705a1ba4d50e7f710ad761b4ab09d9efbe17238ff92f476f86926eb21cac9b1c2cceed5b6fa SHA512 5e2dc9919beefdccaa9914ab144d64e7b5bea1f0355eddf4c24300853828b026ebaa9c580ee22dcb7947f3dcb394059944db5570692529815180db5e972b1c6c
-EBUILD gobject-introspection-1.70.0.ebuild 1969 BLAKE2B 4f001e1fe7d9b80b555542bf9a38987344a84963f597178b3624ec1f061171cd0371e03b5c296a47988afcbeaffd2afead39bca21e3b5aeac4d2cc6208906a87 SHA512 2baffb39c85c36711461198d59b951b9e89fa8d21623a2e677c1b351f6336639a7bac52aeadf369f1a0cffe0341ef5561e5d16de4370727af18f767c0582460e
+EBUILD gobject-introspection-1.68.0.ebuild 1967 BLAKE2B 5a7638715ade0a4af714a6feecbe872fe8df62a314043b0393f7ef8a4e2be34685b612be972e62edcad86a10d5ffb4cdf2de6fcf9751c6b742f0e9ae5e39466a SHA512 7931985241ce62bba4cd22ff0ba43d243447b7ef283e96c1259d44ab32ca20ddf4e05f19fba15adae8135e41b65f16c58a0c39a0b7a6498f4350ff605ac4432f
+EBUILD gobject-introspection-1.70.0.ebuild 1975 BLAKE2B bd423cb18551ae2ac014a26a7301408359718ee34aa1a8b8b2bb6c9dcebbbbebf20be4e8124fdf337fbd6de8e3018b2b2a975f76cc9235d6aa77998be45bb290 SHA512 3438047f8289d68db48810b1c3cc2f4b316be04a2cee9d21edb74dfbe04c37d42f8de2a16e7cb27bf6352d14cf23bdcf97851f2e8f18ecf9dbd85d0823e7287f
 MISC metadata.xml 368 BLAKE2B 5734e81d2929cef33ae5a3e57d48717f2079944a26a34206d0c674a607068047e24c17e76435683dd6f9b369ba8abcbd6ff98037ba219e7f4ea8225d3980a3eb SHA512 e8a3b181add420cbfbffa78ba6a8bf7d7b82593ba9a54e89e52a9d0eb3a7c92f577d71080912067c16364e267bb1438ba1c8839ed62af24da39cc9e1b6f7d864
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
index fec54fa1772f..4b0b0e3d8c84 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
index 7c203556a91c..fed69d6f20c8 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 502f5cb49c30..2e93cf2055e0 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index f39f66672640..ff174fc95929 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,5 +1,7 @@
 DIST aesara-rel-2.1.3.tar.gz 8170822 BLAKE2B dbbc4a453c5d7f9cd4ab2c925dd9293e835db23100686a8d7ab2c47182b1bc05f883eeb60d6f47f8f34e4187f3ac07b632cde43fe82a99e2145a2f699a2b3582 SHA512 52d1724eb7b3c9bae4bdbf1735db9ef96cdfa94f3e2281b255201d0baba260fe31f78c00719a53ce3c59ea9c66ff218d8acd7bc012b386942f29806c07ffc466
 DIST aesara-rel-2.2.1.tar.gz 8166022 BLAKE2B af3c17029dacb3d365bf49eb01d4d03b5a4f770f66d3e5eba2c4576ef156056bc1aca3571442c1cb7352c358978b47faa7af70ca0da2a2168d8c9bfd47b17138 SHA512 f7bab8ca80e8d13ef7698c1efa56ff37c561786330bf756c7a00c54ae1f131810d68bfd6e328b0705d45788759bd984d42306d2c545d2de6b9a3592b5c021ad8
+DIST aesara-rel-2.2.2.tar.gz 8174667 BLAKE2B e0b22e7e38dbff1089b0db77ee55fbc8f1847da576a54b1f59a34c22d9bb777f108b8d06d3e4cddeb826f4bee566d32f6b4ec013f96ee61ecce6924188aa1dc7 SHA512 1f2eff0c959605a09521d15010058851e8dc340ca84d760baf6166508e37cc7734e8737ca199618f4e9bd33bd04c053add0a790917f4c125052631f693383945
 EBUILD aesara-2.1.3.ebuild 2111 BLAKE2B 938cf355ddd1157d3a085651bbd1c5766a395da540066341eb1c7c8d8f0559d934e1e5e5c285c2a4ccad7ea1a42e1bcc14619ac2ebc9d71a0b8d10bd6c87a160 SHA512 04edb20862110c8e25ee9c95b52207a904bc8333f8d0de06436e577654fa25eb2d01ca8b258cbe5ed32b3a96ef0611964df3315d7fc1c63e654295460f09372d
 EBUILD aesara-2.2.1.ebuild 2113 BLAKE2B 4bb3fbf4c4f4205d8ac7dec2d4504a2d275e8a170068bc76a7da0fae4a6fc184378d2f5c12ccb8c4cee272e7ed1316b7b4244370ee1a2181508d75fb3854ec04 SHA512 55248fa3a37161ccc82e3e8ed088677d4281f813e10e817c0ab6f8c95d67ab3930912d913b920abc231796cf6c94d17dfa9a9851d69b077f0983b65aa7a73e44
+EBUILD aesara-2.2.2.ebuild 2113 BLAKE2B 4bb3fbf4c4f4205d8ac7dec2d4504a2d275e8a170068bc76a7da0fae4a6fc184378d2f5c12ccb8c4cee272e7ed1316b7b4244370ee1a2181508d75fb3854ec04 SHA512 55248fa3a37161ccc82e3e8ed088677d4281f813e10e817c0ab6f8c95d67ab3930912d913b920abc231796cf6c94d17dfa9a9851d69b077f0983b65aa7a73e44
 MISC metadata.xml 405 BLAKE2B 5f24e428a99637a4a83f896924ce738183a9363ca83610cba6f16ed36c0dbbb8a057b70fb271f1594bec69239789858efced727f669b6d6b3a0282e02396f043 SHA512 c46d8761cea98d27a266f14371f544989fac1685321bb496e3f32559d9c28e984e0686140981e08d0c00245b9d31feb9ef5df5d47a032b7dbeaa4eb37c83a034
diff --git a/dev-python/aesara/aesara-2.2.2.ebuild b/dev-python/aesara/aesara-2.2.2.ebuild
new file mode 100644
index 000000000000..3148f85f3cf9
--- /dev/null
+++ b/dev-python/aesara/aesara-2.2.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index b9bdfb94d81c..6ad06a2dd437 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,3 +1,4 @@
+AUX genshi-0.7.5-fix-py3.10.patch 6996 BLAKE2B 835c83e1f3f33d2066b4e4acb81d2ec71958a8a7cbb98abc482d1cdb4b570ac76f8087a7f1df6e1a06fe3e0ef010139ac0e3f2a5ab0ec10ef8aafcd680dc38ab SHA512 ad3c657bf9844159340cbebe1a10ff8ec65cc9764d9c5085b31b1a223ed1ba117281fe4bdfd51bdb778b6ff6344ccd0d1d23e9de50093ff0936d34aa27814425
 DIST Genshi-0.7.5.tar.gz 266071 BLAKE2B 007a094f8ce9aa17209a2c1c7241eb5eb50c3be3439fa2066ac7ceab88fa4dccbcaa11809042445e23ad1ce106b2e9efa825ac11de03038f07b421e9b93c03f6 SHA512 b5be34094e2eea8f5fc373097414dc77ddfe0ab0a82901b6fd87af558cf62420f690fb39bff2d13bde3f7fef5ef000697372996877b48187ed068227dab59119
-EBUILD genshi-0.7.5.ebuild 836 BLAKE2B 43630c37164a79841db2a3925e4e56b7d4107b5cf25b705be4d5746ead797b5153c922c6579e606a4b477ed24b7c2d81765a524ae3830e5fc95d5b95fb595699 SHA512 d3b97d03d6d483d09adb54224a99fe9f611e39538a09de4ff79a55ebd4f175060fa3ed31b748d268718daebdc6a877a3ff89bbaac28913c2d3d848ca85664e65
+EBUILD genshi-0.7.5.ebuild 887 BLAKE2B 75c2c720f780dc77b02630bd134bfc38e3a3596c437d6f9d96fb111af32f7cf2b4ce5fb7d04d257569fac8e97a9d0900c7ee2a4e5b18de1f17b8c9c170f7f2ff SHA512 8b6d8f82af0b84690d651e0e83f98e077f22616bf2046762b496d9e73b0e40af3ebb3f58db77cfdd22af9476762fa7417501e182beea972f80f70d389eb9b924
 MISC metadata.xml 389 BLAKE2B 9d92c761c148cb904ea6098935fcbf2cf8d4cabab5a78a4648e6d8cdd3eb9e60373804c082094e4054b34f5014c0e44d0db22d90b7cff36a160423c494e04e76 SHA512 56d8d92964a3320a392c3f45973bbe73d40e5220b173bfc183ecd3c10c7e7e115aaa2bc7721eef83dadc88c2be78be5beabbfdc15a74a9b7c4a580c1d5978a5a
diff --git a/dev-python/genshi/files/genshi-0.7.5-fix-py3.10.patch b/dev-python/genshi/files/genshi-0.7.5-fix-py3.10.patch
new file mode 100644
index 000000000000..fea4e6434b26
--- /dev/null
+++ b/dev-python/genshi/files/genshi-0.7.5-fix-py3.10.patch
@@ -0,0 +1,233 @@
+From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
+https://github.com/edgewall/genshi/pull/49
+
+--- a/genshi/util.py
++++ b/genshi/util.py
+@@ -119,7 +119,6 @@ def _insert_item(self, item):
+ 
+     def _manage_size(self):
+         while len(self._dict) > self.capacity:
+-            olditem = self._dict[self.tail.key]
+             del self._dict[self.tail.key]
+             if self.tail != self.head:
+                 self.tail = self.tail.prv
+
+--- a/genshi/core.py
++++ b/genshi/core.py
+@@ -20,7 +20,8 @@
+ 
+ import six
+ 
+-from genshi.util import plaintext, stripentities, striptags, stringrepr
++from genshi.compat import stringrepr
++from genshi.util import stripentities, striptags
+ 
+ __all__ = ['Stream', 'Markup', 'escape', 'unescape', 'Attrs', 'Namespace',
+            'QName']
+--- a/genshi/filters/tests/i18n.py
++++ b/genshi/filters/tests/i18n.py
+@@ -12,7 +12,6 @@
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+ from datetime import datetime
+-import doctest
+ from gettext import NullTranslations
+ import unittest
+ 
+--- a/genshi/filters/tests/test_html.py
++++ b/genshi/filters/tests/test_html.py
+@@ -11,7 +11,6 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+ import unittest
+ 
+ import six
+--- a/genshi/filters/tests/transform.py
++++ b/genshi/filters/tests/transform.py
+@@ -12,7 +12,6 @@
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+ import doctest
+-from pprint import pprint
+ import unittest
+ 
+ import six
+--- a/genshi/input.py
++++ b/genshi/input.py
+@@ -22,8 +22,6 @@
+ import six
+ from six.moves import html_entities as entities, html_parser as html
+ 
+-import six
+-
+ from genshi.core import Attrs, QName, Stream, stripentities
+ from genshi.core import START, END, XML_DECL, DOCTYPE, TEXT, START_NS, \
+                         END_NS, START_CDATA, END_CDATA, PI, COMMENT
+--- a/genshi/output.py
++++ b/genshi/output.py
+@@ -20,7 +20,7 @@
+ 
+ import six
+ 
+-from genshi.core import escape, Attrs, Markup, Namespace, QName, StreamEventKind
++from genshi.core import escape, Attrs, Markup, QName, StreamEventKind
+ from genshi.core import START, END, TEXT, XML_DECL, DOCTYPE, START_NS, END_NS, \
+                         START_CDATA, END_CDATA, PI, COMMENT, XML_NAMESPACE
+ 
+--- a/genshi/template/base.py
++++ b/genshi/template/base.py
+@@ -15,7 +15,6 @@
+ 
+ from collections import deque
+ import os
+-import sys
+ 
+ import six
+ 
+--- a/genshi/template/directives.py
++++ b/genshi/template/directives.py
+@@ -19,8 +19,7 @@
+ from genshi.path import Path
+ from genshi.template.base import TemplateRuntimeError, TemplateSyntaxError, \
+                                  EXPR, _apply_directives, _eval_expr
+-from genshi.template.eval import Expression, ExpressionASTTransformer, \
+-                                 _ast, _parse
++from genshi.template.eval import Expression, _ast, _parse
+ 
+ __all__ = ['AttrsDirective', 'ChooseDirective', 'ContentDirective',
+            'DefDirective', 'ForDirective', 'IfDirective', 'MatchDirective',
+--- a/genshi/template/interpolation.py
++++ b/genshi/template/interpolation.py
+@@ -16,7 +16,6 @@
+ """
+ 
+ from itertools import chain
+-import os
+ import re
+ from tokenize import PseudoToken
+ 
+--- a/genshi/template/markup.py
++++ b/genshi/template/markup.py
+@@ -15,7 +15,7 @@
+ 
+ from itertools import chain
+ 
+-from genshi.core import Attrs, Markup, Namespace, Stream, StreamEventKind
++from genshi.core import Attrs, Markup, Namespace, Stream
+ from genshi.core import START, END, START_NS, END_NS, TEXT, PI, COMMENT
+ from genshi.input import XMLParser
+ from genshi.template.base import BadDirectiveError, Template, \
+--- a/genshi/template/text.py
++++ b/genshi/template/text.py
+@@ -35,7 +35,6 @@
+                                  TemplateSyntaxError, EXEC, INCLUDE, SUB
+ from genshi.template.eval import Suite
+ from genshi.template.directives import *
+-from genshi.template.directives import Directive
+ from genshi.template.interpolation import interpolate
+ 
+ __all__ = ['NewTextTemplate', 'OldTextTemplate', 'TextTemplate']
+--- a/genshi/tests/core.py
++++ b/genshi/tests/core.py
+@@ -11,13 +11,12 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+ import pickle
+ import unittest
+ 
+ from genshi import core
+ from genshi.core import Markup, Attrs, Namespace, QName, escape, unescape
+-from genshi.input import XML, ParseError
++from genshi.input import XML
+ from genshi.compat import StringIO, BytesIO, IS_PYTHON2
+ from genshi.tests.test_utils import doctest_suite
+ 
+--- a/genshi/tests/input.py
++++ b/genshi/tests/input.py
+@@ -11,8 +11,6 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+-import sys
+ import unittest
+ 
+ from genshi.core import Attrs, Stream
+--- a/genshi/tests/output.py
++++ b/genshi/tests/output.py
+@@ -11,9 +11,7 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+ import unittest
+-import sys
+ 
+ from genshi.core import Attrs, Markup, QName, Stream
+ from genshi.input import HTML, XML
+--- a/genshi/tests/path.py
++++ b/genshi/tests/path.py
+@@ -11,7 +11,6 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+ import unittest
+ 
+ from genshi.core import Attrs, QName
+--- a/genshi/tests/util.py
++++ b/genshi/tests/util.py
+@@ -11,7 +11,6 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-import doctest
+ import unittest
+ 
+ from genshi import util
+--- a/genshi/util.py
++++ b/genshi/util.py
+@@ -19,8 +19,6 @@
+ 
+ import six
+ 
+-from .compat import stringrepr
+-
+ __docformat__ = 'restructuredtext en'
+ 
+ 
+--- a/setup.py
++++ b/setup.py
+@@ -12,11 +12,8 @@
+ # individuals. For the exact contribution history, see the revision
+ # history and logs, available at http://genshi.edgewall.org/log/.
+ 
+-from distutils.cmd import Command
+ from distutils.command.build_ext import build_ext
+ from distutils.errors import CCompilerError, DistutilsPlatformError
+-import doctest
+-from glob import glob
+ import os
+ try:
+     from setuptools import setup, Extension
+
+--- a/genshi/compat.py
++++ b/genshi/compat.py
+@@ -99,6 +99,13 @@ def get_code_params(code):
+ 
+ 
+     def build_code_chunk(code, filename, name, lineno):
++        if hasattr(code, 'replace'):
++            # Python 3.8+
++            return code.replace(
++                co_filename=filename,
++                co_name=name,
++                co_firstlineno=lineno,
++            )
+         params =  [0, code.co_nlocals, code.co_kwonlyargcount,
+                   code.co_stacksize, code.co_flags | 0x0040,
+                   code.co_code, code.co_consts, code.co_names,
diff --git a/dev-python/genshi/genshi-0.7.5.ebuild b/dev-python/genshi/genshi-0.7.5.ebuild
index 63016f30c154..113fce0e118e 100644
--- a/dev-python/genshi/genshi-0.7.5.ebuild
+++ b/dev-python/genshi/genshi-0.7.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python toolkit for stream-based generation of output for the web"
@@ -22,6 +22,10 @@ BDEPEND="
 
 distutils_enable_tests setup.py
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 python_install_all() {
 	if use doc; then
 		dodoc doc/*.txt
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index acbb289b1e07..279f11b966d5 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,5 +1,5 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
 EBUILD markdown-2.6.11.ebuild 822 BLAKE2B b817bff5c3d6d1d62b86b451d49076f2b84fcf1c9e448935258c1b35fd7f3fd59173d26628ce3b6338ec87a8b9c8866e430c5585fd93d186f5b8784e7fa8b31a SHA512 4c15ff73bfdac09321c707cb962c94f106787a0787dd828c86a4629eba6801b63db1ff10ba9ca87a2397a7599b73f4aa71ddf918886d9b3c6270f3c67b735c88
-EBUILD markdown-3.3.4.ebuild 1049 BLAKE2B 5f10947ebe4acfb905781760aeedac3260a5cc0d9ad9dfa14ca99f4aae342bb05ea8af1caf061917bf04a2a28bd02746be43d83b5b1c5d8980b7543a905ee7c6 SHA512 a17b96ac96eec530a8ecb969e03212c32043c19bf6046ca16cfc0e84ca10b7dc1cd6d82f922d9d219d23bd9fc3350c58c3312e2c5fd4437ef3bd24d22b0768e2
+EBUILD markdown-3.3.4.ebuild 1055 BLAKE2B 1f8447367154aeb53389922fe48d5a03a7c022a6584642bc13c84ab7a8fd02becc0c114da6c53fab32794b228ca8c94544ea8e840c497290be33c3446cb2947c SHA512 13a5b46a701e8debf9d4964389db799c210b2e5e7314b9bfec2f0b7788409e2ba5ae8a96033eefa7d2d6d396a45d15604e6bd6bdd50cbbf844df51179ca22c12
 MISC metadata.xml 400 BLAKE2B 325197e9e700565d94ac477c4acefb1ccad5fea759bcb9bb980122f2a8fd0b7509fbf54768948b28a180392154d26d9a9068b996661a35ec79bb03998ae538f5 SHA512 68bb4ebfe231af6e30c3f8a9fafdab8f1b90fb67d942605d0366bfe504de0ae482da8c4e45279cf7bfae857ed9ccb0729a36f6ea1b18bd459e0dc3e1e3a9f6bf
diff --git a/dev-python/markdown/markdown-3.3.4.ebuild b/dev-python/markdown/markdown-3.3.4.ebuild
index 16284fb9fa25..8d7873f6b58b 100644
--- a/dev-python/markdown/markdown-3.3.4.ebuild
+++ b/dev-python/markdown/markdown-3.3.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 # importlib_metadata is only necessary for <python:3.8 according to setup.py
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 821a6b539eec..20c32fb7bcd7 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,3 +1,3 @@
 DIST pytidylib-0.3.2.tar.gz 87669 BLAKE2B 57eee794e3a6ba147b778360a12d2417c21579250620854267a83300d918cac0320c768faacb531517b66eed7fd7afc1679e76f2db626f7d7daa80af1667a06d SHA512 24f755ed2607e300711f5a1aee510df3a0a410cc7d8d8f46e065ec8d93c50e436a492cc2831e9d416ab9837497c603f9dc8705da543102813d3264e6de033ca7
-EBUILD pytidylib-0.3.2-r1.ebuild 592 BLAKE2B 58ce98b89d7c8c0a4a521970de919d6f80e6b197fd004cdff490f7ba2ebc47a49649a8a0850d86bbfdd92b0d3e01edd4db401ec647c8c43931f8f90069eea53e SHA512 17481ab9d1a49385f54ad402b0ddd72d1f75103db7ec86d6570d0afda27469f707803dd373d5bbc1166ca745822b876f154926af4d094c95d5da5f5b800c5186
+EBUILD pytidylib-0.3.2-r1.ebuild 598 BLAKE2B b651fd69fec5b94be9abf4844a627e27605f220baf90cc290796790d24776fa8fa4072b2f421e119b381fc0a81270e70d61006b7bd94f855655b9b9053dd8bf7 SHA512 622719a27ec15e1a9eaf977032a6b47679797ceb273abf4083c36b7e626f34a10a67339e64360f8fadc9234909471d1b66338bb4b9a30996f13848b65859ffc0
 MISC metadata.xml 386 BLAKE2B 827fbfb2980cea331345e42992787858b4bfa481157841c2a6970d75e4a5d669e864e545c07723baa5fd673d7fac020fa8ed26008e57064e3de4b230809ac358 SHA512 88a181e7b71f76b1d0271362b39a7310ecf5cd90cf98aa41e609833cfae4c5886b6d4beb1fd387ca6aec3f7a9da1bdc9a1e3424b018039804049ed94b717f92c
diff --git a/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
index af4606a00b43..74d643a16278 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="app-text/htmltidy"
 DEPEND=${RDEPEND}
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 473e25c0b601..fa55e0af2ca0 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,3 +1,3 @@
 DIST sure-2.0.0.tar.gz 46747 BLAKE2B 631923bf2fc0a972e276fbfd1918abbafec28e662669993b40ff8ca72944952d092ac662728f98a286fc9b5c8e3765d10a4d6ef1f17b17655802b971b97410af SHA512 8286846374c2bfc773444e90bf4f9c0b0d66d0229afa53af63025bfec690bf8bcc959f86c238ca5244c6a29099e955691771b0eb954af479bde2f17e51f6f1de
-EBUILD sure-2.0.0.ebuild 689 BLAKE2B cb61e898377ff7e9193913362e2dfeb134625c15b248bd0b98a8f32928541290941a7bf7b7b77377ae1ac97939ea3175a57100f2b10584f76a609e9057fa7163 SHA512 a5de2f724ff297f3f3525436e37150da0e3d1c00223f17c32a2611961ee041d28eccf9655bb8d41e68da1632518ce225d926278e56e1f664648efbea8057a1e0
+EBUILD sure-2.0.0.ebuild 830 BLAKE2B b35d2a6e33a0e959da887257ec7373cd174848f6214aa5f1441a1d74eaaa71a6cc59259cecac37ece666ac1b51731d3768336557ae386b467fba21a897e82ab5 SHA512 7a25a0e6e9d895f3c6718698895c08c7953d90e33742f703eaaa6cc784bab3aedfacc7d4abd1a166817cb3338a5e50b1217608c4e38c166827fe46acf1db26e4
 MISC metadata.xml 583 BLAKE2B 3a551f125c9df8f77a05b69cf54b30d94bace7869decb608b3685e06a7cb9f1462d4e674d06d59d84100e06ee95cce30a68c4777632bb0691397f1e6faaa26ef SHA512 57b87cbde1f34395fbd42bc8f7712aaf193aded2248815cb6919cb51387227f1cab46dd0d1595be9a55bdd131ac554e401366c3740c3d01782b8329a6f8e6588
diff --git a/dev-python/sure/sure-2.0.0.ebuild b/dev-python/sure/sure-2.0.0.ebuild
index f787aa00d109..a5d69e46b1cb 100644
--- a/dev-python/sure/sure-2.0.0.ebuild
+++ b/dev-python/sure/sure-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -26,5 +26,7 @@ distutils_enable_tests nose
 src_prepare() {
 	# remove unnecessary dep
 	sed -i -e '/rednose/d' setup.cfg || die
+	# broken test with python 3.10, but when manually run, passes
+	sed -e 's/test_context_is_not_optional/_&/' -i tests/test_old_api.py || die
 	distutils-r1_src_prepare
 }
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 5a699a29ce2a..d584a4edddd7 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 82bb85af2f6f..9565c696b1dd 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
-AUX qtwebengine-5.15.0-disable-fatal-warnings.patch 414 BLAKE2B 531523ee8c85d6ac51637b3bfd4fbcd56476e1231103c0db62b7c27ace4d5e070becb97beb74526806101c138669adc81a00eefe319ff96582df4743ecabcef8 SHA512 4e3ae727f2738bcc011c9fdd27593d9689206573ff7f17a51fd78d3aa25d427b899af78c098c278f6e7ab4ce88bf415e7382a8a635dd880448a75e6756abc680
 AUX qtwebengine-5.15.2-disable-fatal-warnings.patch 442 BLAKE2B d2f303f03f817c1e10d0c3c64deaefce773cb63852e8a37ba1c4611e26e850c5722e708425525a6fbfe170ce757a7fcb89e0324e3ea41f4ddeafd4bc15cc5c3b SHA512 79503e9278b50b5ac799852958850c54027c329f32242747514bbc7253192893c9ce5b9c6feeae7918f9e0f4047526adfb1c9ac9c0c5dcc625fe7b1507a93d23
 AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47
 AUX qtwebengine-5.15.2-extra_gn.patch 503 BLAKE2B 7949b35e725d920605ee7337de7aa29c22dee43ffaa383b4351e1e4170b06755e8b16eed28faf004486831fb020cd4fca1d5e54f61e99b7c8f084cad0d5d847c SHA512 2d916d918a1b12d91387da8b1161b15d33a55a9445de9725927fb88bb91666506a91df0df9224ec4a273b0c3f2fd3dbb2bb10857164a4204023f277707c099d0
@@ -9,8 +8,6 @@ AUX qtwebengine-5.15.2_p20210521-gcc11.patch 3642 BLAKE2B 9b5085dbb201b12c3476bb
 AUX qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch 7642 BLAKE2B 3650865736f4fdaa3fcb6146da8607710612a7652053f314ddf21e6a1f9c9acfd48bc26e048091ecb3096705c91529b264198812ceca774754c19911ccbef23e SHA512 f2168d125f5c4e3cb7e1c33924cbef687291e0f172b0f079fb8f8ecf8790247437bdedbb58c3f916ef93e8b991485cc3a14611500212b7b7f5d56c7b55e83941
 AUX qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch 8346 BLAKE2B d305461d127bd95b7bd3be58cb1488212f9af8d934f2519b82416f8a4237238b02f4ed2a7cb9cba7145ae44e48725a28f6f41f9250d052e2a58670724050e825 SHA512 1e99d95459509c58fe185d3b39f9b46b19d5052ea5927254f283de1dacb02cd94a208a72f4bd85517254c933c9990b570fe40e23b4e6ed2067f16be3bc30996c
 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
-DIST qtwebengine-5.15.2_p20210625.tar.xz 320144708 BLAKE2B cd11e69a34ff0fa07d26262906a12304c39a12575024d61db18bc696284e9c5700090e5bfed217c89d2c8eac49b0ccb7d7ee0ba716ec3a81878de1301566884d SHA512 517a8cdaff684894456db8cfb5cfca412b8764e7035623d8190d9a06f6995742097a53eb67329d12bf8dc0a56372f7d09a54532ba804a5bff245ca8ef042a4e1
 DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
-EBUILD qtwebengine-5.15.2_p20210625.ebuild 7233 BLAKE2B bf4cd6335662386076828df5f5f323d9c3ae0943074ac46e8ca684433a003e72caabea226f6de5f7f8dafcb86d8c56a23881f92ae1ffbcb9e328c5d672220f3a SHA512 aaadc7463ce4236f0f0bc810ce10e10094fcd8c0ff01476c8a6f43761aae1d4dff9e0216d94a2d6f263c054cdcf1aa3215771663a30bf4ffcc44e04c252a3bb9
 EBUILD qtwebengine-5.15.2_p20210824-r1.ebuild 7480 BLAKE2B 5b282066065277805ce6e440a3c958bd8467638811686c2928c07d49d5eafd0cb8fadd68a9269d6d8f654d20bf498a49253e0027c2ba7126bc22b7909382e9af SHA512 cc28dc794c27bc45d1c7bbd8b4a2570379683e461f7a8f0240b53d6e51fc523a0cbcbf3e0b9fd34c7aa0bec097c9388b095aa720e24d951564b2b2cd6c49093d
 MISC metadata.xml 1270 BLAKE2B 6ac8693b4a994904a8d7dd5728a0f47679b2b7553750a17fa64a7b8fd8cd74abd54ffbcb7da00d5b43622a67dedb3e3bcc93029bef2872e921e333a24892ca47 SHA512 4675ec29c3d6ac329b177f10b920dcf75ea5ed18a21aee1c500ee28430d85fcaaeac6df28a942c4bdcdf8692196017b1ea456e9f66d129afd1254d7931083eda
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch
deleted file mode 100644
index af602855b129..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/buildtools/config/common.pri	2020-02-28 22:21:09.341072620 +0200
-+++ b/src/buildtools/config/common.pri	2020-02-28 22:20:26.702399180 +0200
-@@ -25,6 +25,7 @@
-     strip_absolute_paths_from_debug_symbols=false \
-     toolkit_views=false \
-     treat_warnings_as_errors=false \
-+    fatal_linker_warnings=false \
-     use_allocator_shim=false \
-     use_allocator=\"none\" \
-     use_custom_libcxx=false \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
deleted file mode 100644
index 3b18dfa1b720..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-QTVER=$(ver_cut 1-3)
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	if [[ ${PV} == ${QTVER}_p* ]]; then
-		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/${P}"
-		QT5_BUILD_DIR="${S}_build"
-	fi
-else
-	EGIT_BRANCH="5.15"
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt/${QT5_MODULE}.git"
-		"https://github.com/qt/${QT5_MODULE}.git"
-	)
-	inherit git-r3
-fi
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	~dev-qt/qtcore-${QTVER}
-	~dev-qt/qtdeclarative-${QTVER}
-	~dev-qt/qtgui-${QTVER}
-	~dev-qt/qtnetwork-${QTVER}
-	~dev-qt/qtprintsupport-${QTVER}
-	~dev-qt/qtwebchannel-${QTVER}[qml]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc(+)]
-	media-libs/libwebp:=
-	media-libs/mesa[egl,X(+)]
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib[minizip]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( ~dev-qt/designer-${QTVER} )
-	geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	widgets? (
-		~dev-qt/qtdeclarative-${QTVER}[widgets]
-		~dev-qt/qtwidgets-${QTVER}
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-	ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
-	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
-	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
-	"${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
-	"${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
-)
-
-pkg_preinst() {
-	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
-	elog "additional security fixes from newer versions. Extensive as it is, the"
-	elog "list of backports is impossible to evaluate, but always bound to be behind"
-	elog "Chromium's release schedule."
-	elog "In addition, various online services may deny service based on an outdated"
-	elog "user agent version (and/or other checks). Google is already known to do so."
-	elog
-	elog "tldr: Your web browsing experience will be compromised."
-}
-
-src_unpack() {
-	# bug 307861
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-		ewarn
-	fi
-	eshopts_pop
-
-	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
-
-src_prepare() {
-	if [[ ${PV} == ${QTVER}_p* ]]; then
-		# This is made from git, and for some reason will fail w/o .git directories.
-		mkdir -p .git src/3rdparty/chromium/.git || die
-
-		# We need to make sure this integrates well into Qt 5.15.2 installation.
-		# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
-		sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
-	fi
-
-	# QTBUG-88657 - jumbo-build could still make trouble
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	if use ppc64; then
-		einfo "Patching for ppc64le and generating build files"
-		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
-		pushd src/3rdparty/chromium > /dev/null || die
-		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
-		popd > /dev/null || die
-		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
-		mkdir -vp source/config/linux/ppc64 || die
-		mkdir -p source/libvpx/test || die
-		touch source/libvpx/test/test.mk || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-no-build-qtpdf
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(usex alsa '-alsa' '-no-alsa')
-		$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
-		$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
-		$(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
-		$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
-		$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
-		$(usex system-icu '-webengine-icu' '-no-webengine-icu')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 8115f3b79932..3bee16b31d7c 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index 683417c6afe0..fd2a125300c3 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -58,7 +58,7 @@ EXPORT_FUNCTIONS pkg_setup
 # @DESCRIPTION:
 # All supported Ada implementations, most preferred last.
 _ADA_ALL_IMPLS=(
-	gnat_2017 gnat_2018 gnat_2019 gnat_2020 gnat_2021
+	gnat_2019 gnat_2020 gnat_2021
 )
 readonly _ADA_ALL_IMPLS
 
@@ -83,7 +83,7 @@ _ada_impl_supported() {
 	# keep in sync with _ADA_ALL_IMPLS!
 	# (not using that list because inline patterns shall be faster)
 	case "${impl}" in
-		gnat_201[789])
+		gnat_2019)
 			return 0
 			;;
 		gnat_202[01])
@@ -200,14 +200,6 @@ ada_export() {
 	local gcc_pv
 	local slot
 	case "${impl}" in
-		gnat_2017)
-			gcc_pv=6.3.0
-			slot=6.3.0
-			;;
-		gnat_2018)
-			gcc_pv=7.3.1
-			slot=7.3.1
-			;;
 		gnat_2019)
 			gcc_pv=8.3.1
 			slot=8.3.1
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 9cc470a689d0..842d70bc9c6f 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index 244c1df4f586..4142125dd6ef 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,3 +1,5 @@
 DIST hitori-3.38.2.tar.xz 204992 BLAKE2B 271e7c7c09a0a9cf496783bf19cfc9bfb60a7a94b1addce704e0ee57b9a9d730e6fc96750dc2eb0e14cae2b0d5d8abc7474fe28029b94f0c7d195cdcbf7155da SHA512 6a094e7bf9b528b965819a28b64db0f7b6c474dbd1a54c3063ad2f20b726193a46b4b058566baea7dee889c3d692bd36bdf775a177e430b5772b16762bdc2785
+DIST hitori-3.38.3.tar.xz 205100 BLAKE2B 8b3e477f8a62911c8fa0b366f578adb7bc362445cf3982a131677988e6f7471a0f56a06fcd356ff19692debf27126e98d4f8c52524af3e6e7e22c3b43bb3276c SHA512 1ba966c22304a2538026234fbb9e0ae34a433643af02ecc26a6e5cd240efa89524ee0e98334d01728f25ec987865a8ff724036e37859503d2517e7480d2dc744
 EBUILD hitori-3.38.2.ebuild 702 BLAKE2B d364d02c8b4620dca37add6e275b21ba7a034ecc5fcac28708f4fb5b1d84c1c0223610e7dd5d0426b24165af774bae2b3c11d4eb45c4705f8918c45e5b52c4ce SHA512 3bbcb53f1e89a95ba4c7d19c8c3e2f2b5c3cef4dbf914e014c932dd2cc43b1cf4ffcf0ff9d59c68f3e6948b01249f15d108a2cef2e6e778ccfd38f463d57458d
+EBUILD hitori-3.38.3.ebuild 704 BLAKE2B b5fdb69ecc171dc02b99228f8de0675addfe5f272907383359e61214097891c8230b2ce567669423062e97cba42dc6a26be365882d78e555da9db883d2ead78e SHA512 f6dc91b81412d6d46a67591ef40b3f8cd8de44ea2aa9d42aff208753862d723d7763dab27c9589a867e1927ffdc8bcce29d770d08ec8bf5e2242566996f93061
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/hitori/hitori-3.38.3.ebuild b/games-puzzle/hitori/hitori-3.38.3.ebuild
new file mode 100644
index 000000000000..dac7645c4182
--- /dev/null
+++ b/games-puzzle/hitori/hitori-3.38.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Logic puzzle game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.22.0:3
+	>=x11-libs/cairo-1.4
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index e6a8b2e3c4d6..608fd2bd760d 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 66872f60608a..651e12561fb4 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,5 +1,5 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r2 2026 BLAKE2B ed212537e0a0d1a5e714aa0f4e72915ba3142580a1c1e46f9f88d06b8d8176de0bd5ab5134e915537583d20e4e3dbfba9e10ab1281bd84b8361f6ca01d1eab81 SHA512 8a6ab7277604cdc4677fde5d745e0c02a557538a4d73adc44873f49a01715eb878b48a56e51b6019aa814325543b509f8403cf351570d1b35ef1e07e98828c9c
-DIST bedrock-server-1.17.11.01.zip 60016039 BLAKE2B b66fadbc7a5cb470b8fedc6ddede9283d4114cf07fa1c2719eaebc5908076805463f8a15c0e4fb582f28eef1fc89c494b98eaa4ed93cadd9e142d88ac27a73fc SHA512 9e9b3999003ed331df2d19324f7c5e679123dc5246ccf5ffbe1a2e0389af8cae211ab79a9a1d16bad6e37d06010224170e7188c24bdc7235f699aac07dd93800
+DIST bedrock-server-1.17.11.01.zip 60015117 BLAKE2B 5927da2e2be005f3ae23928e995fe962926a5992537a82b98de668db6a635568b054eebab2454def1f938fea9f97997c537b9b6a1b528a4048c39cd5784923b1 SHA512 bddda992dede723fb042c3769513705a4848aaad5f83db44ca9d5879a735bfcc8bbc5dc6d4b38948d675e55340963e866259c27506ccf8ec8d330ae9f7ed1549
 EBUILD bedrock-server-1.17.11.01.ebuild 1106 BLAKE2B 822c69b602af4e9a4cde85ec38b4d72f37d0b098f028c57ea98ae526bc39f90113222fc9b822d8a6be6253f72c76b7660404fccf1d3ce0f23a4e18a15a5ef668 SHA512 c9931f05dff80337f5a17e0d8f47cb8a0b87dcc64f86b6e4c71b4cb04cd89234fd3ffa8b532b0815c066b6cdc769040ef2c6ac2372e86b6f8c78660d16b8a361
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index e3fdc8f84b1c..b868bc4de07a 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 19977517b3e9..c1abf1723a56 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,7 +1,7 @@
-DIST gnome-user-docs-40.1.tar.xz 9264892 BLAKE2B 3c27662d516839d411444b811d2c60da51b055a7200958ee50908092bd135e182c2b359f47b711b276a6a9b6b029b767b23bd88fecc32f2c80fa2652ace40184 SHA512 a5ebd9bfbdf13c6922db2035c740f729dc89a2dfa991e74cb835d1c8e28ec4d0d08aaf7388d00d6df83f53a6261bebc1ea32e5b57287c13b2237221a56a34332
 DIST gnome-user-docs-40.3.tar.xz 9141728 BLAKE2B 9634dfa526d7e781400563e0800f25fc8aa520d97fe0e02f3a06a1f82bb0019ff28e9bf0c8a2698c7d081d7b54a1d53be4475db6615d40c3407b632252cc8aae SHA512 e96f4535761c902999b210060f9bbf19384151752315abc7cf20f8b0ef1f599fe132f398db61318ea24eab8e3dc65812fc05a5ed549e4cedabaf809af39f515b
 DIST gnome-user-docs-40.4.tar.xz 9195696 BLAKE2B 438f52d72a8975125b758acedfbc8c08a36397af6bb0dff01d0c73d517cee67999724e9e29d2731344fbc822309510f36f367052eeff3ba4e1dc36554eb76ffe SHA512 50c8df61a02eaa077ad3faa18d622ead97c7a8926717b2b85d6a9fb86f93e0adb3c9f212f0fbfb4781a35135fc0251d664f793665343b7daaf41a390b10fe868
-EBUILD gnome-user-docs-40.1.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24
+DIST gnome-user-docs-40.5.tar.xz 9210512 BLAKE2B 0fe638636377d1c392d208c55016cdc346fa1ec64d327ab9ded9b58744d115c74d5a03927836138cb2d58c9df735d8bc032da4a7ff3ef3ffa53a1a59b88a3006 SHA512 dbef51c262862b211304158fd9aa7bf75ab20bbf21ed0bebe0a1c547cb53e580d32062a6f362f0750a8fbe1e93e8987593c80fa7fbb758c1a61827256db69d52
 EBUILD gnome-user-docs-40.3.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24
 EBUILD gnome-user-docs-40.4.ebuild 938 BLAKE2B 399a4f043a4a19513de8674eb2ff7715d05b99ec703800b5bf92f7cd8320065df980bf63bd7d426621e7f36b7718210419cf98633397ea11ea33910da65d10c8 SHA512 6fdf644c671bdd9c51836670e6029021060b3f45af749abb5d641d8c3ef201c0e9d57a69cc87e75bc94081a735689c7f725b55398147fba1c6d5e39a113a70f7
+EBUILD gnome-user-docs-40.5.ebuild 938 BLAKE2B 399a4f043a4a19513de8674eb2ff7715d05b99ec703800b5bf92f7cd8320065df980bf63bd7d426621e7f36b7718210419cf98633397ea11ea33910da65d10c8 SHA512 6fdf644c671bdd9c51836670e6029021060b3f45af749abb5d641d8c3ef201c0e9d57a69cc87e75bc94081a735689c7f725b55398147fba1c6d5e39a113a70f7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild
similarity index 92%
rename from gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild
rename to gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild
index f9a0f49950e9..aef106ecb64f 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-libs/libxml2 )"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9f344d9f921e..ccc88c709902 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest
index 45ff3a0c853d..67a7186bfae4 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -9,6 +9,6 @@ AUX nvidia-texture-tools-2.1.2-test_path.patch 846 BLAKE2B 51a9014da038c9015b767
 DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B aef1801795f6102ac7c96df236de0e8534bfacfc72d297ff3bcd13b530829e8848f33065477a1fb2ffaa35d75bd9e34913d3551469aa814cab8cb76f2f04e721 SHA512 8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d
 DIST nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz 9604 BLAKE2B b93c9586688dd690668c9d57d533c3460b008cf357a202cc6dc315ab6d24cd3d796d8596024d193bdd9100fab52970b323f03dc16b4f72b3e551167bb46513b5 SHA512 988ea0731b7f98f804a715404fc8cb8a8956a6c6b795f0ce8570f800dac3319f222bac8f12ab6fde50bbec3d68926ed3b24516931f9aebe2a7ce0fcae0dc8e13
 DIST nvidia-texture-tools-2.1.2.tar.gz 45172897 BLAKE2B de1827ccf9900499e089e7f0ccdf2acab089afb2c4d8e41978c3cf653aca81f8d9136bdd0e4467e7f5534b44f7329883f1ca66508c289200b23dfdd1158a9fc6 SHA512 4285e1a348c6ab9abbc34a499879fe1c8ff6976da01d0397eb95e19ae7fb566f3efb57613d2cee31e6c694b497a28b050e377267e137a4d114d093d681824adb
-EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1509 BLAKE2B e225f9c2337221f96a95a991da54ea42d1c295b1e2514a34b7592d1b8186d044d637787a4957f19e3f0adedeafff0727f12bb4e50a558f8e6c6d66424c361f57 SHA512 571f32347ebca8009cff74ce1445cb6358e8613c19577b8824ab4da7a0ebf8f21ac526e202a95a13a6b653be1dfc86e55d8b1afdd35ad782c5be92c312d4b8d4
-EBUILD nvidia-texture-tools-2.1.2.ebuild 1124 BLAKE2B e4562a10601c49f9ef2d9a7332c027bca00049bfa03e12a7e744557d73ebd47bdac9b2f3569aa1ad96b59e6c77c00e48039780d440ef2a174e89e7b61d702865 SHA512 1717a44a98d3faed523f2727989dab39fa07554864ee5400c30e92030dab750c4182d68c167563d515c34b30120ff786cace46605e4dae15e38bef822a0ec0bf
+EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1516 BLAKE2B 6607ec0e9e4c15a8a93a6887baee944472b84e1f29f03363ed2e74c818e7e4bb05e81d131070ecb5f0ed641c3a9732e7a6f91ac108a9e4b3120c7c748e7a11ad SHA512 5d8a2726931cce582b80bca0ea0b9c8eb3a533a9dfbbd94737eeab32e2525a9048006355ee2b339466009f7ed66c7745809fbe4218d618b7c152486830489b99
+EBUILD nvidia-texture-tools-2.1.2.ebuild 1131 BLAKE2B f8b96a5ede3ab92038fe4f6abaf5db46881fd07a69c5f875270757b8822279b0cb7a24516dde831a7e814fff6903784a5387b8e40853ee5b8388f2271cd9e1b9 SHA512 e518aaa97a8b342da6e8cb36880b6e4f4829697984c069576a3badaa3f320fca372c5ed743ce8520edf5791ff23fe7552e008018a54265ad7fca2c0fca330732
 MISC metadata.xml 549 BLAKE2B ebd2ca9d85f2e8b5621275c7bfd554ff0f9c721c73f203f9e1d3ba76cd6428d78169586b3ec418f95e0632d083f747fdbb8a487532f668cd525b58561f133078 SHA512 5631940e5c4c18bbf6bfca1645fc46f736d867f38417106930437f09f6a12964f8c1a65d8a6baba2bc2f2e77964f025bd604f1a48c2db2f10a13e0e163ca4b60
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
index d0e927d8fc91..7ce85d72afbd 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 -riscv x86"
 IUSE="cg glew glut openexr"
 
 RDEPEND="
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
index 8a3d4922c2b2..803456bf123a 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/castano/nvidia-texture-tools/archive/${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 -riscv ~x86"
 IUSE="cpu_flags_x86_sse2 openmp"
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4eef0f776c9b..1a8ee994c6a4 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 7d842825371c..b48b431620a6 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -4,7 +4,7 @@ DIST harfbuzz-2.9.1.tar.gz 19154048 BLAKE2B e6cdc3936606e3d9a4bacf385db13c54f328
 DIST harfbuzz-3.0.0.tar.gz 20360786 BLAKE2B acc1e4d7d59908a23ae1015700cfbf1737cdb0b26ba811d752954356baffb2ab18c3d22b5964d200c4cc7e312a79655c3437aff9f5a85b72c472e324dc3257ba SHA512 69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5
 EBUILD harfbuzz-2.8.1.ebuild 2497 BLAKE2B 89bb2b0796c1a151efc58f43abb0c87df3829361be12e37d43652dae4c002efd29405c61e2e66350ac5ae8b75693f385ce4594d8e480d7a389a3311af4c41621 SHA512 8093198447adef9c164c8fb8d7f9a39a39bfd3ca43e2210a2d4edfe6e51716378c009f0aa5b64e5560f4f174021b8b525d9a3d2837aea53eba6059efd1cf336e
 EBUILD harfbuzz-2.8.2-r1.ebuild 2547 BLAKE2B 8c1cc61fda1ffbd7bb0c6bba79e7b0f2121b6a533a994536723f1ce6f58ed9cab2ef5c08f704a7cd66775e9f65e7f426fd3cb3c9ae8e01aeafc4ba8160ff2cd5 SHA512 7f6e6715df93de2ece043f2e651463241bb6095d5fc5e1e1b90a24647eafe94ffc845f0814ac52b59804e546140f8f3d929e1ea225e228cb1018c32cbe893ca4
-EBUILD harfbuzz-2.9.1.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
-EBUILD harfbuzz-3.0.0.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
+EBUILD harfbuzz-2.9.1.ebuild 2513 BLAKE2B ed6f714333a7f48d93bdfb6bb1bdf0638bd40ac8b53817e4c147dddc82e97e02c6d5907fe7ff0171cb1e6a3f5bb1e0e32900319813aafb6a9a7c957ef053c593 SHA512 f4065a49bef78aaad3d2ddd76bd0ba5ad9b076d82c49f375dda1d1d2e2b5fa9c5e1b1c6467a836872d0e37b73f5997a15528d9c607d981e5a1964975922e26cf
+EBUILD harfbuzz-3.0.0.ebuild 2513 BLAKE2B ed6f714333a7f48d93bdfb6bb1bdf0638bd40ac8b53817e4c147dddc82e97e02c6d5907fe7ff0171cb1e6a3f5bb1e0e32900319813aafb6a9a7c957ef053c593 SHA512 f4065a49bef78aaad3d2ddd76bd0ba5ad9b076d82c49f375dda1d1d2e2b5fa9c5e1b1c6467a836872d0e37b73f5997a15528d9c607d981e5a1964975922e26cf
 EBUILD harfbuzz-9999.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
index 6b8cea0dd156..27e92e9b2b49 100644
--- a/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild
index 6b8cea0dd156..27e92e9b2b49 100644
--- a/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index dfc09b7417f4..921b5f1ab189 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,3 +1,3 @@
 DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
-EBUILD libffado-2.4.4-r1.ebuild 2639 BLAKE2B 0d1265016b1e1cde78561155c347a4e82742a70050759121147d35e72f0eddd9b0eed124047047f712acae4f81d0a5dcb0c8aa248389a6b73f45f9b24a70d91c SHA512 fbf65b5061e9d790fd20363f991ff0b70e9c672e9049609fba5ec8400f9accf007824263f0879021c962de5644d1dcaf40abfdaa243b52a58d462fa27d9dafbe
+EBUILD libffado-2.4.4-r1.ebuild 2749 BLAKE2B 95fdbd0c43c4c9d396d3be9c9b00036b249ec3d1d78d89844203721f00a027416e5d72454c41d6d78a671f7afc84ee3b57eec6609bc00182051c6e6562d8ee08 SHA512 04a62a67a23f1b6b58c9af9a212f705b62a61bbc6ee829d06f562bf852a1b078310b1741698a46b3b2b0df839da74206d8e3554b5d6ce43a42cb08ab34ea88a7
 MISC metadata.xml 597 BLAKE2B 4fc750b04079094c4251e60cc4067847ba015a9bef54c83ac9ecc2b53a24048279df06711b5fa1482e379e25a7cce7aed491a67129469bca46ee747a30f7427d SHA512 9f0823e3554c7602b27d39d565af89079e6a5260f19f6850bf3f2f228a4cd6e40a27f94c1a85e6aed0226918beb6dcefdd85b830fbbe438bdcb899dccd51e4f8
diff --git a/media-libs/libffado/libffado-2.4.4-r1.ebuild b/media-libs/libffado/libffado-2.4.4-r1.ebuild
index 1945430cb85d..b9daf2d2a40b 100644
--- a/media-libs/libffado/libffado-2.4.4-r1.ebuild
+++ b/media-libs/libffado/libffado-2.4.4-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = "9999" ]]; then
 	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
 else
 	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-3"
@@ -79,6 +79,9 @@ myescons() {
 src_prepare() {
 	default
 
+	# Bug #808853
+	cp "${BROOT}"/usr/share/gnuconfig/config.guess admin/ || die "Failed to update config.guess"
+
 	# Always use Qt5
 	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
 
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 6228d1e032be..7cb371975ecc 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,4 @@
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
-EBUILD libheif-1.12.0.ebuild 1835 BLAKE2B c21969387578f87523a38ff435138b3cd08e8fdf4c882b68fb828866201bbe187b773c2d320c82566587be7646d220fcd7aad24768584fdfa9742ebbd750fcd0 SHA512 5f188ca76492d5b6288b0daf0c43093cff79adfb26e86d2439725ce0f99e7afcf49b6085231e020eefe1b68604d3292543937a60d1522fb5553d90484fecc9f7
-EBUILD libheif-9999.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7
-MISC metadata.xml 888 BLAKE2B de7d9a5aa166d517b8b15b36ba3dc465cb438b162e9c8807df8bd5a901d18e492ae78fa5232868b95f66b6a47f52ce9a93d0d14bfa4a614daf0b1bbbcdac93d8 SHA512 e5f46f35e8e30c38318e074e5492e08dd6e17d1c7627bedd6d7962410dfb6025141f8e2e5c45b66d2f1e64a93ee6b41bc020ab7ca5e6cbacff80d33a00c222c3
+EBUILD libheif-1.12.0-r1.ebuild 1798 BLAKE2B 737d57dde4f9a3a0566c0a91b1d6ec0c167dc6bb59c16b3acb9ffa28135eac395328b41418381ac2e22999852d1182580845d2227b9fa8e2c0e13bd4eff42e63 SHA512 112f937a560ef0e3dd666c7e4c7e0e973738fd31942cfd52e3c5f27b1e4aa4c3305e4a0d9ee66d6a24f3a02d47a895f511684688fdbed88ad709ff1be783309a
+EBUILD libheif-9999.ebuild 1803 BLAKE2B 28cd644e40633597b07806b39f19cfdc8251132f99d5687337f68e4cbfadf578f4cee9aa198888a610c1df515e9824ada89b36a326cc6211ea30a704fb7fa7f3 SHA512 8e5af8dd952faf2bd431631ffae82faeb7adfa4cdd369741a1f031cbb12676dbead9157fbaeb16bc365da4034ab82deac627e9cfd4bbfd2e9b098a996d8ebd8a
+MISC metadata.xml 805 BLAKE2B 99457c3561cc5ad915c5503f96e52b6261981157de467073ac7a8ece68af3798b9db516b40b7db9e0bd92388b083898926d877fb3bbc8fd1701b280bfd4baa09 SHA512 e5461f86bd18b9878a0e4857fc25ad7554e4095b8b71b2a8de2334b49b7d6c62ccbc2d6bc31e016e65ba3c8bd3a872b5f00b2c2bf39e1d04306124bfedb8486f
diff --git a/media-libs/libheif/libheif-1.12.0.ebuild b/media-libs/libheif/libheif-1.12.0-r1.ebuild
similarity index 90%
rename from media-libs/libheif/libheif-1.12.0.ebuild
rename to media-libs/libheif/libheif-1.12.0-r1.ebuild
index 6dc4980f1f24..f90f0e7b6ccb 100644
--- a/media-libs/libheif/libheif-1.12.0.ebuild
+++ b/media-libs/libheif/libheif-1.12.0-r1.ebuild
@@ -18,20 +18,20 @@ HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
 SLOT="0/1.12"
-IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
-REQUIRED_USE="test? ( go libde265 )"
+IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
+REQUIRED_USE="test? ( go )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
 DEPEND="
 	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/jpeg:0=[${MULTILIB_USEDEP}]
 	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	go? ( dev-lang/go )
-	libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e:= )
 	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
@@ -50,10 +50,10 @@ src_prepare() {
 multilib_src_configure() {
 	export GO111MODULE=auto
 	local econf_args=(
+		--enable-libde265
 		--disable-static
 		$(multilib_is_native_abi && use go || echo --disable-go)
 		$(use_enable aom)
-		$(use_enable libde265)
 		$(use_enable gdk-pixbuf)
 		$(use_enable rav1e)
 		$(use_enable threads multithreading)
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index 05d7c5f68ed0..a1837ad0964d 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -18,20 +18,20 @@ HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
 SLOT="0/1.12"
-IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
-REQUIRED_USE="test? ( go libde265 )"
+IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
+REQUIRED_USE="test? ( go )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
 DEPEND="
 	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/jpeg:0=[${MULTILIB_USEDEP}]
 	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	go? ( dev-lang/go )
-	libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e:= )
 	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
@@ -50,10 +50,10 @@ src_prepare() {
 multilib_src_configure() {
 	export GO111MODULE=auto
 	local econf_args=(
+		--enable-libde265
 		--disable-static
 		$(multilib_is_native_abi && use go || echo --disable-go)
 		$(use_enable aom)
-		$(use_enable libde265)
 		$(use_enable gdk-pixbuf)
 		$(use_enable rav1e)
 		$(use_enable threads multithreading)
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index c8f0f34e8094..2d2f28772dda 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -9,7 +9,6 @@
 	<flag name="aom">Use <pkg>media-libs/libaom</pkg> for AVIF encoding/decoding</flag>
 	<flag name="gdk-pixbuf">Enable <pkg>x11-libs/gdk-pixbuf</pkg> plugin</flag>
 	<flag name="go">Enable building <pkg>dev-lang/go</pkg> code/examples</flag>
-	<flag name="libde265">Use <pkg>media-libs/libde265</pkg> for HEIF decoding</flag>
 	<flag name="rav1e">Use <pkg>media-video/rav1e</pkg> for AVIF encoding</flag>
 	<flag name="x265">Use <pkg> media-libs/x265</pkg> for HEIF encoding</flag>
 	</use>
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index d8e145f6534e..47779cb25f81 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/flmsg/Manifest b/media-radio/flmsg/Manifest
index 23bb138a0026..7ca43d7065f6 100644
--- a/media-radio/flmsg/Manifest
+++ b/media-radio/flmsg/Manifest
@@ -1,5 +1,4 @@
 DIST flmsg-4.0.17-patches.tbz2 36036 BLAKE2B ff8bc30b1aca1694af6d736be8428d7f1e7efb848a574050daa2da1db257a23ed29fb0f696e84b23df81410c5b6130d67a3081f18580c6a936cf055040ed9841 SHA512 42fe8c595d0b12d16dde36a6d865136a7bfa59a02cc2d9dd229000752eb401778e85b39d2acb936a3c26c4ef6555367d9f975f2770511040eb892087e704c71b
 DIST flmsg-4.0.17.tar.gz 876560 BLAKE2B 553a8b71c490abdff99e2b3dbd51ba14cf6f97bbe8aed289c7efcfcdd84abfb9039a75639a377a6ff558566e8226be00643988bbc731c111fa52733810d284f5 SHA512 94abe4927c5bc8a5358d592cef55fbaba6207250798d45f8096ff1f290926a280b53db99ddf1c72a6ff30cbc58d95f639777e0d30a15b70ba8d3209664e22966
 EBUILD flmsg-4.0.17-r1.ebuild 701 BLAKE2B 30fddc542169138b25cfb96f323923173eb5a546f4e825c0f9cca28a4765dd6a26b3889f278771f8472e320cbe3177023b019d61d09fe501613990e8b7fddf40 SHA512 29e2ff3343ad348451a854442edddea1ca02b1bc4889e5b9ac6ebaf4c56fe460d8e65240dbae38c30ebae92b8fb66267cdad49e19d53524d3d42320ac4d08a6d
-EBUILD flmsg-4.0.17.ebuild 456 BLAKE2B 8159729a363ef0715bf884c7f7a236aa6249e78a20b63f6b47a9afcea4e3585e8d68fbc5ea3f537e6aac5414be478095780dea955fe1509b32370bde3d3de316 SHA512 40d07dbd48554a367bfcee10e7c2735161640ca74a64f5f28a69a2ab9d7a4bd432b8003e428f71a975558358647563eb00ad57daca3b79140f6a9843ffbf6598
 MISC metadata.xml 391 BLAKE2B f3f074665f35891a5e0718da6e69cafeaae7ca3dba9d972014691d204be3b63c72d8fe0a2e71be31ee7f655942f7d04114df8413d9b648e56ee5376d605ed535 SHA512 ce962cdf53ab62807957f76d8a8db60e640252be66961ad6d897f3c482fd2658c6e5263b0ad503ebe22084d3736ff5ba4977d8538049db0f5e6b351614d24721
diff --git a/media-radio/flmsg/flmsg-4.0.17.ebuild b/media-radio/flmsg/flmsg-4.0.17.ebuild
deleted file mode 100644
index 5a5f5ba918ba..000000000000
--- a/media-radio/flmsg/flmsg-4.0.17.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fldigi helper for creating radiograms"
-HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-radio/fldigi
-		 x11-libs/fltk:=
-		 x11-libs/libX11:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog INSTALL README )
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 3b3175c1ce10..2e9aa2632ddd 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 68e4bdada3f6..bf985daf3e91 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -6,5 +6,5 @@ DIST easyeffects-6.1.1.tar.gz 1923899 BLAKE2B 7732fd11bc074946e7b3d286f92626c1cd
 EBUILD easyeffects-5.0.4-r1.ebuild 2272 BLAKE2B 9a0d0a24d713e2effca773730c0b7e7afaf83e4561b5bc83ca1459cada358e039e7b8fe7ded4c6dd6ec8f30ca8ea12d33fc65822b5ae2d812f320e71c2634a10 SHA512 b51edb7406290d1389ab8f98efa47c0739564ea8aee982acc27a4f544b5fd35211220b7361b7697b2d4f1b63e1d6e645016a4050c2ea482673e986dd314a31d0
 EBUILD easyeffects-6.0.3-r1.ebuild 1855 BLAKE2B 8a8f589feb8ad0bce561cd0cbb3f5ca083f0f37eddaf897b216aeda605eeb3e33c2b20428fe21864391da33720ddda0f8d26ba1faeb18f30ae5a20fb66ffc150 SHA512 8cd9c763ea0978c4a6f07594b41043f1256eff9c7e37f24cb13b180e6cb1baa3830912eb88ab8f6588462ea5e77c49ab0f97a1f33fb8203aecb47c45ed95e721
 EBUILD easyeffects-6.1.0.ebuild 1995 BLAKE2B 5e9b574dcf1121d5497af2feeb2e8c30e0eab2c003b09bcf87c14edd75be3135fdac40e7f10857fe45a459305a2596224f2cf106acdcff0bdf5efefca1035622 SHA512 7571ee5331c5a547cfa6385ad00e2f4c66be4c0ec5108ac543c471535b02647d60c2431b69645a85f8556579bf28a33816e6e8c0bc49d61e4207b8c47c7eaec1
-EBUILD easyeffects-6.1.1.ebuild 1994 BLAKE2B 3f7cb53851b98281fd2aff195765d58a98e3951c67b9720041fbbe0681f30fc6ed0c13354b261f21465ff7309dc32da16b30516268f55e13da871fc565000a19 SHA512 a3f5b5afff071f4485348740c4fe8881f0e58c15df07a63415ead4e3394fff3a5c157392ae951e5c160aa6bb51190562861c5ea2d41cfcdc33f6d7e6b1937dc1
-MISC metadata.xml 1196 BLAKE2B ab1e81e59538ba3c149e0cbb972bfe34d3a8ac9da97a1b22bc078736c51dcab4fdee207fe2ca160485dd493f8e8d3ba088fd7580e08f5556c638e1c4ebed0ebc SHA512 bac5474251636d22f9f41dd0411d1744c120a4cf10e69a6807e3ab2d0c8de1a9fa4b726e1bd762d730d774545523e1bf98d01325e56dc980cad2f6e1e28c7cb3
+EBUILD easyeffects-6.1.1.ebuild 2008 BLAKE2B 9828e0f5a814090892a0a423593b324124deb6b7a8d083a77f8ebaacc98405858d745b0bc0b91a5f326629db4f0bc7887a91f4cfa66cd2839ab93741ede04bc4 SHA512 b1a46a3ab371076ffaca4471548d8b4c8eb7a3c8aff408ff9e89051069a15cdbc79234b3faacfd890f46366cc03a03f970bd0b9051a1f4a1aeb2009de795fd6e
+MISC metadata.xml 1285 BLAKE2B 2f08a86e1d8dc764ab015461101f7983cbad6c4856239ba2dcf332e23f3cbdeecb9e93bd464315b86125b708e8dba80008f1536dc4cc8fe240137e3cfdf461e5 SHA512 6bd4a58517ba2124ec04cb7dcbc36fc8f029729041abe623e1e4de8671439bba2471bb6d03febd780b820a2bd9b37384dc3c289c87f6eaa39d2005b544f16cf6
diff --git a/media-sound/easyeffects/easyeffects-6.1.1.ebuild b/media-sound/easyeffects/easyeffects-6.1.1.ebuild
index d34f6ddccbfc..88d5ad9d6625 100644
--- a/media-sound/easyeffects/easyeffects-6.1.1.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.1.1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="calf mda-lv2 zamaudio"
+IUSE="calf +doc mda-lv2 zamaudio"
 
 # Tests fail since 6.1.0 due to upstream changes to the metainfo file.
 # TODO: check this every release.
@@ -42,10 +42,10 @@ DEPEND=">=dev-cpp/glibmm-2.68:2.68
 	sci-libs/fftw:3.0
 	>=gui-libs/gtk-4.2.1:4"
 RDEPEND="${DEPEND}
-	gnome-extra/yelp
 	>=media-libs/lsp-plugins-1.1.24[lv2]
 	sys-apps/dbus
 	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
 	mda-lv2? ( media-plugins/mda-lv2 )
 	zamaudio? ( media-plugins/zam-plugins )"
 # Only header files are used from libsamplerate so put it here rather than DEPEND
diff --git a/media-sound/easyeffects/metadata.xml b/media-sound/easyeffects/metadata.xml
index 2b6bcdf5e3f2..baeb462dbb21 100644
--- a/media-sound/easyeffects/metadata.xml
+++ b/media-sound/easyeffects/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="bs2b">Enable use of <pkg>media-libs/libbs2b</pkg> for the crossfeed FX</flag>
 		<flag name="calf">Enable use of <pkg>media-plugins/calf</pkg> for adding various FX</flag>
+		<flag name="doc">Install packages needed to display built-in user documentation</flag>
 		<flag name="mda-lv2">Enable use of <pkg>media-plugins/mda-lv2</pkg> for the loudness FX</flag>
 		<flag name="rnnoise">Enable use of <pkg>media-libs/rnnoise</pkg> for the neural network-based
 			noise-reduction FX</flag>
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index b25447d65797..7d20fe6cc72d 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,4 +1,4 @@
 AUX pulseeffects-4.8.5-meson_no_automagic.patch 1529 BLAKE2B d3ac44aed8a08ab62b932032b3c25e7e0019fbdc2c70e33114d4cca787e3f441ffe2bdc0c3c8c65a5f5a79b396c965b3f2c2fc4f1a9c392c1dc347c53f6460fa SHA512 508856da931ffeeab631ac684ba918e113144b345d95670bf0ac7c3cb1a4033745f2dfbfbf2cbb02a26a61c21146d74b0cbf22951386b3fc574f314d6318ae69
 DIST pulseeffects-4.8.5.tar.gz 2028531 BLAKE2B 0ba68c90d4eb25e3b22c4f39f989bef428c970f0dcfa0b301c500928f835d76c31cd1d7692d1a853b3121d4e8fbee8102c1f538b06cb15933509719a6da5d8a0 SHA512 b72f4d5356af1308d997f01ac2efc5eefb569e9a1253f0a19918aec5f9c2d386ab5c293a5aa6a28e8d15200289f32d34c8f3d524bc50874c750afdee61bc0820
-EBUILD pulseeffects-4.8.5-r1.ebuild 2222 BLAKE2B 96e6a9145485a868f6d33d7db84ac1064f59312b32e72386b44e59616cf5bc2c70a1676c94ee9759d5c3804c4c29c930c5749a63134f704e6338b5b5f71d59ff SHA512 7876d3d1046cd485378498351c2e7affb4b12d2247ef1e5a97f0eaabc1677403d3439f7a9f116041e62e0788ec6f0303136527a4e268108aab0fb3f3cfda330d
-MISC metadata.xml 1264 BLAKE2B 994cf064545bc487bca37a844d641c2ff33ff3a4a065610cc775083fb95ee8e17c20768c6ed8afe100088471d5c3ee6027b8f7d5fd3e9ce75e01516fa8ae5311 SHA512 74fb6d0b04f8062d738c9776d079ff1e4a3b0890dc0e3ba278c07747cc81535188ae2b178374cfc516d0b71755f7963734c1784251742b5f320021ccb274aa5d
+EBUILD pulseeffects-4.8.5-r1.ebuild 2236 BLAKE2B 1dc26ed814192ccc3af475a41b5bce38b5659b895983071cd6a4a3be9f3ba5d864c7f9b7e9721e6f42b8776a4697af024ddc3d394fd0995fff284a457f0ab2be SHA512 484d0995b1f56ea5df785612a2ddbce2e6d6473995228838ff1fa54126dd14453cfcff3621e8dde3cba59cd9d5cf8bbb3a3596c4b2e7b4859e6af7a2e72bc219
+MISC metadata.xml 1353 BLAKE2B 8a3ab829edb36bf0f711057096176b15fad113820ec9910d5791c20cf9bc2802396264c43550a8a46b1f8318357b4d4e6a99c264d7b0b89aadc201b8f5098dee SHA512 bab593219b241f0903415945c110bdbe08197618d648785bbe0a7ed5c8a53618e16d60f82e5456ccd4236762384ae571bfc484bbb2f6aac8c99bd9d339f30e65
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index a28210d17cf4..9e2ce750f76e 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="bs2b">Enable use of <pkg>media-libs/libbs2b</pkg> for the crossfeed FX</flag>
 		<flag name="calf">Enable use of <pkg>media-plugins/calf</pkg> for adding various FX</flag>
+		<flag name="doc">Install packages needed to display built-in user documentation</flag>
 		<flag name="rnnoise">Enable use of <pkg>media-libs/rnnoise</pkg> for the neural network-based
 			noise-reduction FX</flag>
 		<flag name="rubberband">Enable use of <pkg>media-libs/rubberband</pkg> for the pitch-shifting FX</flag>
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
index 5a542f3586a9..9ca5a1a00987 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="bs2b calf rnnoise rubberband webrtc zamaudio"
+IUSE="bs2b calf +doc rnnoise rubberband webrtc zamaudio"
 
 DEPEND=">=dev-libs/boost-1.72:=
 	>=dev-cpp/glibmm-2.56.0:2
@@ -39,7 +39,6 @@ DEPEND=">=dev-libs/boost-1.72:=
 	rnnoise? ( media-libs/rnnoise )"
 RDEPEND="!media-sound/easyeffects
 	${DEPEND}
-	gnome-extra/yelp
 	>=media-libs/gst-plugins-good-1.12.5:1.0
 	>=media-libs/lsp-plugins-1.1.24[lv2]
 	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
@@ -47,6 +46,7 @@ RDEPEND="!media-sound/easyeffects
 	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
 	sys-apps/dbus
 	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
 	rubberband? ( media-libs/rubberband[ladspa] )
 	webrtc? ( media-plugins/gst-plugins-webrtc )
 	zamaudio? ( media-plugins/zam-plugins )"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 8633ad0cd4e0..e8f361f7c6af 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index 056bf51e0aea..acc8a1025c9a 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,4 +1,6 @@
 AUX subtitleeditor-0.52.1-disable-nls-fix.patch 1080 BLAKE2B fe400d4c2a16508e2889539ca963839f1118b1df916c9cb6c3b2e8d575aa40fa61e32eeb2612406c51ef5f3d56296a42b0980919a14e1f0290ccea3cf4821c94 SHA512 7775e9527a5e1b7f2a469eb3ea5f3d5422797c4ca61f02b486578f60e5a118ab1d6479079cae35ed29324a1579ed3363ed77b18ceda1dad5b10f8def1a11b650
 DIST subtitleeditor-0.54.0.tar.gz 1783077 BLAKE2B a802124c9b81ad5fecc4914b6231e7efaf3326f231115f334fd53b79d8a851bf2f09fdccdee85c53b0cc828fe67c72e9924f47f0881d0438e563b18b1f77f00b SHA512 4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c
+DIST subtitleeditor_0.54.0-5.debian.tar.xz 9100 BLAKE2B 249048228aab601524bb1f6e222863d1d3f96e3be4a05e08196a164d0e4ed3ff4b662fbac5a468a546f871e314a99f68ed9132692a5be8997d8338810ab91808 SHA512 9e15c0f6d4ddc88650f6f7962b09175fddbae1c1ac295a83c33e29e1212f09a1d88711a4e1250c5f125d72ea02f4b77c3ca9f62594ee0010f0cf8d383fbe0832
 EBUILD subtitleeditor-0.54.0-r1.ebuild 1372 BLAKE2B 4a99b55ac6c225eb8e68fce93582d54da3668219ae7fb6c3d069e67f534e064bee29c36c7333769e30346df9e9c46cacd1e98a2cfa9b7573878da4d7e146859e SHA512 2a3e552a168960397346d3f511d2845f78f824952aa2ffbfac62a252746886e120dc428c11fb6e89e1bd6e2a6097226eba17a7a376d2eed575a1a79c799892dc
+EBUILD subtitleeditor-0.54.0_p5.ebuild 1742 BLAKE2B b97d8fc74bf51e2f781170c5b35f537e8cd08f5f1c37c737b2d1f2dad52084d57fefca21b88d533c705514e00062fb704b2e12a72cb75a965ac259afb332ed5d SHA512 95d33c0e2211623fe5005c2eddfd697ff3e48678a3df5b667206e58c640de71162418d0a0e2135f6179c97b01b9d19d241a3ce3013e8aebe6a7d2e9a4cc937f1
 MISC metadata.xml 566 BLAKE2B b09b71c48220f14cd4011d478827db5be88f445816a0ce948b63351ff3de904c2fe477cc876ba2fba82f366a6e78d25c94fb220e4603a964fa4d0116fe9ca612 SHA512 846fae1386c767aaa2f9521ebc93a7cd91c4df52ffdf6d973552ddcc9d89b0591d9ee6c2a406fd1a0d3207fa393c783cd024c4c66847354b865dbb0977469cea
diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
new file mode 100644
index 000000000000..5929fb7bc8c0
--- /dev/null
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="GTK+3 subtitle editing tool"
+HOMEPAGE="https://kitone.github.io/subtitleeditor"
+SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls"
+# opengl would mix gtk+:2 and :3 which is not possible
+
+RDEPEND="
+	>=app-text/enchant-2.2.0:2
+	app-text/iso-codes
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-cpp/gtkmm-3.18:3.0
+	>=dev-cpp/gstreamermm-1.0:1.0=
+	>=dev-cpp/libxmlpp-2.40:2.6
+	dev-libs/glib:2
+	>=dev-libs/libsigc++-2.6:2
+	media-libs/gst-plugins-base:1.0[X,pango]
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-plugins/gst-plugins-meta:1.0
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )
+"
+#	opengl? (
+#		>=dev-cpp/gtkglextmm-1.2.0-r2:1.0
+#		virtual/opengl )
+# X needed for video output and pango needed for text overlay
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_p*}"
+
+PATCHES=(
+	# https://github.com/kitone/subtitleeditor/issues/49
+	"${FILESDIR}"/${PN}-0.52.1-disable-nls-fix.patch
+)
+
+src_prepare() {
+	# Debian patches
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
+	use debug && append-cxxflags -DDEBUG
+
+	gnome2_src_configure \
+		--disable-debug \
+		--disable-gl \
+		$(use_enable nls)
+#		$(use_enable opengl gl)
+}
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 8de4acbb065d..b1606a2fccdc 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -18,20 +18,13 @@ AUX vdr-2.4_remove_plugins.patch 876 BLAKE2B 27f36cd30e11ec85f8c91d0b4da77d2a6a9
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
 DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175 SHA512 d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
-DIST vdr-2.4-patch-for-permashift.diff 20424 BLAKE2B 426139bd890e50e491d0061111445d988468441c6bf2f489d35b2b0e290c064ac87e8989cdd9a05e2befd0488300a0d4faa017ab9901152003c6b0f066cce5de SHA512 f21bd6d7b883354c254e1c92d730449dad6eac8ebdd2a593c907a962c2bf3a74859d66e1418984da5b62892d7b7d170282956f15af11d7a788bc759506454ba8
 DIST vdr-2.4-patch-for-permashift.diff.bz2 5298 BLAKE2B ebd00ba1c66783f97f5a6cc757cc9be6d937bd460f46b1880eec8b86ead1a5673a25ab64b733b8030e1c9a94123af28a5d6383905da265c67b2a945ba2c06c33 SHA512 3ba1968d2710061627e2a3b320e24ffeb08be6d8a7e71ed0c6732ebe6ed02d25f3a8afff524a6185ad0025d187ed9c7b259a9fb63dcf0c91e3fd2a079b5ef9d3
-DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B d5c3da713cd82ed8c3baccd1336d283404ebf1099116e76776c26a41ac193aa88bcb5bc2aaa8409a6d40e61c122bbc8ac0d67cb6ff8f83b0dbaea392101643b9 SHA512 99f2cab268d3f6af11607333a35583e5802f90636712e0429eb89eb66ccea7b1fb16a0d3ed2ff266e6f87c338bf77f97028a372eef5e6116b27220a5670a6d31
-DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3 SHA512 b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d
 DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f SHA512 9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
-DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 339bb23ed0f505087bdbbefb192824d5def37bb00c4d5dc300f545c7951f11504115d058c157d1964f5f32e483e668675e13254465b5acce76cfdcf07faae216 SHA512 f402fa51314ad6c34439f71b7cb81e1ca51e0fa3b120a1fdaee119c2dd1b13174db2e666bf5e6204aa28e4acef8f6bd6e3ab8324793c3484eafb16dc8cf808d5
-DIST vdr-2.4.6.tar.bz2 951272 BLAKE2B 52e92eb7e5fdc9bb9209cbef61f8db47e2e9a4750c75bc5b4f88069f95e54faac6b1af5b4c77a6a53990d8f083b6ff8ddeb33418386081c128617217129374fd SHA512 bed8b7740a97b681cf4273c01b6ce80046c1e5914c06d12cffc46fdca615331d0e97771ec09697cf72897583fcf272d83b6bf188ef476715cd0c0c5fd4c5e9d4
 DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f SHA512 d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
 DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882 SHA512 14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
 DIST vdr-2.4.7.tbz2 919632 BLAKE2B be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab SHA512 41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
 EBUILD vdr-2.2.0-r6.ebuild 8168 BLAKE2B 4965d23936592348a37cdba6c6b89e0f651780b32436e113d94a79f1ba1b5d581a259d47160e499e28b5380a932e778b4d9a4c4a0cf675525031d19dd24e6110 SHA512 f47051d63715a36276ced33653928adc5d3378d3b3a28da3f6e68896c9d796b4887eaa78d76e9c6e8b42f65af1ebbd3019b56d8a1e912dddfe0c3e31d7212502
 EBUILD vdr-2.2.0-r7.ebuild 8210 BLAKE2B 004d8448d54dfe58ca1e83d6e1cfd9b84a22e8b0bb837900eba90666d55d4aae91e2e2d55095ab68665af104f52010b10268f5f730f451cedb54570d0271f8e9 SHA512 ca05beee04a50a8af95e4a990050c3430ac5a5829d4162e9c35f29bfd14deff2aa70e6ce6fcee10ceb506c48eca6a5bc15c418894e6d23ad5fb9d58da594e638
-EBUILD vdr-2.4.1-r3.ebuild 6090 BLAKE2B 5fa4d91be87dbd1edd93eced6f6f2c8916777fe8ded5472e15b0ec9ef19f817646eb82261965b7a2757887821e1282c7513c4aa06ca67f7825009a8f7f664368 SHA512 5b38708119e60fd4d87c8640952b16532c2df18b8541c64395e4c953ecf553631e85539b21c458f83eb4511be243d25486ebb21e85ad1fee6e153c12e3d687f8
-EBUILD vdr-2.4.6-r1.ebuild 5997 BLAKE2B 503afbd4a766bd4b050f05e74fe9ee9cef98718077eae7b34478e413d93ecdd97721813d6551ea4367a9c8eea9776bbfacd627ae110349fa7b1d4e7688d6ff9d SHA512 eaf2e9d0e2dd6c67b44d124261737fd4ba4ffcfe33550e951c93fae350b443556fc47ff5ddd343aeeda83fe890ea5f12a1eb6987505dd3af028929637c63f09f
 EBUILD vdr-2.4.7-r1.ebuild 6169 BLAKE2B 006d0156bebd83ad5200e0f6587e3252d85fc0818203915c5af3d27e0f3e0b5f99cf272f11f855a344535be6dc4cc8a121a424369fda6bf5cb941a295e48642d SHA512 702c24d7dfda3d4664432ae93b5bfcc063093fb9e5fca2b2f8fd26f1daf8283a9a1dde0028d6a23ba97acf4a5cb3576c4234d7461e9e17c379bdcc8bdb5f4192
 MISC metadata.xml 1893 BLAKE2B 6be07ef9608162ddbaf4da4fd6ca7f7e919fd9b54e4817575ff9fdbb56c084554c4126f26e4459bc8b51dd02b35030c0cd1b2afd7ba38e2bf46a0e065994ac0b SHA512 631a40da1627a71e3290ee527b3aeeb2babdc6abc650b21a7038a1ad9bcdd8d053c62c769fd1d04332d4564d41ff8988ea7bd79a21bef5583a26ed40cea59260
diff --git a/media-video/vdr/vdr-2.4.1-r3.ebuild b/media-video/vdr/vdr-2.4.1-r3.ebuild
deleted file mode 100644
index 98642f9c6fd9..000000000000
--- a/media-video/vdr/vdr-2.4.1-r3.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic strip-linguas toolchain-funcs
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
-	mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_mainmenuhook-1.0.1.patch.bz2 )
-	menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
-	naludump? ( http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
-	pinplugin? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
-	ttxtsubs? ( http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.0-ttxtsubs.patch.bz2 )
-	permashift? ( https://raw.githubusercontent.com/eikesauer/Permashift/master/vdr-2.4-patch-for-permashift.diff )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump pinplugin permashift systemd ttxtsubs verbose"
-
-COMMON_DEPEND="
-	virtual/jpeg:*
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	media-tv/gentoo-vdr-scripts
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )
-	systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE="pinplugin? ( !mainmenuhooks )
-	permashift? ( !naludump !pinplugin )"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	# use the corrected DIR /var/lib/vdr/* for acct/{user,group) handling
-	if has_version ">=media-tv/gentoo-vdr-scripts-3.0_rc1"; then
-		VIDEO_DIR="/var/lib/vdr/video"
-	else
-		VIDEO_DIR="/var/vdr/video"
-	fi
-
-	tc-export CC CXX AR
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_configure() {
-	# support languages, written from right to left
-	export "BIDI=$(usex bidi 1 0)"
-	# systemd notification support
-	export "SDNOTIFY=$(usex systemd 1 0)"
-	# with/without keyboard
-	export "USE_KBD=$(usex keyboard 1 0)"
-	# detailed compile output for debug
-	export "VERBOSE=$(usex verbose 1 0)"
-}
-
-src_prepare() {
-	# apply maintenance-patches
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT || die "cannot write to Make.config"
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		ARGSDIR			= \$(CONFDIR)/conf.d
-		VIDEODIR		= ${VIDEO_DIR}
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-
-	EOT
-	eend 0
-
-	eapply "${FILESDIR}/${P}_gentoo.patch"
-	eapply "${FILESDIR}/vdr-2.2.0-jpeg-9c.patch"
-	use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
-	eapply "${FILESDIR}/${P}_makefile-variables.patch"
-	eapply "${FILESDIR}/${P}_glibc-2.31.patch"
-
-	use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"
-	use permashift && eapply "${DISTDIR}/${PN}-2.4-patch-for-permashift.diff"
-	use pinplugin && eapply "${WORKDIR}/${P}_pinplugin.patch"
-	use ttxtsubs && eapply "${WORKDIR}/${PN}-2.4.0-ttxtsubs.patch"
-	use ttxtsubs && eapply "${FILESDIR}/${P}_ttxtsubs_segfault.patch"
-	use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
-	use mainmenuhooks && eapply "${WORKDIR}/${P}_mainmenuhook-1.0.1.patch"
-
-	add_cap CAP_UTF8 \
-		CAP_IRCTRL_RUNTIME_PARAM \
-		CAP_VFAT_RUNTIME_PARAM \
-		CAP_CHUID \
-		CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}" || die "cannot write to CAP_FILE"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-
-	default
-}
-
-src_install() {
-	# trick the makefile to not create a VIDEODIR by supplying it with an
-	# existing directory
-	emake VIDEODIR="/" DESTDIR="${ED}" install
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	# backup for plugins they don't be able to create this dir
-	keepdir "${CONF_DIR}/plugins"
-
-	if use html; then
-		local HTML_DOCS=( *.html )
-	fi
-	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS UPDATE-2* )
-	einstalldocs
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	fowners vdr:vdr "${CONF_DIR}" -R
-}
-
-pkg_postinst() {
-	elog "Please read the /usr/share/doc/${PF}/UPDATE-2.4"
-	elog "for major changes in this version\n"
-
-	elog "It is a good idea to run vdrplugin-rebuild now.\n"
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup\n"
-
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.4.6-r1.ebuild b/media-video/vdr/vdr-2.4.6-r1.ebuild
deleted file mode 100644
index 5c62f03f569c..000000000000
--- a/media-video/vdr/vdr-2.4.6-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic strip-linguas toolchain-funcs
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
-	mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${PN}-2.4.1/${PN}-2.4.1_mainmenuhook-1.0.1.patch.bz2 )
-	menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
-	naludump? ( http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
-	pinplugin? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
-	ttxtsubs? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_ttxtsubs_v2.patch.bz2 )
-	permashift? ( http://vdr.websitec.de/download/${PN}/${P}/vdr-2.4-patch-for-permashift.diff.bz2 )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose"
-
-COMMON_DEPEND="
-	virtual/jpeg:*
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	media-tv/gentoo-vdr-scripts
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )
-	systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE="pinplugin? ( !mainmenuhooks )
-	permashift? ( !naludump !pinplugin )"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	# use the corrected DIR /var/lib/vdr/* for acct/{user,group) handling
-	if has_version ">=media-tv/gentoo-vdr-scripts-3.0_rc1"; then
-		VIDEO_DIR="/var/lib/vdr/video"
-	else
-		VIDEO_DIR="/var/vdr/video"
-	fi
-
-	tc-export CC CXX AR
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_configure() {
-	# support languages, written from right to left
-	export "BIDI=$(usex bidi 1 0)"
-	# systemd notification support
-	export "SDNOTIFY=$(usex systemd 1 0)"
-	# with/without keyboard
-	export "USE_KBD=$(usex keyboard 1 0)"
-	# detailed compile output for debug
-	export "VERBOSE=$(usex verbose 1 0)"
-}
-
-src_prepare() {
-	# apply maintenance-patches
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT || die "cannot write to Make.config"
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		ARGSDIR			= \$(CONFDIR)/conf.d
-		VIDEODIR		= ${VIDEO_DIR}
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-
-	EOT
-	eend 0
-
-	eapply "${FILESDIR}/${P}_gentoo.patch"
-	use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
-	eapply "${FILESDIR}/${P}_makefile-variables.patch"
-
-	# fix clang/LLVM compile
-	eapply "${FILESDIR}/${P}_clang.patch"
-
-	use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"
-	use permashift && eapply "${WORKDIR}/${PN}-2.4-patch-for-permashift.diff"
-	use pinplugin && eapply "${WORKDIR}/${P}_pinplugin.patch"
-	use ttxtsubs && eapply "${WORKDIR}/${P}_ttxtsubs_v2.patch"
-	use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
-	use mainmenuhooks && eapply "${WORKDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch"
-
-	add_cap CAP_UTF8 \
-		CAP_IRCTRL_RUNTIME_PARAM \
-		CAP_VFAT_RUNTIME_PARAM \
-		CAP_CHUID \
-		CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}" || die "cannot write to CAP_FILE"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-
-	default
-}
-
-src_install() {
-	# trick the makefile to not create a VIDEODIR by supplying it with an
-	# existing directory
-	emake VIDEODIR="/" DESTDIR="${ED}" install
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	# backup for plugins they don't be able to create this dir
-	keepdir "${CONF_DIR}/plugins"
-
-	if use html; then
-		local HTML_DOCS=( *.html )
-	fi
-	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS UPDATE-2* )
-	einstalldocs
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	fowners vdr:vdr "${CONF_DIR}" -R
-}
-
-pkg_postinst() {
-	elog "Please read the /usr/share/doc/${PF}/UPDATE-2.4"
-	elog "for major changes in this version\n"
-
-	elog "It is a good idea to run vdrplugin-rebuild now.\n"
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup\n"
-
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9daf2ffc4542..ea5e97e98c7e 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 aedfc9290e84..f6952f5e171d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Sep 2021 08:09:02 +0000
+Sun, 19 Sep 2021 17:09:06 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 55d089a52a93..70595035b57b 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-09-19T08:09:06Z
+TIMESTAMP 2021-09-19T17:09:10Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFG8CJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFHbrZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCKaBAAoZNMdYzrj8aGs/H4+6e3XOSOAGHbgVGwhyRAipFbb5rTCEmRGW2ybsQr
-zFm5Jiw2II1XaJOfbOXM7eQVICgCYB0nUFnPCTCA+JkyGw3CmF0MWOvQ86LgdAjI
-J+hZR/jGeAksvd8dv1k3jxadP14Fm+SPXDPGYBuWdEceg0sbGMhuyK0tYlYrPfNT
-9ftfQlyj1voDqb2AdYgKlmYz22nMYVbi4J2sBipFiyLhwAOBCbvKwiDaz+wp6BkL
-zeHrw9z3Gghcj8eqZO4bmXW78xdFcnVLQwC/Gy6o0ucik0HzEHmUQKiKGpk79FSk
-JTqd05fXwq0ii53qdN0OmuFyZGK2JnGZG9aFQVyz3zcKOLfGsufBrxvAANRkaPAM
-lyJI2vsFvADQ9LfmZThwoHZBt3unsYf1GAvoyk6uKwDtBJmkXEHhBYAlVuScFlv5
-Ts24nqsh/MQ6ijSgMwxBi/TH5P8fdPsa8MSWfx06ImFnRpI+VFMoxrPT5yXOJsR5
-JRYx3HkcBIOPmLPSngExVmtx3wbKXEf3npAYCORTmG6isrCv+9Z1VfpHRYCOr7G5
-qVy5qE2hmDjqALqFXi6QfCbXOTTF67hxfAVJDsBfZ86JN6xg887hUI9ZkQFN/fmm
-8oUhaqnPOmgn3FqIHhKJGHyZHqNwiHanWE6bz1Idxt5KcEW9CmM=
-=/Mcq
+klByGQ/+IbhDqJvF22XwKEPDO5OFJX0k2+sk9ByEB1csEEV3dM7Efb8Ms1NbCPQ5
+ciA/bIwIfDybw0hbU/6OyDsaf/ROIjuBRwTPVmeJbOvu4e+JAIjcM6sD4z9K/JcZ
+3IpoMAGVL6FWTAQZvVPr3EzJaKqBpow4eteNX0pXR6IbPsNsY8Ul53wgT376SyWQ
+YytLefzOR6KRUl/LMiuFdmfbZljkL2pCT1fVO+1k9SA74vgbpTWJyfP+U9jK55F4
+dLt0h9MLISy68BQlYnQrBSJrim2/uxMKAbOL+xcoBZ9WXcqBu/CZ3KpoA00CWuVu
+g3F6NZB+Yrn5rYGqV94FwBAj/qZblQJohtZfFVkDkLXX6jhDYyvQveR3rCFUwmI9
++aNiNJrzcXEgl/fkiMr7iGnQHU4btLphmeoXkR+BiHO7FF6Mpv8PL2ozv64EjQzk
+CLGtKbIG4OhVYjkjmVmql2keYiKqI4TVbXTttGLZD3LSV41dhaqMKDxF9zDMeeCf
+4IOpys8IfXVHE6Fz2z/Heq9g89aZ0wOspSw1xLo+A11ORulEiy6ory+5xK6lb0YK
+/g1/AGxLReg95DWMUX9MEd/DG0zCii68RfbmwHgjcgffK7oTVr9vl1eI8w+gZ/u9
+Va9oMnWyHnkM8HaOFpvCE7W1csVwdv381lmlu4Bh6dFvAPCFvPw=
+=NjtI
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index aedfc9290e84..f6952f5e171d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Sep 2021 08:09:02 +0000
+Sun, 19 Sep 2021 17:09:06 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 74ca6a0f7ad7..7c3c6e06082a 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 cb5e328cc315..82fb91c023f6 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/lnav-0.8.5-r1 b/metadata/md5-cache/app-admin/lnav-0.8.5-r1
deleted file mode 100644
index dc156bd1c57b..000000000000
--- a/metadata/md5-cache/app-admin/lnav-0.8.5-r1
+++ /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=app-arch/bzip2:0= dev-db/sqlite:3 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= sys-libs/zlib:0=
-DESCRIPTION=A curses-based tool for viewing and analyzing log files
-EAPI=7
-HOMEPAGE=https://lnav.org
-IUSE=unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-arch/bzip2:0= dev-db/sqlite:3 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= sys-libs/zlib:0=
-SLOT=0
-SRC_URI=https://github.com/tstack/lnav/releases/download/v0.8.5/lnav-0.8.5.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3c4020f6ceacf36d8a458934c9a3e4a2
diff --git a/metadata/md5-cache/app-admin/lnav-0.9.0-r2 b/metadata/md5-cache/app-admin/lnav-0.9.0-r2
deleted file mode 100644
index f817cd6206ad..000000000000
--- a/metadata/md5-cache/app-admin/lnav-0.9.0-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=app-arch/bzip2:0= >=dev-db/sqlite-3.9.0 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= sys-libs/zlib:0=
-DESCRIPTION=A curses-based tool for viewing and analyzing log files
-EAPI=7
-HOMEPAGE=https://lnav.org
-IUSE=unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-arch/bzip2:0= >=dev-db/sqlite-3.9.0 dev-libs/libpcre[cxx] >=net-misc/curl-7.23.0 sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= sys-libs/zlib:0=
-SLOT=0
-SRC_URI=https://github.com/tstack/lnav/releases/download/v0.9.0/lnav-0.9.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2dcf502f884118e30ea5dd7776255bdb
diff --git a/metadata/md5-cache/app-admin/setools-4.4.0-r1 b/metadata/md5-cache/app-admin/setools-4.4.0-r2
similarity index 98%
rename from metadata/md5-cache/app-admin/setools-4.4.0-r1
rename to metadata/md5-cache/app-admin/setools-4.4.0-r2
index 5db8b4f4ce38..e91e404fbb40 100644
--- a/metadata/md5-cache/app-admin/setools-4.4.0-r1
+++ b/metadata/md5-cache/app-admin/setools-4.4.0-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.4.0/setools-4.4.0.tar.bz2
 _eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=23b0dcb6c3f8c4fe9efb37969f453ddc
+_md5_=4bb6928d78d84972aba2a41a6b26aebd
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 328c26e40179..3798cfe160e3 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/bonnie++-1.97.2 b/metadata/md5-cache/app-benchmarks/bonnie++-1.97.2
deleted file mode 100644
index 525ad0836074..000000000000
--- a/metadata/md5-cache/app-benchmarks/bonnie++-1.97.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Hard drive bottleneck testing benchmark suite
-EAPI=6
-HOMEPAGE=https://www.coker.com.au/bonnie++/
-IUSE=debug
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.coker.com.au/bonnie++/bonnie++-1.97.2.tgz
-_md5_=85daa123710bee0bd5fa60ea169359d2
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3 b/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3
deleted file mode 100644
index 33465d24f9a0..000000000000
--- a/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Hard drive bottleneck testing benchmark suite
-EAPI=6
-HOMEPAGE=https://www.coker.com.au/bonnie++/
-IUSE=debug
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.coker.com.au/bonnie++/bonnie++-1.97.3.tgz
-_md5_=6990021b7c7ec6404f523bd1676d440a
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.98 b/metadata/md5-cache/app-benchmarks/bonnie++-1.98
deleted file mode 100644
index 40584c854c1e..000000000000
--- a/metadata/md5-cache/app-benchmarks/bonnie++-1.98
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Hard drive bottleneck testing benchmark suite
-EAPI=7
-HOMEPAGE=https://www.coker.com.au/bonnie++/
-IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.coker.com.au/bonnie++/bonnie++-1.98.tgz
-_md5_=548e18866c7db750303d888c914a6e66
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index ecddf0980d25..7aa8b321307a 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1 b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
index 83320d7df9ac..8580f62d894a 100644
--- a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
+++ b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents
 EAPI=7
 HOMEPAGE=https://www.html-tidy.org/
 IUSE=deprecated test ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/58
 SRC_URI=https://github.com/htacg/tidy-html5/archive/refs/tags/5.8.0.tar.gz -> htmltidy-5.8.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=39dbcce778c12095c2418c8011f5578e
+_md5_=24e5c4f251e2f855801bdc5c289b00d5
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 8d9a6f0e0885..73da38f10809 100644
Binary files a/metadata/md5-cache/dev-ada/Manifest.gz and b/metadata/md5-cache/dev-ada/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ada/asis-2019-r1 b/metadata/md5-cache/dev-ada/asis-2019-r1
index 7fb8b04d511b..57327cb14570 100644
--- a/metadata/md5-cache/dev-ada/asis-2019-r1
+++ b/metadata/md5-cache/dev-ada/asis-2019-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=dev-ada/gnat_util[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared] dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=dev-ada/gnat_util[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gnatcoll-core[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared] dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=To develop tools for Ada software
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/gnat_util[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared]
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=dev-ada/gnat_util[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gnatcoll-core[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared]
+REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf849031e87aa2cdf16b10 -> asis-2019-20190517-18AB5-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=ca05a293515a2d02387daeff50a712a2
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=1ceadf756ea36a0e388b3d96af9959d3
diff --git a/metadata/md5-cache/dev-ada/aunit-2020 b/metadata/md5-cache/dev-ada/aunit-2020
index 8d2d9e48022e..6b4efe252c5a 100644
--- a/metadata/md5-cache/dev-ada/aunit-2020
+++ b/metadata/md5-cache/dev-ada/aunit-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=Ada unit testing framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
-IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/6c8702d4a3c4a39f5da077716e44bef980377ba8?filename=aunit-2020-20200429-19B6C-src.tar.gz -> aunit-2020-20200429-19B6C-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=4b9fdc615fee74dfa9a8f304d66b87bb
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=2d146c3b79c050de5c568d11e54d12da
diff --git a/metadata/md5-cache/dev-ada/aunit-2021 b/metadata/md5-cache/dev-ada/aunit-2021
index 2bd9b226a301..05d0de6bce68 100644
--- a/metadata/md5-cache/dev-ada/aunit-2021
+++ b/metadata/md5-cache/dev-ada/aunit-2021
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=Ada unit testing framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
-IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c8eadafc40c016859e127cd0e82411fcd8f3e749?filename=aunit-2021-20210518-19DC5-src.tar.gz -> aunit-2021-20210518-19DC5-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=2a43283da518f389edcf3c8d34aa2a1f
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=2a3e405f59b02b6cc8592f8afe0bbc92
diff --git a/metadata/md5-cache/dev-ada/aws-2018-r2 b/metadata/md5-cache/dev-ada/aws-2018-r2
deleted file mode 100644
index 3db6cab67fa3..000000000000
--- a/metadata/md5-cache/dev-ada/aws-2018-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure setup
-DEPEND=dev-ada/xmlada[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs] dev-ada/asis[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
-DESCRIPTION=A complete Web development framework
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/tools/aws/
-IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs]
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd -> aws-gpl-2018-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=e03896feda10fb67b081f4d7209a5f61
diff --git a/metadata/md5-cache/dev-ada/aws-2019-r1 b/metadata/md5-cache/dev-ada/aws-2019-r1
deleted file mode 100644
index 0eee72eec4ac..000000000000
--- a/metadata/md5-cache/dev-ada/aws-2019-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure setup
-DEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs] dev-ada/asis[ada_target_gnat_2019(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
-DESCRIPTION=A complete Web development framework
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/tools/aws/
-IUSE=ada_target_gnat_2019 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2020 -ada_target_gnat_2021
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs]
-REQUIRED_USE=ada_target_gnat_2019
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf85a031e87aa2cdf16b19 -> aws-2019-20190512-18AB9-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=2f2511b83f2cf8545f9318a9c3ab6cde
diff --git a/metadata/md5-cache/dev-ada/aws-2020 b/metadata/md5-cache/dev-ada/aws-2020
index cf5752dc90d9..b1318ab69fe5 100644
--- a/metadata/md5-cache/dev-ada/aws-2020
+++ b/metadata/md5-cache/dev-ada/aws-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure setup
-DEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs] dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs] dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=A complete Web development framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aws/
-IUSE=ada_target_gnat_2019 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs]
+RDEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs]
 REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c1b0f6863d1a30acaee1df022a65ad11d5737a84?filename=aws-2020-20200429-19A9F-src.tar.gz -> aws-2020-20200429-19A9F-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=de0d23564201c0a2aef15735346c2e4e
diff --git a/metadata/md5-cache/dev-ada/aws-2020-r1 b/metadata/md5-cache/dev-ada/aws-2020-r1
index ef011d261224..7d5207b8e82f 100644
--- a/metadata/md5-cache/dev-ada/aws-2020-r1
+++ b/metadata/md5-cache/dev-ada/aws-2020-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure setup
-DEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),shared,static-libs] dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-)]
+DEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared,static-libs] dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=A complete Web development framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aws/
-IUSE=ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017 -ada_target_gnat_2018
+IUSE=ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),shared,static-libs]
+RDEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared,static-libs]
 REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c1b0f6863d1a30acaee1df022a65ad11d5737a84?filename=aws-2020-20200429-19A9F-src.tar.gz -> aws-2020-20200429-19A9F-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=4290caa74eeefe6c67746d8d73fefcc2
diff --git a/metadata/md5-cache/dev-ada/aws-2021 b/metadata/md5-cache/dev-ada/aws-2021
index dceb3aa63999..a1aa5c7aa1ce 100644
--- a/metadata/md5-cache/dev-ada/aws-2021
+++ b/metadata/md5-cache/dev-ada/aws-2021
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure setup
-DEPEND=dev-ada/xmlada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),shared,static-libs] dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-)]
+DEPEND=dev-ada/xmlada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-),shared,static-libs] dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-)]
 DESCRIPTION=A complete Web development framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aws/
-IUSE=ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019
+IUSE=ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2019
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),shared,static-libs]
+RDEPEND=dev-ada/xmlada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-),shared,static-libs]
 REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/5b0fa09df8ac0c717abdf4ede9e08efe5fd98984?filename=aws-2021-20210518-19F65-src.tar.gz -> aws-2021-20210518-19F65-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=570a8b8b447a24f2c6fc29c5c16e7511
diff --git a/metadata/md5-cache/dev-ada/gnat-suite-bin-2017-r1 b/metadata/md5-cache/dev-ada/gnat-suite-bin-2017-r1
deleted file mode 100644
index ea14fc5d125b..000000000000
--- a/metadata/md5-cache/dev-ada/gnat-suite-bin-2017-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=GNAT Ada suite
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-KEYWORDS=amd64
-LICENSE=GPL-2 GPL-3
-RDEPEND=sys-devel/binutils sys-devel/gdb sys-libs/gdbm sys-libs/ncurses-compat
-SLOT=2017
-SRC_URI=http://mirrors.cdn.adacore.com/art/591c6d80c7a447af2deed1d7 -> gnat-gpl-2017-x86_64-linux-bin.tar.gz
-_md5_=8fbf2ed17051fc2451fa00498e47aa06
diff --git a/metadata/md5-cache/dev-ada/gnat-suite-bin-2018-r1 b/metadata/md5-cache/dev-ada/gnat-suite-bin-2018-r1
deleted file mode 100644
index b2be2916a674..000000000000
--- a/metadata/md5-cache/dev-ada/gnat-suite-bin-2018-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=GNAT Ada suite
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-KEYWORDS=amd64
-LICENSE=GPL-2 GPL-3
-RDEPEND=sys-devel/binutils sys-devel/gdb sys-libs/gdbm sys-libs/ncurses-compat
-SLOT=2018
-SRC_URI=https://dev.gentoo.org/~tupone/distfiles/gnat-suite-bin-2018.txz
-_md5_=026b7381e9019fd17e2d680d86af35a2
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2017-r2 b/metadata/md5-cache/dev-ada/gnat_util-2017-r2
deleted file mode 100644
index 889a38287b5c..000000000000
--- a/metadata/md5-cache/dev-ada/gnat_util-2017-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
-DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
-EAPI=7
-HOMEPAGE=http://libre.adacore.com
-IUSE=+shared static-libs static-pic ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-REQUIRED_USE=ada_target_gnat_2017
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037 -> gnat_util-gpl-2017-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=fa578b0f935dd64d8bd36f0e45dfa4f5
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2018-r2 b/metadata/md5-cache/dev-ada/gnat_util-2018-r2
deleted file mode 100644
index 95602f2efa3e..000000000000
--- a/metadata/md5-cache/dev-ada/gnat_util-2018-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
-DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
-EAPI=7
-HOMEPAGE=http://libre.adacore.com
-IUSE=+shared static-libs static-pic ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2017 -ada_target_gnat_2020 -ada_target_gnat_2021
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-REQUIRED_USE=^^ ( ada_target_gnat_2018 ada_target_gnat_2019 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6b -> gnat_util-gpl-2018-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=a1cb5293b4cb5e6d0b74315a1b4d5ef4
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2019-r1 b/metadata/md5-cache/dev-ada/gnat_util-2019-r1
index 9b9d2f8dcfab..3914cf35a032 100644
--- a/metadata/md5-cache/dev-ada/gnat_util-2019-r1
+++ b/metadata/md5-cache/dev-ada/gnat_util-2019-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=+shared static-libs static-pic ada_target_gnat_2019 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
 REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8e5031e87a8f1d425090 -> gnat_util-2019-20190517-18c94-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=0d7f35887bc8d12bde53f3e2ff6916e7
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1
index 2b919829b5f5..b09aadf174b3 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp iconv readline +shared static-libs static-pic syslog ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=gmp iconv readline +shared static-libs static-pic syslog ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
+REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz -> gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=1010ade893aa419bc7fe6df2251c7dc2
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=a7a50d53abd266c1de81627506f683b5
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2
index 55dbedda9c3b..5ee7b6b1c533 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp iconv readline +shared static-libs static-pic syslog ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=gmp iconv readline +shared static-libs static-pic syslog ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz -> gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=b771b8b22924adc4bc93e3ea5b4648b9
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=0e1a1f0b4aa6a453194fe9456f3d6654
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
index 7887f14d8714..e238a0a89dbd 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup
-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] ) ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+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] ) ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9
+IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-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] ) ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+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] ) ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/d93655ced17f15c5f376b6861825df3f9c183980?filename=gnatcoll-bindings-2021-20210518-19B15-src.tar.gz -> gnatcoll-bindings-2021-20210518-19B15-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=308482f62abc04e6b5c2f74bf55e0458
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6c9fb97a81bc5e805898110f3f6e1f33
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2020 b/metadata/md5-cache/dev-ada/gnatcoll-core-2020
index d006725b29ce..447da0b70a60 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2020
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=GNAT Component Collection Core packages
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?]
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?]
+REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0b5003d84935?filename=gnatcoll-core-2020-20200429-19B7C-src.tar.gz -> gnatcoll-core-2020-20200429-19B7C-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=bb6ca4e6c69a0a0ee5d662954157d593
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=73b0b2cb61df44ea3d8c8740981f3a60
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1 b/metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1
index 2f3bba5d7d7c..5e99774337a2 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
+DEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
 DESCRIPTION=GNAT Component Collection Core packages
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?]
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 )
+RDEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?]
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0b5003d84935?filename=gnatcoll-core-2020-20200429-19B7C-src.tar.gz -> gnatcoll-core-2020-20200429-19B7C-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=f08ecc586ddae89d81ee5d46aaa5639f
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=58c5308c41c922cdbc7feb917e98a4a1
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1 b/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1
index 5e00cc45c9b9..add97b00e41f 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-ada/libgpr-2021[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-)]
+DEPEND=>=dev-ada/libgpr-2021[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-)]
 DESCRIPTION=GNAT Component Collection Core packages
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019
+IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2019
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-ada/libgpr-2021[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),shared?,static-libs?,static-pic?]
+RDEPEND=>=dev-ada/libgpr-2021[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-),shared?,static-libs?,static-pic?]
 REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/425b044d5cb112f096c7ac5ebbafb0d8e5297913?filename=gnatcoll-core-2021-20210518-19ADF-src.tar.gz -> gnatcoll-core-2021-20210518-19ADF-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=6f75a7e4c73ebb210be4e583415320f2
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2019-r1 b/metadata/md5-cache/dev-ada/gnatmem-2019-r1
index c1274a5dc8b8..0626cbb5a22f 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2019-r1
+++ b/metadata/md5-cache/dev-ada/gnatmem-2019-r1
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] sys-libs/binutils-libs:=
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] sys-libs/binutils-libs:=
 DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8e1431e87a8f1d425089 -> gnatmem-2019-20190429-19745-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c996df3ac97f68e11a21f7290bb710b6
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5c7a18cefa9c26f1bc98733aeccc591c
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2020 b/metadata/md5-cache/dev-ada/gnatmem-2020
index 0755769a89f9..692d79cbb532 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2020
+++ b/metadata/md5-cache/dev-ada/gnatmem-2020
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] sys-libs/binutils-libs:=
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] sys-libs/binutils-libs:=
 DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/77354fedca0441f882e17b6a73ac5631bff26237?filename=gnatmem-2020-20200429-19911-src.tar.gz -> gnatmem-2020-20200429-19911-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2119f08744a4b5d60cbdc477a3e8a739
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d6d42e2625f4cbb4deb8541e177a5372
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2021 b/metadata/md5-cache/dev-ada/gnatmem-2021
index 81f5aaad2cdd..eafa3d190d74 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2021
+++ b/metadata/md5-cache/dev-ada/gnatmem-2021
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] sys-libs/binutils-libs:=
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] sys-libs/binutils-libs:=
 DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3ddb98c0c8854dc7631bebd673ac7bc53038d4b7?filename=gnatmem-2021-20210518-19F7B-src.tar.gz -> gnatmem-2021-20210518-19F7B-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=566a02406edc70b51c651dbe4b0cfe17
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bd7833ca4bf4df2c2bbf7fcd0e23222b
diff --git a/metadata/md5-cache/dev-ada/gnatsymbolize-2019-r1 b/metadata/md5-cache/dev-ada/gnatsymbolize-2019-r1
index 679536203435..ca42d3e52f41 100644
--- a/metadata/md5-cache/dev-ada/gnatsymbolize-2019-r1
+++ b/metadata/md5-cache/dev-ada/gnatsymbolize-2019-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
 DESCRIPTION=Translates addresses into filename, line number, and function names
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2017 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-REQUIRED_USE=^^ ( ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cc7d5e431e87a23952f18c4 -> gnatsymbolize-2019-20190429-19761-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388
-_md5_=cca71035b9378d0210704414b2835953
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593
+_md5_=f6e17c4b98fa423025229f3bb369542f
diff --git a/metadata/md5-cache/dev-ada/gnatsymbolize-2020 b/metadata/md5-cache/dev-ada/gnatsymbolize-2020
index 7c5c324223f1..2c47f50629d4 100644
--- a/metadata/md5-cache/dev-ada/gnatsymbolize-2020
+++ b/metadata/md5-cache/dev-ada/gnatsymbolize-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
 DESCRIPTION=Translates addresses into filename, line number, and function names
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017
+IUSE=ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=^^ ( ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/ebef002ce60066e3befdd1a4a0980f3ab8f1b551?filename=gnatsymbolize-2020-20200429-19987-src.tar.gz -> gnatsymbolize-2020-20200429-19987-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388
-_md5_=404416a1cafbf514ef68a6f7c520c83d
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593
+_md5_=d50bf1da312fd2971a490b1049615978
diff --git a/metadata/md5-cache/dev-ada/gnatsymbolize-2021 b/metadata/md5-cache/dev-ada/gnatsymbolize-2021
index 43674b562882..6e4140cf2cf4 100644
--- a/metadata/md5-cache/dev-ada/gnatsymbolize-2021
+++ b/metadata/md5-cache/dev-ada/gnatsymbolize-2021
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
 DESCRIPTION=Translates addresses into filename, line number, and function names
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017
+IUSE=ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=^^ ( ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/884f3b229457c995ddebb46a16a7cc50ed837c90?filename=gnatsymbolize-2021-20210518-19D3B-src.tar.gz -> gnatsymbolize-2021-20210518-19D3B-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388
-_md5_=5af25323d06c2f967669eb28082a3937
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593
+_md5_=74696e0624e6e1d344dfeca8c5d6d836
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2020 b/metadata/md5-cache/dev-ada/gprbuild-2020
index 0a7cf067eadd..84afa72d275e 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2020
+++ b/metadata/md5-cache/dev-ada/gprbuild-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
 DESCRIPTION=Multi-Language Management
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz -> gprbuild-2020-20200429-19BD2-src.tar.gz https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=xmlada-2020-20200429-19A99-src.tar.gz -> xmlada-2020-20200429-19A99-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=f3c6c34d3b92a101975d16518f40c1d3
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=289f08e6f3ec9ad6faeaaa31c44f3b0b
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2020-r1 b/metadata/md5-cache/dev-ada/gprbuild-2020-r1
index 4b45fc51523c..9ae55cf16853 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2020-r1
+++ b/metadata/md5-cache/dev-ada/gprbuild-2020-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 )
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 )
 DESCRIPTION=Multi-Language Management
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 )
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 )
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz -> gprbuild-2020-20200429-19BD2-src.tar.gz https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=xmlada-2020-20200429-19A99-src.tar.gz -> xmlada-2020-20200429-19A99-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=38266c890128aac7559c7c13dc441de0
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=07b8e9ed82d63276705820a57f9aff54
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2021-r1 b/metadata/md5-cache/dev-ada/gprbuild-2021-r1
index d259bb0d276c..b38b19960ef3 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2021-r1
+++ b/metadata/md5-cache/dev-ada/gprbuild-2021-r1
@@ -3,12 +3,12 @@ DEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? (
 DESCRIPTION=Multi-Language Management
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019
+IUSE=ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2019
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
 REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/23a77a37247ff811609e23a0a271f445c299fc8f?filename=gprbuild-2021-20210519-19A34-src.tar.gz -> gprbuild-2021-20210519-19A34-src.tar.gz https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=xmlada-2021-20210518-19D50-src.tar.gz -> xmlada-2021-20210518-19D50-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=db21e3d38e2dbfdf7a359013be92b76f
diff --git a/metadata/md5-cache/dev-ada/gtkada-2019-r1 b/metadata/md5-cache/dev-ada/gtkada-2019-r1
index 2192a7c635c2..c4f9bcbc6d46 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2019-r1
+++ b/metadata/md5-cache/dev-ada/gtkada-2019-r1
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53 -> gtkada-2019-20190424-19D98-src.tgz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=446d212c40d0f456402dbace50ef56a1
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=af5648ceaf524f6eb2242f889b6b221f
diff --git a/metadata/md5-cache/dev-ada/gtkada-2019-r2 b/metadata/md5-cache/dev-ada/gtkada-2019-r2
index 532dce68d33f..9d5b1c67c4b5 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2019-r2
+++ b/metadata/md5-cache/dev-ada/gtkada-2019-r2
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53 -> gtkada-2019-20190424-19D98-src.tgz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=08593028e81d6feadfd637f66f6327a7
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5ff358552dadbdc7cd39108a5fcf5ea3
diff --git a/metadata/md5-cache/dev-ada/gtkada-2020 b/metadata/md5-cache/dev-ada/gtkada-2020
index 7d3f82fbdce2..7564b00c446c 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2020
+++ b/metadata/md5-cache/dev-ada/gtkada-2020
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=+shared static-libs ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/96f85c875c161c36e7d0edb19aa4dbddf41ea671?filename=gtkada-2020-20200429-19B96-src.tar.gz -> gtkada-2020-20200429-19B96-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ae17b54824401417270e686549d432ad
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0ddcde40fa7e8c770cc1b6cca6b9d111
diff --git a/metadata/md5-cache/dev-ada/gtkada-2021 b/metadata/md5-cache/dev-ada/gtkada-2021
index 3594abae3515..6504ff139256 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2021
+++ b/metadata/md5-cache/dev-ada/gtkada-2021
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=+shared static-libs ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/8f1daefcb56e3ee7feaad67bac66deb0f7c37a82?filename=gtkada-2021-20210518-1A011-src.tar.gz -> gtkada-2021-20210518-1A011-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9e02f1bb63ee67ed1e5dba1078886a6b
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75dd5ef3ae4e09b0096b789510113cc3
diff --git a/metadata/md5-cache/dev-ada/libgpr-2020 b/metadata/md5-cache/dev-ada/libgpr-2020
index 062f8025343d..6dc994328996 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2020
+++ b/metadata/md5-cache/dev-ada/libgpr-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install setup
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] !net-libs/grpc
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ) || ( shared static-libs static-pic )
+RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] !net-libs/grpc
+REQUIRED_USE=ada_target_gnat_2019 || ( shared static-libs static-pic )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz -> gprbuild-2020-20200429-19BD2-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=b5bad99b2268da9ec364c7ff4069df2c
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=a277c06ee604fc0a52503ff6a9e92aa6
diff --git a/metadata/md5-cache/dev-ada/libgpr-2020-r1 b/metadata/md5-cache/dev-ada/libgpr-2020-r1
index 82cad8de46dc..a35c1e9265ee 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2020-r1
+++ b/metadata/md5-cache/dev-ada/libgpr-2020-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install setup
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)] !net-libs/grpc
-REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ) || ( shared static-libs static-pic )
+RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)] !net-libs/grpc
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ) || ( shared static-libs static-pic )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz -> gprbuild-2020-20200429-19BD2-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=daee3be48d502cc8fd83a18d8f862848
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=1058fc623aa44300f14506fd51d49116
diff --git a/metadata/md5-cache/dev-ada/libgpr-2021 b/metadata/md5-cache/dev-ada/libgpr-2021
index b98b7589bc12..1c836d3648bf 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2021
+++ b/metadata/md5-cache/dev-ada/libgpr-2021
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install setup
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-)]
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-)]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019
+IUSE=+shared static-libs static-pic ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2019
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-)] !net-libs/grpc
+RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-)] !net-libs/grpc
 REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 ) || ( shared static-libs static-pic )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/23a77a37247ff811609e23a0a271f445c299fc8f?filename=gprbuild-2021-20210519-19A34-src.tar.gz -> gprbuild-2021-20210519-19A34-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=f69780e435041300e049f6d2a2f207a1
diff --git a/metadata/md5-cache/dev-ada/xmlada-2020 b/metadata/md5-cache/dev-ada/xmlada-2020
index 6d50a3e6162c..114e23989b0c 100644
--- a/metadata/md5-cache/dev-ada/xmlada-2020
+++ b/metadata/md5-cache/dev-ada/xmlada-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=|| ( shared static-libs static-pic ) ada_target_gnat_2019
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=xmlada-2020-20200429-19A99-src.tar.gz -> xmlada-2020-20200429-19A99-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=a41145693eaa47a01a20029b358500b3
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=63a62f2da107b967d2410c30076ddb3a
diff --git a/metadata/md5-cache/dev-ada/xmlada-2021-r1 b/metadata/md5-cache/dev-ada/xmlada-2021-r1
index 14568c100d43..150bf6241532 100644
--- a/metadata/md5-cache/dev-ada/xmlada-2021-r1
+++ b/metadata/md5-cache/dev-ada/xmlada-2021-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
 DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=xmlada-2021-20210518-19D50-src.tar.gz -> xmlada-2021-20210518-19D50-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=61a8dc7c014c5f932dd6810f79ca1f32
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=bf7fbe5b42959d75c9615de889d2b875
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 938bb21c1acb..9d796c8f4d14 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.19 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.19
deleted file mode 100644
index bf9e3f7c7343..000000000000
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.19
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
-DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
-EAPI=7
-HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
-IUSE=+legacy
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=Artistic GPL-2
-RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.19-src.tar.gz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	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	27f9a2f19502b925ac117bd657aa2979
-_md5_=6fb2db7e85a92526336133d1ef7a8089
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.20 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.20
deleted file mode 100644
index f36e8178e528..000000000000
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.20
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
-DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
-EAPI=7
-HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
-IUSE=+legacy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Artistic GPL-2
-RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.20-src.tar.gz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	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	27f9a2f19502b925ac117bd657aa2979
-_md5_=e67d258d2f573853168fdb9e452c0c8e
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.21 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.21
deleted file mode 100644
index d65f43a5fcb1..000000000000
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.21
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
-DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
-EAPI=7
-HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
-IUSE=+legacy
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=Artistic GPL-2
-RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.21-src.tar.gz
-_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	27f9a2f19502b925ac117bd657aa2979
-_md5_=cc46a15c2a3a820c885434867485d282
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.22 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.22
deleted file mode 100644
index 0fce33fb1739..000000000000
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.22
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
-DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
-EAPI=7
-HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
-IUSE=+legacy
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=Artistic GPL-2
-RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.22-src.tar.gz
-_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	27f9a2f19502b925ac117bd657aa2979
-_md5_=5dc077b69d664d18717c00ad938dc07c
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.23 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.23
deleted file mode 100644
index 4a5e016feb96..000000000000
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.23
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
-DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
-EAPI=7
-HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
-IUSE=+legacy
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=Artistic GPL-2
-RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.23-src.tar.gz
-_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	27f9a2f19502b925ac117bd657aa2979
-_md5_=5545ba377036218373752098ea241893
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index e0f61088a7ef..f42f5c477734 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/spark-2021 b/metadata/md5-cache/dev-lang/spark-2021
index 64c72e2b9043..1349a5c949b8 100644
--- a/metadata/md5-cache/dev-lang/spark-2021
+++ b/metadata/md5-cache/dev-lang/spark-2021
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-ada/gnatcoll-core[ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),shared] sci-mathematics/alt-ergo sci-mathematics/why3-for-spark || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-)]
+DEPEND=dev-ada/gnatcoll-core[ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),shared] sci-mathematics/alt-ergo sci-mathematics/why3-for-spark || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-),-ada_target_gnat_2020(-)]
 DESCRIPTION=Software development for high-reliability applications.
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=ada_target_gnat_2021 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019 -ada_target_gnat_2020
+IUSE=ada_target_gnat_2021 -ada_target_gnat_2019 -ada_target_gnat_2020
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=dev-ada/gnatcoll-core[ada_target_gnat_2021(-)?,-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),shared] sci-mathematics/alt-ergo sci-mathematics/why3-for-spark
+RDEPEND=dev-ada/gnatcoll-core[ada_target_gnat_2021(-)?,-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),shared] sci-mathematics/alt-ergo sci-mathematics/why3-for-spark
 REQUIRED_USE=ada_target_gnat_2021
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/969ce28e217bd5aa4db549a544d20846408a5229?filename=spark-2021-2021-20210519-19A1A-src.tar.gz -> spark-2021-2021-20210519-19A1A-src.tar.gz https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz
-_eclasses_=ada	ba844d1f9394081aa86d3569cc3a4388	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=ada	5284f8916f3a361875abfcb73dd44593	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c1c389e2dd1270c5707b8d2c42574be
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 27969e0becc2..d6dab49b5734 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/fribidi-1.0.10 b/metadata/md5-cache/dev-libs/fribidi-1.0.10
index b37f15cce49e..5288b06a06fa 100644
--- a/metadata/md5-cache/dev-libs/fribidi-1.0.10
+++ b/metadata/md5-cache/dev-libs/fribidi-1.0.10
@@ -4,9 +4,9 @@ DESCRIPTION=A free implementation of the unicode bidirectional algorithm
 EAPI=7
 HOMEPAGE=https://fribidi.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a106f479c07f7921611daf764b7150c3
+_md5_=fc3d3446dbe85ab1c8c7fb75fd256723
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
index 86e2f3299df7..380a8b0458d8 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
@@ -5,7 +5,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=doctool gtk-doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-common-1.68.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ) virtual/pkgconfig python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	493198f00f20d2ecf10552d2737f2f13	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bb8d5f7b01fc1e8fe2a1b96306973bc5
+_md5_=c64d0985971622833b5f53443e97df36
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.70.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.70.0
index ab8b25d08f7b..0dfa4feea581 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.70.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.70.0
@@ -5,7 +5,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=doctool gtk-doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-common-1.70.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ) virtual/pkgconfig python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.70/gobject-introspection-1.70.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	493198f00f20d2ecf10552d2737f2f13	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7dac30baa91f7822f7b0f494d8306acb
+_md5_=3809b753753dec4e39587a827ef85c0e
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.68.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.68.0
index 5143af085c1d..b6760a3507bd 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.68.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.68.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.68.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.tar.xz
 _eclasses_=gnome.org	b5c48cddff1da36a205d924d722b28c9
-_md5_=bef82448c600604ead3ab476cda1116b
+_md5_=60e50772e2b850c36de3106c93736f8f
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.70.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.70.0
index ec7c3773ff78..565122eefe86 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.70.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.70.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.70.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.70/gobject-introspection-1.70.0.tar.xz
 _eclasses_=gnome.org	b5c48cddff1da36a205d924d722b28c9
-_md5_=ab1ee10fec78a03a96bd069731af4454
+_md5_=982d60b054ff41825d8c7cfbc674a3c3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f6b62503fd38..a91de12f6370 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/aesara-2.2.2 b/metadata/md5-cache/dev-python/aesara-2.2.2
new file mode 100644
index 000000000000..144bf61b9a0a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.2.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-xdist[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(-)] ) ) ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[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/scipy[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 postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=8
+HOMEPAGE=https://github.com/aesara-devs/aesara
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[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/scipy[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/aesara-devs/aesara/archive/rel-2.2.2.tar.gz -> aesara-rel-2.2.2.tar.gz
+_eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c25bf36f8974cd8077d9af1b0995dc3f
diff --git a/metadata/md5-cache/dev-python/genshi-0.7.5 b/metadata/md5-cache/dev-python/genshi-0.7.5
index 96e1e01e2866..b4a3c8746c7c 100644
--- a/metadata/md5-cache/dev-python/genshi-0.7.5
+++ b/metadata/md5-cache/dev-python/genshi-0.7.5
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/six[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 toolkit for stream-based generation of output for the web
 EAPI=7
 HOMEPAGE=https://genshi.edgewall.org/ https://pypi.org/project/Genshi/
-IUSE=doc examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+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/G/Genshi/Genshi-0.7.5.tar.gz
 _eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c3a98f680dcc2069ad0e24e6308d790
+_md5_=1924635b7add11edc938d47dae2ad3f1
diff --git a/metadata/md5-cache/dev-python/markdown-3.3.4 b/metadata/md5-cache/dev-python/markdown-3.3.4
index e6ddb6675cee..f2326f7afc59 100644
--- a/metadata/md5-cache/dev-python/markdown-3.3.4
+++ b/metadata/md5-cache/dev-python/markdown-3.3.4
@@ -4,7 +4,7 @@ DESCRIPTION=Python implementation of the markdown markup language
 EAPI=7
 HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.3.4.tar.gz
 _eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=32deee212b58d7fe7b9be8eae529f330
+_md5_=009ea120b3f87bb2076399fce0137a63
diff --git a/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1 b/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
index bae5e12ea07d..0a90ab3bbe6c 100644
--- a/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Python wrapper for HTML Tidy (tidylib)
 EAPI=7
 HOMEPAGE=http://countergram.com/open-source/pytidylib https://github.com/countergram/pytidylib
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=app-text/htmltidy 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytidylib/pytidylib-0.3.2.tar.gz
 _eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a025c76f32225594aaf2b7226c45d765
+_md5_=6d82b838b3dbd64a3856281a1e2e4752
diff --git a/metadata/md5-cache/dev-python/sure-2.0.0 b/metadata/md5-cache/dev-python/sure-2.0.0
index de4811a9577a..b285b3bbe0b1 100644
--- a/metadata/md5-cache/dev-python/sure-2.0.0
+++ b/metadata/md5-cache/dev-python/sure-2.0.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[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/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.0[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/nose-1.3.7-r4[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=idiomatic assertion toolkit with human-friendly failure messages
 EAPI=7
 HOMEPAGE=https://github.com/gabrielfalcao/sure
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
 LICENSE=GPL-3+
-RDEPEND=dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.0[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(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.0[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=mirror://pypi/s/sure/sure-2.0.0.tar.gz
 _eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b342af3c14c60e5c8794a8365af8bed6
+_md5_=0b81aad0bb8d4b2f89a375925a755353
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index fe65575a2dc9..2efbe3af3c6b 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625
deleted file mode 100644
index d3bb9225b50f..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/gperf dev-util/ninja dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex ppc64? ( >=dev-util/gn-0.1807 ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtwebchannel-5.15.2[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.15.2 ) geolocation? ( ~dev-qt/qtpositioning-5.15.2 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( ~dev-qt/qtdeclarative-5.15.2[widgets] ~dev-qt/qtwidgets-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtwebchannel-5.15.2[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.15.2 ) geolocation? ( ~dev-qt/qtpositioning-5.15.2 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( ~dev-qt/qtdeclarative-5.15.2[widgets] ~dev-qt/qtwidgets-5.15.2 )
-REQUIRED_USE=designer? ( widgets )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.2_p20210625.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-chromium87-ppc64le.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=88ce5760d9b581f08ef68c29dc4377b1
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 8450332aef4d..bc0c043aadea 100644
Binary files a/metadata/md5-cache/games-puzzle/Manifest.gz and b/metadata/md5-cache/games-puzzle/Manifest.gz differ
diff --git a/metadata/md5-cache/games-puzzle/hitori-3.38.3 b/metadata/md5-cache/games-puzzle/hitori-3.38.3
new file mode 100644
index 000000000000..701517020b14
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/hitori-3.38.3
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/xz-utils >=dev-util/meson-0.57.0 >=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.32:2 >=x11-libs/gtk+-3.22.0:3 >=x11-libs/cairo-1.4 dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Logic puzzle game for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Hitori
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22.0:3 >=x11-libs/cairo-1.4
+SLOT=0
+SRC_URI=mirror://gnome/sources/hitori/3.38/hitori-3.38.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	493198f00f20d2ecf10552d2737f2f13	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2ed805d9a409bd33a300d9af53c8d5c1
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 3399b69517b9..977068b2486f 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-40.1 b/metadata/md5-cache/gnome-extra/gnome-user-docs-40.5
similarity index 89%
rename from metadata/md5-cache/gnome-extra/gnome-user-docs-40.1
rename to metadata/md5-cache/gnome-extra/gnome-user-docs-40.5
index ddabf2dbecf0..649928fffe04 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-40.1
+++ b/metadata/md5-cache/gnome-extra/gnome-user-docs-40.5
@@ -5,10 +5,10 @@ DESCRIPTION=GNOME end user documentation
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-user-docs
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=CC-BY-3.0
 RESTRICT=binchecks strip !test? ( test )
 SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-user-docs/40/gnome-user-docs-40.1.tar.xz
+SRC_URI=mirror://gnome/sources/gnome-user-docs/40/gnome-user-docs-40.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=de712988ffd7cc6a24a88004f9061421
+_md5_=fb72bb30f9f314c1f00a4c08cea6ea63
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 49c146267293..371497e51678 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/nvidia-texture-tools-2.0.8-r4 b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
index cb565a5f04bc..7e9812f109e9 100644
--- a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
+++ b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A set of cuda-enabled texture tools and compressors
 EAPI=6
 HOMEPAGE=http://developer.nvidia.com/object/texture_tools.html
 IUSE=cg glew glut openexr
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 -riscv x86
 LICENSE=MIT
 RDEPEND=media-libs/ilmbase:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 cg? ( media-gfx/nvidia-cg-toolkit ) glew? ( media-libs/glew:0= ) glut? ( media-libs/freeglut ) openexr? ( media-libs/openexr:= )
 SLOT=0
 SRC_URI=https://nvidia-texture-tools.googlecode.com/files/nvidia-texture-tools-2.0.8-1.tar.gz https://dev.gentoo.org/~soap/distfiles/nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz
 _eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ae59026a86f01c47d0b12fbf9c029da9
+_md5_=beb56649511f0c05afb3ec26cce137b4
diff --git a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2 b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2
index 6f2930e79a96..4cfb7b393a7e 100644
--- a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2
+++ b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2
@@ -5,10 +5,10 @@ DESCRIPTION=A set of cuda-enabled texture tools and compressors
 EAPI=7
 HOMEPAGE=https://github.com/castano/nvidia-texture-tools
 IUSE=cpu_flags_x86_sse2 openmp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 -riscv ~x86
 LICENSE=MIT
 RDEPEND=media-libs/ilmbase:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/castano/nvidia-texture-tools/archive/2.1.2.tar.gz -> nvidia-texture-tools-2.1.2.tar.gz
 _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	27f9a2f19502b925ac117bd657aa2979
-_md5_=b520acd2c0b79f03ea7c2eb2b4ed5b75
+_md5_=f5997a5d67dc71330c15a9c86516e2b0
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 056bc0baa11d..863e352a9b13 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/harfbuzz-2.9.1 b/metadata/md5-cache/media-libs/harfbuzz-2.9.1
index f348c7f81f78..c5c0d6ce9932 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.9.1
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=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(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.9.1.tar.gz -> harfbuzz-2.9.1.tar.gz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	493198f00f20d2ecf10552d2737f2f13	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fe71519d665b0bb1cd50351a54ad9fef
+_md5_=aa9af7aa04a40f436a65ed59674b7be5
diff --git a/metadata/md5-cache/media-libs/harfbuzz-3.0.0 b/metadata/md5-cache/media-libs/harfbuzz-3.0.0
index 9204affad993..5f06e77fbc2a 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-3.0.0
+++ b/metadata/md5-cache/media-libs/harfbuzz-3.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=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(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/3.0.0.tar.gz -> harfbuzz-3.0.0.tar.gz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	493198f00f20d2ecf10552d2737f2f13	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fe71519d665b0bb1cd50351a54ad9fef
+_md5_=aa9af7aa04a40f436a65ed59674b7be5
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.4-r1 b/metadata/md5-cache/media-libs/libffado-2.4.4-r1
index cdf2e8f466bb..e0e9250476f1 100644
--- a/metadata/md5-cache/media-libs/libffado-2.4.4-r1
+++ b/metadata/md5-cache/media-libs/libffado-2.4.4-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Driver for IEEE1394 (Firewire) audio interfaces
 EAPI=7
 HOMEPAGE=http://www.ffado.org
 IUSE=debug qt5 test-programs python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2 GPL-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-cpp/libxmlpp:2.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(-)?] dev-libs/dbus-c++ dev-libs/libconfig:=[cxx,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/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/PyQt5[dbus,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/PyQt5[dbus,python_targets_python3_9(-)] ) x11-misc/xdg-utils )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=http://www.ffado.org/files/libffado-2.4.4.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	0a92682c0f65a60d01453db598fc6490
-_md5_=d554982d79e6d2b40b39271837c669e6
+_md5_=a8ed18e9eca23ba4e6a11fd125551758
diff --git a/metadata/md5-cache/media-libs/libheif-1.12.0 b/metadata/md5-cache/media-libs/libheif-1.12.0
deleted file mode 100644
index 7d1aad55e3b5..000000000000
--- a/metadata/md5-cache/media-libs/libheif-1.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-lang/go ) 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 postinst postrm preinst prepare test
-DEPEND=media-libs/dav1d:=[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/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) libde265? ( media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[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-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
-EAPI=7
-HOMEPAGE=https://github.com/strukturag/libheif
-IUSE=+aom gdk-pixbuf go libde265 rav1e test +threads x265 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 ppc64 ~riscv x86
-LICENSE=GPL-3
-RDEPEND=media-libs/dav1d:=[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/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) libde265? ( media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( go libde265 )
-RESTRICT=!test? ( test )
-SLOT=0/1.12
-SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=97a2b7a503681008456ad5a1d718fb46
diff --git a/metadata/md5-cache/media-libs/libheif-1.12.0-r1 b/metadata/md5-cache/media-libs/libheif-1.12.0-r1
new file mode 100644
index 000000000000..4ca3011f93cb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libheif-1.12.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-lang/go ) 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 postinst postrm preinst prepare test
+DEPEND=media-libs/dav1d:=[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/libde265:=[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/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[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-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
+EAPI=7
+HOMEPAGE=https://github.com/strukturag/libheif
+IUSE=+aom gdk-pixbuf go rav1e test +threads x265 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 ppc64 ~riscv x86
+LICENSE=GPL-3
+RDEPEND=media-libs/dav1d:=[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/libde265:=[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/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( go )
+RESTRICT=!test? ( test )
+SLOT=0/1.12
+SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=769f29bf890595abcbc8380fc745db2c
diff --git a/metadata/md5-cache/media-libs/libheif-9999 b/metadata/md5-cache/media-libs/libheif-9999
index 7b4503c835de..c07ece61e9a7 100644
--- a/metadata/md5-cache/media-libs/libheif-9999
+++ b/metadata/md5-cache/media-libs/libheif-9999
@@ -1,15 +1,15 @@
 BDEPEND=test? ( dev-lang/go ) 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]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=media-libs/dav1d:=[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/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) libde265? ( media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[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-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/dav1d:=[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/libde265:=[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/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[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-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
 EAPI=7
 HOMEPAGE=https://github.com/strukturag/libheif
-IUSE=+aom gdk-pixbuf go libde265 rav1e test +threads x265 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=+aom gdk-pixbuf go rav1e test +threads x265 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-3
 PROPERTIES=live
-RDEPEND=media-libs/dav1d:=[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/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) libde265? ( media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( go libde265 )
+RDEPEND=media-libs/dav1d:=[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/libde265:=[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/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( go )
 RESTRICT=!test? ( test )
 SLOT=0/1.12
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c22c7ca7f93a69233d3ac0e88e3607b9
+_md5_=588f047f2055d239d0b2025d653f6743
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 3ff56540d6f3..e6ef9907b720 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/flmsg-4.0.17 b/metadata/md5-cache/media-radio/flmsg-4.0.17
deleted file mode 100644
index 9380d536b7d2..000000000000
--- a/metadata/md5-cache/media-radio/flmsg-4.0.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:= virtual/pkgconfig
-DESCRIPTION=Fldigi helper for creating radiograms
-EAPI=7
-HOMEPAGE=http://www.w1hkj.com
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:=
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flmsg-4.0.17.tar.gz
-_md5_=ba65b8dd8ae681371b93e2be517be838
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 5bb92678a269..31ba3a826c81 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/easyeffects-6.1.1 b/metadata/md5-cache/media-sound/easyeffects-6.1.1
index c4690f208037..ac24cbf51190 100644
--- a/metadata/md5-cache/media-sound/easyeffects-6.1.1
+++ b/metadata/md5-cache/media-sound/easyeffects-6.1.1
@@ -4,12 +4,12 @@ DEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_jso
 DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
 EAPI=7
 HOMEPAGE=https://github.com/wwmm/easyeffects
-IUSE=calf mda-lv2 zamaudio
+IUSE=calf +doc mda-lv2 zamaudio
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=GPL-3
-RDEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_json >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-3.0.6:3 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.31 sci-libs/fftw:3.0 >=gui-libs/gtk-4.2.1:4 gnome-extra/yelp >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) zamaudio? ( media-plugins/zam-plugins )
+RDEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_json >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-3.0.6:3 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.31 sci-libs/fftw:3.0 >=gui-libs/gtk-4.2.1:4 >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) mda-lv2? ( media-plugins/mda-lv2 ) zamaudio? ( media-plugins/zam-plugins )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wwmm/easyeffects/archive/v6.1.1.tar.gz -> easyeffects-6.1.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	493198f00f20d2ecf10552d2737f2f13	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7fd228f9aeb9425a9421206c97d6cb1f
+_md5_=e5ff3ffe6dabad314862c58b5399d70f
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1 b/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
index 37c1eb9bdd88..21c6cea8adc7 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
@@ -4,11 +4,11 @@ DEPEND=>=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.
 DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
 EAPI=7
 HOMEPAGE=https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy
-IUSE=bs2b calf rnnoise rubberband webrtc zamaudio
+IUSE=bs2b calf +doc rnnoise rubberband webrtc zamaudio
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=!media-sound/easyeffects >=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=media-libs/gstreamer-1.12.5:1.0 media-libs/gst-plugins-base >=media-libs/gst-plugins-bad-1.12.5:1.0 media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.24.2-r1 >=media-libs/zita-convolver-3.0.0 media-sound/pulseaudio >=x11-libs/gtk+-3.20:3 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) rnnoise? ( media-libs/rnnoise ) gnome-extra/yelp >=media-libs/gst-plugins-good-1.12.5:1.0 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-plugins/gst-plugins-ladspa-1.12.5:1.0 >=media-plugins/gst-plugins-lv2-1.12.5:1.0 >=media-plugins/gst-plugins-pulse-1.12.5:1.0 sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) rubberband? ( media-libs/rubberband[ladspa] ) webrtc? ( media-plugins/gst-plugins-webrtc ) zamaudio? ( media-plugins/zam-plugins )
+RDEPEND=!media-sound/easyeffects >=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=media-libs/gstreamer-1.12.5:1.0 media-libs/gst-plugins-base >=media-libs/gst-plugins-bad-1.12.5:1.0 media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.24.2-r1 >=media-libs/zita-convolver-3.0.0 media-sound/pulseaudio >=x11-libs/gtk+-3.20:3 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) rnnoise? ( media-libs/rnnoise ) >=media-libs/gst-plugins-good-1.12.5:1.0 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-plugins/gst-plugins-ladspa-1.12.5:1.0 >=media-plugins/gst-plugins-lv2-1.12.5:1.0 >=media-plugins/gst-plugins-pulse-1.12.5:1.0 sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) rubberband? ( media-libs/rubberband[ladspa] ) webrtc? ( media-plugins/gst-plugins-webrtc ) zamaudio? ( media-plugins/zam-plugins )
 SLOT=0
 SRC_URI=https://github.com/wwmm/easyeffects/archive/v4.8.5.tar.gz -> pulseeffects-4.8.5.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	493198f00f20d2ecf10552d2737f2f13	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ac94166cb4e49aa6c99f14781d95c9d4
+_md5_=9b9e6f552148fea160491f4c661cea12
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 807d6d581b93..0e59c56c9309 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/subtitleeditor-0.54.0_p5 b/metadata/md5-cache/media-video/subtitleeditor-0.54.0_p5
new file mode 100644
index 000000000000..8f9ca53a460b
--- /dev/null
+++ b/metadata/md5-cache/media-video/subtitleeditor-0.54.0_p5
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/intltool-0.40 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 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-text/enchant-2.2.0:2 app-text/iso-codes >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-cpp/gstreamermm-1.0:1.0= >=dev-cpp/libxmlpp-2.40:2.6 dev-libs/glib:2 >=dev-libs/libsigc++-2.6:2 media-libs/gst-plugins-base:1.0[X,pango] media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/gtk+:3 nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK+3 subtitle editing tool
+EAPI=7
+HOMEPAGE=https://kitone.github.io/subtitleeditor
+IUSE=debug nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-text/enchant-2.2.0:2 app-text/iso-codes >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-cpp/gstreamermm-1.0:1.0= >=dev-cpp/libxmlpp-2.40:2.6 dev-libs/glib:2 >=dev-libs/libsigc++-2.6:2 media-libs/gst-plugins-base:1.0[X,pango] media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/gtk+:3 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=https://github.com/kitone/subtitleeditor/releases/download/0.54.0_p5/subtitleeditor-0.54.0.tar.gz mirror://debian/pool/main/s/subtitleeditor/subtitleeditor_0.54.0-5.debian.tar.xz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c4b7c12bd5216de883a23f8a7c3cbe88
diff --git a/metadata/md5-cache/media-video/vdr-2.4.1-r3 b/metadata/md5-cache/media-video/vdr-2.4.1-r3
deleted file mode 100644
index 7ceb38e8347b..000000000000
--- a/metadata/md5-cache/media-video/vdr-2.4.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 >=virtual/linuxtv-dvb-headers-5.3
-DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
-EAPI=7
-HOMEPAGE=http://www.tvdr.de/
-IUSE=bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump pinplugin permashift systemd ttxtsubs verbose
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 dev-lang/perl media-tv/gentoo-vdr-scripts media-fonts/corefonts bidi? ( dev-libs/fribidi ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=pinplugin? ( !mainmenuhooks ) permashift? ( !naludump !pinplugin )
-SLOT=0
-SRC_URI=ftp://ftp.tvdr.de/vdr/vdr-2.4.1.tar.bz2 mainmenuhooks? ( http://vdr.websitec.de/download/vdr/vdr-2.4.1/vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 ) menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff ) naludump? ( http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff ) pinplugin? ( http://vdr.websitec.de/download/vdr/vdr-2.4.1/vdr-2.4.1_pinplugin.patch.bz2 ) ttxtsubs? ( http://vdr.websitec.de/download/vdr/vdr-2.4.1/vdr-2.4.0-ttxtsubs.patch.bz2 ) permashift? ( https://raw.githubusercontent.com/eikesauer/Permashift/master/vdr-2.4-patch-for-permashift.diff )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=10618c30c82613db5ed96a1e500e9cd3
diff --git a/metadata/md5-cache/media-video/vdr-2.4.6-r1 b/metadata/md5-cache/media-video/vdr-2.4.6-r1
deleted file mode 100644
index fe8e4c5a816b..000000000000
--- a/metadata/md5-cache/media-video/vdr-2.4.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 >=virtual/linuxtv-dvb-headers-5.3
-DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
-EAPI=7
-HOMEPAGE=http://www.tvdr.de/
-IUSE=bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 dev-lang/perl media-tv/gentoo-vdr-scripts media-fonts/corefonts bidi? ( dev-libs/fribidi ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=pinplugin? ( !mainmenuhooks ) permashift? ( !naludump !pinplugin )
-SLOT=0
-SRC_URI=ftp://ftp.tvdr.de/vdr/vdr-2.4.6.tar.bz2 mainmenuhooks? ( http://vdr.websitec.de/download/vdr/vdr-2.4.1/vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 ) menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff ) naludump? ( http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff ) pinplugin? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4.6_pinplugin.patch.bz2 ) ttxtsubs? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4.6_ttxtsubs_v2.patch.bz2 ) permashift? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4-patch-for-permashift.diff.bz2 )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3cfaccd599e174b4f3ad62eda31b1c42
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 598f0e019a8b..f39c71589e08 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/gnome-remote-desktop-40.2 b/metadata/md5-cache/net-misc/gnome-remote-desktop-40.2
new file mode 100644
index 000000000000..55bd02a02ea8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gnome-remote-desktop-40.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.57.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=x11-libs/cairo >=dev-libs/glib-2.68:2 >=media-video/pipewire-0.3.0:0/0.3 app-crypt/libsecret x11-libs/libnotify rdp? ( >=net-misc/freerdp-2.3:=[server] >=sys-fs/fuse-3.9.1 >=x11-libs/libxkbcommon-1.0.0 ) vnc? ( net-libs/libvncserver ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Remote desktop daemon for GNOME using pipewire
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-remote-desktop
+IUSE=+rdp +vnc
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=x11-libs/cairo >=dev-libs/glib-2.68:2 >=media-video/pipewire-0.3.0:0/0.3 app-crypt/libsecret x11-libs/libnotify rdp? ( >=net-misc/freerdp-2.3:=[server] >=sys-fs/fuse-3.9.1 >=x11-libs/libxkbcommon-1.0.0 ) vnc? ( net-libs/libvncserver ) x11-wm/mutter[screencast]
+REQUIRED_USE=|| ( rdp vnc )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-remote-desktop/40/gnome-remote-desktop-40.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	493198f00f20d2ecf10552d2737f2f13	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c20307a9cb734d29b31931be72325e54
diff --git a/metadata/md5-cache/net-misc/rygel-0.40.2 b/metadata/md5-cache/net-misc/rygel-0.40.2
new file mode 100644
index 000000000000..1f3c340ec81c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rygel-0.40.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) >=sys-devel/gettext-0.19.7 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.57.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gstreamer-1.12:1.0 >=media-libs/gst-plugins-base-1.12:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/gupnp-dlna-0.9.4:2.0= >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-1.1.0:0=[vala] >=net-libs/gupnp-1.1.0:0=[vala] >=net-libs/gupnp-av-0.12.8:= >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:3= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
+IUSE=gtk gtk-doc +introspection +sqlite tracker test transcode
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gstreamer-1.12:1.0 >=media-libs/gst-plugins-base-1.12:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/gupnp-dlna-0.9.4:2.0= >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-1.1.0:0=[vala] >=net-libs/gupnp-1.1.0:0=[vala] >=net-libs/gupnp-av-0.12.8:= >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:3= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/rygel/0.40/rygel-0.40.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	493198f00f20d2ecf10552d2737f2f13	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a6a4824b0ea8ca3c2157c95435395058
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 3daa0fbed580..137c1fedde78 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-2021.2 b/metadata/md5-cache/sci-chemistry/votca-csg-2021.2
new file mode 100644
index 000000000000..c2b54121ef82
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-2021.2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-text/txt2tags-2.5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-2021.2 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 )
+DESCRIPTION=Votca coarse-graining engine
+EAPI=7
+HOMEPAGE=https://www.votca.org/
+IUSE=examples extras +gromacs hdf5 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-2021.2 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/votca/csg/archive/v2021.2.tar.gz -> votca-csg-2021.2.tar.gz examples? ( https://github.com/votca/csg-tutorials/archive/v2021.2.tar.gz -> votca-csg-tutorials-2021.2.tar.gz )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	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	27f9a2f19502b925ac117bd657aa2979
+_md5_=36697845e114dda663872b4f39c17710
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-2021.2 b/metadata/md5-cache/sci-chemistry/votca-xtp-2021.2
new file mode 100644
index 000000000000..6ebd1350904e
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-2021.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-2021.2 sci-libs/hdf5[cxx] sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-2021.2
+DESCRIPTION=Votca excitation and charge properties module
+EAPI=7
+HOMEPAGE=https://www.votca.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-2021.2 sci-libs/hdf5[cxx] sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-2021.2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/votca/xtp/archive/v2021.2.tar.gz -> votca-xtp-2021.2.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	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	27f9a2f19502b925ac117bd657aa2979
+_md5_=8263546cfc693f6fe224a55c0a16dafd
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 277bf3d344f7..cc8a4bf049e5 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.18.0 b/metadata/md5-cache/sci-libs/cartopy-0.18.0
index 1a1cbd82176d..345a61d5bf3a 100644
--- a/metadata/md5-cache/sci-libs/cartopy-0.18.0
+++ b/metadata/md5-cache/sci-libs/cartopy-0.18.0
@@ -7,10 +7,10 @@ HOMEPAGE=https://scitools.org.uk/cartopy
 IUSE=test test python_targets_python3_8 python_targets_python3_9 test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-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(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/gdal[python,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(-)?]
+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(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/gdal[python,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 ) || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SciTools/cartopy/archive/v0.18.0.tar.gz -> cartopy-0.18.0.tar.gz
 _eclasses_=distutils-r1	39fb83ed394c172aad380c33a8de287e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=b4eb7db5024b53e92ffce239d123c478
+_md5_=bb97d5e88e71a039a996e32339e8828c
diff --git a/metadata/md5-cache/sci-libs/gmsh-4.6.0 b/metadata/md5-cache/sci-libs/gmsh-4.6.0
deleted file mode 100644
index cd323fd5b19b..000000000000
--- a/metadata/md5-cache/sci-libs/gmsh-4.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/fortran
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( virtual/jpeg:0 ) med? ( sci-libs/med[mpi] ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc[mpi=] ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) || ( dev-lang/python:3.8 ) virtual/pkgconfig python? ( dev-lang/swig:0 ) virtual/fortran
-DESCRIPTION=A three-dimensional finite element mesh generator
-EAPI=7
-HOMEPAGE=http://www.geuz.org/gmsh/
-IUSE=blas cgns examples jpeg med metis mpi netgen opencascade petsc png python X zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 free-noncomm
-RDEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( virtual/jpeg:0 ) med? ( sci-libs/med[mpi] ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc[mpi=] ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) virtual/fortran
-REQUIRED_USE=med? ( mpi )
-SLOT=0
-SRC_URI=http://www.geuz.org/gmsh/src/gmsh-4.6.0-source.tgz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7aab4ad7166c5b744252f47c566128e5
diff --git a/metadata/md5-cache/sci-libs/votca-tools-2021.2 b/metadata/md5-cache/sci-libs/votca-tools-2021.2
new file mode 100644
index 000000000000..5c910071197b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/votca-tools-2021.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0=
+DESCRIPTION=Votca tools library
+EAPI=7
+HOMEPAGE=https://www.votca.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/votca/tools/archive/v2021.2.tar.gz -> votca-tools-2021.2.tar.gz
+_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	27f9a2f19502b925ac117bd657aa2979
+_md5_=e2aff4c5560c697ca4cf6f895c72d32b
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 2ac23c32f7b0..d912ec724f18 100644
Binary files a/metadata/md5-cache/sci-physics/Manifest.gz and b/metadata/md5-cache/sci-physics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-physics/yoda-1.8.5 b/metadata/md5-cache/sci-physics/yoda-1.8.5
deleted file mode 100644
index 01abf278d541..000000000000
--- a/metadata/md5-cache/sci-physics/yoda-1.8.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=root? ( sci-physics/root:= )
-DESCRIPTION=Yet more Objects for (High Energy Physics) Data Analysis
-EAPI=7
-HOMEPAGE=https://yoda.hepforge.org/
-IUSE=root
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=root? ( sci-physics/root:= )
-SLOT=0/1.8.5
-SRC_URI=https://www.hepforge.org/archive/yoda/YODA-1.8.5.tar.bz2
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5b4d3541d09a7d903f50788b91a408ae
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 5a7e1e3e2aa0..7cd1092e4e42 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.67-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.67-r1
new file mode 100644
index 000000000000..748aeba4cf81
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.67-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.67
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.67 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.67
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-73.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-73.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.67-1.xpak -> gentoo-kernel-5.10.67-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cbd6a10587fe60af32bfea202e62c1d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.19-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.19-r1
new file mode 100644
index 000000000000..d9596e4e3eb5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.19-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.19
+RDEPEND=!sys-kernel/gentoo-kernel:5.13.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.19
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-21.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-21.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.19-1.xpak -> gentoo-kernel-5.13.19-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7d4f2fdcbbb8ee505fbc16b1b2e654c4
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index ab06bd9b143c..d575967157cf 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/libcap-2.56 b/metadata/md5-cache/sys-libs/libcap-2.58
similarity index 95%
rename from metadata/md5-cache/sys-libs/libcap-2.56
rename to metadata/md5-cache/sys-libs/libcap-2.58
index 84b5a7f7708b..7ac80e3415dc 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.56
+++ b/metadata/md5-cache/sys-libs/libcap-2.58
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=|| ( GPL-2 BSD )
 PDEPEND=pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.56.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.58.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6311225a9691db91292a7acf6cd52771
+_md5_=c7ca2ae488dd60a95ec4a5386d34c9f5
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 3d63f7f05a7c..8d1c72958dc2 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/pixman-0.40.0 b/metadata/md5-cache/x11-libs/pixman-0.40.0
index ced9d00e3a70..6a7155446740 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.40.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.40.0
@@ -4,9 +4,9 @@ DESCRIPTION=Low-level pixel manipulation routines
 EAPI=7
 HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
 IUSE=cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.40.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	493198f00f20d2ecf10552d2737f2f13	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9361bdf4d8a76c611b10824da1c2bce6
+_md5_=4216d1050effbec4e7392fa7b5dd8cab
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 81cde3a12f85..530c75c2c702 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14400 BLAKE2B 72bbfe918af64d5789a535336efe915a799a2a34c7041c149f3f65b48002f919fe38c72354e9cd71d1620cb21f011cbe9bf82a635da6518dc4238701194c683c SHA512 04fe229154bdfc55769cce1e84cb35300863ca5ef4622338ed4169ba3a2f9a97622a9657f9c4b8f81280ac33ef86aef93d8648950552ad9c26d21d2da7e43a65
-TIMESTAMP 2021-09-19T08:09:06Z
+TIMESTAMP 2021-09-19T17:09:10Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFG8CJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFHbrZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDO1hAAhcsJh7d6BPiTkxNgUBL6FyioptRDIzrs779GxxxSvBDXEEbTCsUqA+V9
-akg7AaztWF1N+rozWlV8ao6bfOCH8telaNtKkWtP/fx2aFHMsCAJLCCvNAESx0ya
-FFuGRR3gI3PjAVSXY5xpr3cTyRbKdZEh1abw9QXL+sLrgz8C6Ds31kPLsigQSN9E
-x7IdRPcL4soWFMRSZbpdjhfHYsmvErYcp5pSMMMhQIywTqaZIOll5RrJBxKZMDCx
-B20TI3PouioZpZDUCr4LlRyjGfsGyVgd/ruyiwNIjjrOew1bTdNHnS82SLIGNuY9
-PhcnLgdfnV9ja+U8f3RaNCfTt+5CN1ld01am2hOlEQ+r09uWf4T3DLEELOAE59PQ
-gUe8bK5Ms/NNc9HoeRLqqM/MJDaSva4Ph6BJIp/IYo61pBdO2tvm6yLcz7TIuvFu
-lXpft0EVqjJR/UCpLFxFYvqjpD8n04sAKRa4JygsI0gJvZbtyofK05TrzQbYzjA7
-2jfILbUEjKNEk1Qv3yHwjgdH64g8cMRnatTGiYkQH7cS8pjbV2VYRfUUIefV9OIx
-vd91262xP942tfpYtOuKWAFkPZ0arUwPQ9TpeSLdt5iSYBTtQ1xRyKVd0GnxJ6YM
-ckTJgMO3wyLddUwmAKLIFg2IMlJ8bCFRKtDWng57ItPYS33uRRM=
-=cOmq
+klALoA//ZCnind8SrUPIOdWLyBsh4+O7snvpsjykXPF2mxCcapt6F99XNx5AK0D6
+K1XiVb5dLAzTxYtUw5cjpVMIFlZQOmAR+drVG96UGZkkkzrSfGbQU/iyp8gtEqy3
+jdQMkEnL2eug1UvZUUS9kW+XnC4GAnpdP+CB6uYNmFUFjxslZZ+RtHNJi/hyX2B/
+2XZQWSUmIQYgakCxI6muDJpBSiuP2uGdTp8BTdS/rcFSnhygtOYmhfpvl1WaB2im
+3nE8dkrMFAroq3HlyFjR6+WtNUs9ADwYtb2p6qQVkgqewMfg3je1Pm67Rs1d9/rV
+BV+UcgYIlrkiZSpTvZGOYsZ3OjpDlrzdiAkYW3kJyfU49xeDmTzFnSbTwc+BEhwG
+3/zpoR/iHjtCaW61g+CVJpM8yKysVIVuUKuPl+jn+/ZtwnWsjsGQnJGrwrp8qAAs
+A+NoK3uw9pnt4TaW/zIWX+4yDebJB/kHSzhdaMrYks2YACmqJdshAizc9cEI5ynk
+MRpJc2tZGPwv44Nx2xjd62aU/QrX+/c4s2Iz9vYC0/kotv+ohFDiAwuCEW6igvwq
+KnMQnjHTWZzN0vVa0LiSUavH0jOHmnTfVjmRKakSnIQb8N5dDZu0IN+ZRBBOB+Xx
+atToQ/p4aHHuq4o6cB3l006PSG3LAcpRiGbv4E4c85z4DfWFv/w=
+=2j5L
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index aedfc9290e84..f6952f5e171d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Sep 2021 08:09:02 +0000
+Sun, 19 Sep 2021 17:09:06 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a485675f9893..06f338f63475 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Sep 19 08:09:02 AM UTC 2021
+Sun Sep 19 05:09:06 PM UTC 2021
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 82a87a7a8d3c..b171dc7d66c7 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -1010,8 +1010,6 @@
 2008290239 ./app-admin/kubectx/kubectx-0.9.1.ebuild
 2102212309 ./app-admin/lib_users/lib_users-0.14-r1.ebuild
 2106240739 ./app-admin/lib_users/lib_users-0.14-r2.ebuild
-2107180039 ./app-admin/lnav/lnav-0.8.5-r1.ebuild
-2107180039 ./app-admin/lnav/lnav-0.9.0-r2.ebuild
 2107180039 ./app-admin/lnav/lnav-0.9.0-r3.ebuild
 2109171009 ./app-admin/lnav/lnav-0.10.0-r1.ebuild
 2105281509 ./app-admin/logcheck/logcheck-1.3.23.ebuild
@@ -1133,8 +1131,8 @@
 2109080409 ./app-admin/salt/salt-3003.3.ebuild
 2103201639 ./app-admin/serf/serf-0.9.5.ebuild
 2107050640 ./app-admin/setools/setools-4.3.0.ebuild
-2109190939 ./app-admin/setools/setools-4.4.0-r1.ebuild
 2109190939 ./app-admin/setools/setools-9999.ebuild
+2109191639 ./app-admin/setools/setools-4.4.0-r2.ebuild
 2105092239 ./app-admin/socklog/socklog-2.1.0.ebuild
 1808150339 ./app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.39.ebuild
 1811071809 ./app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.40.ebuild
@@ -1458,9 +1456,6 @@
 2109101039 ./app-backup/deja-dup/deja-dup-42.8.ebuild
 2109162239 ./app-backup/deja-dup/deja-dup-42.7-r1.ebuild
 2104020239 ./app-benchmarks/bashmark/bashmark-0.6.2.ebuild
-1905211939 ./app-benchmarks/bonnie++/bonnie++-1.98.ebuild
-2012311940 ./app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
-2012311940 ./app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
 2109012139 ./app-benchmarks/bonnie++/bonnie++-2.00a.ebuild
 2004032241 ./app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
 2004301839 ./app-benchmarks/bootchart2/bootchart2-0.14.8-r1.ebuild
@@ -4449,7 +4444,7 @@
 2108140009 ./app-text/htmlmin/htmlmin-0.1.12.ebuild
 1807070109 ./app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
 2108020109 ./app-text/htmltidy/htmltidy-0.99.0.ebuild
-2109111011 ./app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+2109191609 ./app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
 2104161439 ./app-text/htp/htp-1.19.ebuild
 2101061709 ./app-text/hunspell/hunspell-1.7.0-r2.ebuild
 2108141739 ./app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -5300,43 +5295,37 @@
 2105091109 ./app-xemacs/xwem/xwem-1.27.ebuild
 2002112051 ./app-xemacs/zenirc/zenirc-1.16.ebuild
 2002112051 ./app-xemacs/zenirc/zenirc-1.18.ebuild
-1911032339 ./dev-ada/asis/asis-2019-r1.ebuild
-2106051639 ./dev-ada/aunit/aunit-2020.ebuild
-2107200939 ./dev-ada/aunit/aunit-2021.ebuild
-1910211009 ./dev-ada/aws/aws-2019-r1.ebuild
-2106042239 ./dev-ada/aws/aws-2018-r2.ebuild
+2109191339 ./dev-ada/asis/asis-2019-r1.ebuild
+2109191339 ./dev-ada/aunit/aunit-2020.ebuild
+2109191339 ./dev-ada/aunit/aunit-2021.ebuild
 2106051139 ./dev-ada/aws/aws-2020-r1.ebuild
 2106051139 ./dev-ada/aws/aws-2020.ebuild
 2107200939 ./dev-ada/aws/aws-2021.ebuild
-2104101709 ./dev-ada/gnat-suite-bin/gnat-suite-bin-2017-r1.ebuild
-2104101709 ./dev-ada/gnat-suite-bin/gnat-suite-bin-2018-r1.ebuild
-2109152039 ./dev-ada/gnat_util/gnat_util-2017-r2.ebuild
-2109152039 ./dev-ada/gnat_util/gnat_util-2018-r2.ebuild
 2109152039 ./dev-ada/gnat_util/gnat_util-2019-r1.ebuild
-2109152239 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
-2109152239 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
-2109152239 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
-2106042239 ./dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
-2106042239 ./dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+2109191339 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
+2109191339 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
+2109191339 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
 2107200939 ./dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
-2106051639 ./dev-ada/gnatmem/gnatmem-2019-r1.ebuild
-2106051639 ./dev-ada/gnatmem/gnatmem-2020.ebuild
-2107200939 ./dev-ada/gnatmem/gnatmem-2021.ebuild
-2109152239 ./dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild
-2109152239 ./dev-ada/gnatsymbolize/gnatsymbolize-2020.ebuild
-2109152239 ./dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
-2109152309 ./dev-ada/gprbuild/gprbuild-2020-r1.ebuild
-2109152309 ./dev-ada/gprbuild/gprbuild-2020.ebuild
+2109191609 ./dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
+2109191609 ./dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+2109191609 ./dev-ada/gnatmem/gnatmem-2019-r1.ebuild
+2109191609 ./dev-ada/gnatmem/gnatmem-2020.ebuild
+2109191609 ./dev-ada/gnatmem/gnatmem-2021.ebuild
+2109191609 ./dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild
+2109191609 ./dev-ada/gnatsymbolize/gnatsymbolize-2020.ebuild
+2109191609 ./dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
 2109152309 ./dev-ada/gprbuild/gprbuild-2021-r1.ebuild
-2106050039 ./dev-ada/gtkada/gtkada-2019-r1.ebuild
-2106050039 ./dev-ada/gtkada/gtkada-2019-r2.ebuild
-2106050039 ./dev-ada/gtkada/gtkada-2020.ebuild
-2107200939 ./dev-ada/gtkada/gtkada-2021.ebuild
-2109152309 ./dev-ada/libgpr/libgpr-2020-r1.ebuild
-2109152309 ./dev-ada/libgpr/libgpr-2020.ebuild
+2109191639 ./dev-ada/gprbuild/gprbuild-2020-r1.ebuild
+2109191639 ./dev-ada/gprbuild/gprbuild-2020.ebuild
+2109191609 ./dev-ada/gtkada/gtkada-2019-r1.ebuild
+2109191609 ./dev-ada/gtkada/gtkada-2019-r2.ebuild
+2109191609 ./dev-ada/gtkada/gtkada-2020.ebuild
+2109191609 ./dev-ada/gtkada/gtkada-2021.ebuild
 2109152309 ./dev-ada/libgpr/libgpr-2021.ebuild
-2106051639 ./dev-ada/xmlada/xmlada-2020.ebuild
-2106251009 ./dev-ada/xmlada/xmlada-2021-r1.ebuild
+2109191639 ./dev-ada/libgpr/libgpr-2020-r1.ebuild
+2109191639 ./dev-ada/libgpr/libgpr-2020.ebuild
+2109191639 ./dev-ada/xmlada/xmlada-2020.ebuild
+2109191639 ./dev-ada/xmlada/xmlada-2021-r1.ebuild
 2107100039 ./dev-cpp/ETL/ETL-1.4.1.ebuild
 2009281609 ./dev-cpp/aixlog/aixlog-9999.ebuild
 2103021509 ./dev-cpp/aixlog/aixlog-1.5.0.ebuild
@@ -5526,11 +5515,6 @@
 2105031139 ./dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
 2105031139 ./dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
 2105031139 ./dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
-2105031139 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild
-2105031139 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild
-2105031139 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild
-2105031139 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
-2105031139 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild
 2105152109 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
 2105241609 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
 2108042239 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.26.ebuild
@@ -7759,7 +7743,7 @@
 2106190039 ./dev-libs/foma/foma-0.9.18-r1.ebuild
 2101130309 ./dev-libs/freexl/freexl-1.0.5.ebuild
 2108150239 ./dev-libs/freexl/freexl-1.0.6.ebuild
-2104300510 ./dev-libs/fribidi/fribidi-1.0.10.ebuild
+2109191609 ./dev-libs/fribidi/fribidi-1.0.10.ebuild
 2012212109 ./dev-libs/fstrm/fstrm-0.6.0.ebuild
 2108082309 ./dev-libs/fstrm/fstrm-0.6.1.ebuild
 2108120640 ./dev-libs/gdl/gdl-3.34.0.ebuild
@@ -7785,10 +7769,10 @@
 2104161439 ./dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
 2104161439 ./dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
 2104161439 ./dev-libs/go-fuse/go-fuse-9999.ebuild
-2105312109 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild
-2109181939 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
-2107172139 ./dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
-2109181939 ./dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
+2109191609 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild
+2109191609 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
+2109191609 ./dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
+2109191609 ./dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
 2108271839 ./dev-libs/gom/gom-0.4.ebuild
 2103070009 ./dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r2.ebuild
 2103070009 ./dev-libs/gost-engine/gost-engine-9999.ebuild
@@ -11881,7 +11865,7 @@
 2108260809 ./dev-python/gast/gast-0.5.2.ebuild
 2101310343 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5-r1.ebuild
 2103030039 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.ebuild
-2107130139 ./dev-python/genshi/genshi-0.7.5.ebuild
+2109191809 ./dev-python/genshi/genshi-0.7.5.ebuild
 2105062209 ./dev-python/genty/genty-1.3.2-r1.ebuild
 2106051709 ./dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
 2103040739 ./dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
@@ -12138,7 +12122,7 @@
 2108091239 ./dev-python/mando/mando-0.6.4-r1.ebuild
 2105311539 ./dev-python/manuel/manuel-1.10.1.ebuild
 2103190739 ./dev-python/markdown/markdown-2.6.11.ebuild
-2106052209 ./dev-python/markdown/markdown-3.3.4.ebuild
+2109191609 ./dev-python/markdown/markdown-3.3.4.ebuild
 2109182039 ./dev-python/markdown2/markdown2-2.4.1.ebuild
 2107160039 ./dev-python/markups/markups-3.1.1.ebuild
 2109091909 ./dev-python/markups/markups-3.1.2.ebuild
@@ -12659,7 +12643,7 @@
 2108121509 ./dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
 2108121509 ./dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
 2102140039 ./dev-python/pythondialog/pythondialog-3.5.1.ebuild
-2108020109 ./dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
+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
 2105071439 ./dev-python/pytrie/pytrie-0.4.0.ebuild
@@ -12870,7 +12854,7 @@
 2108181609 ./dev-python/stripe/stripe-2.60.0.ebuild
 2107191739 ./dev-python/subunit/subunit-1.4.0.ebuild
 2101310343 ./dev-python/suds/suds-0.8.4.ebuild
-2107250409 ./dev-python/sure/sure-2.0.0.ebuild
+2109191909 ./dev-python/sure/sure-2.0.0.ebuild
 2108250839 ./dev-python/svg-path/svg-path-4.1.ebuild
 2102280109 ./dev-python/svgwrite/svgwrite-1.4.ebuild
 2106052139 ./dev-python/svgwrite/svgwrite-1.4.1.ebuild
@@ -13444,6 +13428,7 @@
 2109130209 ./dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
 2108241009 ./dev-python/aesara/aesara-2.2.1.ebuild
 2108261039 ./dev-python/aesara/aesara-2.1.3.ebuild
+2109191609 ./dev-python/aesara/aesara-2.2.2.ebuild
 2108240209 ./dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild
 2107290309 ./dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
 2105132239 ./dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
@@ -13714,7 +13699,6 @@
 2107250309 ./dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild
 2108262209 ./dev-qt/qtwayland/qtwayland-5.15.2-r11.ebuild
 2109082009 ./dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild
-2108261510 ./dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
 2109190739 ./dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
 2104190739 ./dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
 2108101209 ./dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild
@@ -17804,6 +17788,7 @@
 1805012309 ./games-puzzle/hangman/hangman-0.9.2-r1.ebuild
 2005211309 ./games-puzzle/hexalate/hexalate-1.1.6.ebuild
 2107101909 ./games-puzzle/hitori/hitori-3.38.2.ebuild
+2109191239 ./games-puzzle/hitori/hitori-3.38.3.ebuild
 1805012309 ./games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
 2109051839 ./games-puzzle/ksokoban/ksokoban-0.5.0_pre20210905.ebuild
 2109051239 ./games-puzzle/ksokoban/ksokoban-9999.ebuild
@@ -18206,9 +18191,9 @@
 2108131939 ./gnome-extra/gnome-software/gnome-software-40.4.ebuild
 2105291209 ./gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild
 2107261040 ./gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
-2105291209 ./gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild
 2108150439 ./gnome-extra/gnome-user-docs/gnome-user-docs-40.3.ebuild
 2108170939 ./gnome-extra/gnome-user-docs/gnome-user-docs-40.4.ebuild
+2109191239 ./gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild
 2105090839 ./gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
 2003261841 ./gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
 2106070939 ./gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
@@ -19775,8 +19760,8 @@
 2101310343 ./media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
 2102232309 ./media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
 2002182339 ./media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
-2009071609 ./media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
-2104180939 ./media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
+2109191439 ./media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
+2109191439 ./media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
 1904182109 ./media-gfx/openclipart/openclipart-0.20.ebuild
 2008251339 ./media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
 1912110241 ./media-gfx/openmesh/openmesh-7.1.ebuild
@@ -20032,8 +20017,8 @@
 2107202009 ./media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
 2108191409 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
 2108210309 ./media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
-2109071739 ./media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
-2109181709 ./media-libs/harfbuzz/harfbuzz-3.0.0.ebuild
+2109191609 ./media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
+2109191609 ./media-libs/harfbuzz/harfbuzz-3.0.0.ebuild
 1911150539 ./media-libs/icc-profiles-basiccolor-printing2009/icc-profiles-basiccolor-printing2009-1.2.0.ebuild
 1911150609 ./media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild
 2011261339 ./media-libs/icclib/icclib-2.14.ebuild
@@ -20129,7 +20114,7 @@
 2109130039 ./media-libs/libexif/libexif-0.6.23.ebuild
 2108292209 ./media-libs/libextractor/libextractor-1.9-r2.ebuild
 2102250309 ./media-libs/libfame/libfame-0.9.1-r3.ebuild
-2108181309 ./media-libs/libffado/libffado-2.4.4-r1.ebuild
+2109191539 ./media-libs/libffado/libffado-2.4.4-r1.ebuild
 2011142339 ./media-libs/libfishsound/libfishsound-1.0.0.ebuild
 2106250439 ./media-libs/libfpx/libfpx-1.3.1_p10.ebuild
 1912110241 ./media-libs/libfreehand/libfreehand-0.1.2.ebuild
@@ -20150,8 +20135,8 @@
 2102222209 ./media-libs/libharu/libharu-2.3.0-r2.ebuild
 2006222209 ./media-libs/libhdhomerun/libhdhomerun-20190621.ebuild
 2108020539 ./media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
-2105061739 ./media-libs/libheif/libheif-9999.ebuild
-2109070609 ./media-libs/libheif/libheif-1.12.0.ebuild
+2109191139 ./media-libs/libheif/libheif-1.12.0-r1.ebuild
+2109191139 ./media-libs/libheif/libheif-9999.ebuild
 1907140209 ./media-libs/libicns/libicns-0.8.1-r1.ebuild
 2105271739 ./media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
 2108161209 ./media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
@@ -21078,7 +21063,6 @@
 2107010909 ./media-radio/fldigi/fldigi-4.1.18.ebuild
 2107010909 ./media-radio/fldigi/fldigi-4.1.19.ebuild
 2108061639 ./media-radio/fldigi/fldigi-4.1.20.ebuild
-2104161439 ./media-radio/flmsg/flmsg-4.0.17.ebuild
 2106172209 ./media-radio/flmsg/flmsg-4.0.17-r1.ebuild
 2103282139 ./media-radio/flrig/flrig-1.3.54.ebuild
 2106131939 ./media-radio/flrig/flrig-1.4.0.ebuild
@@ -21405,7 +21389,7 @@
 2104172339 ./media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
 2107310240 ./media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
 2108182339 ./media-sound/pulseaudio/pulseaudio-15.0.ebuild
-2108220709 ./media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
+2109191309 ./media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
 2008082009 ./media-sound/pwavecat/pwavecat-0.4.5.ebuild
 2010091209 ./media-sound/qastools/qastools-0.23.0.ebuild
 2102091239 ./media-sound/qjackctl/qjackctl-9999.ebuild
@@ -21555,7 +21539,7 @@
 2108090439 ./media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
 2108091609 ./media-sound/easyeffects/easyeffects-6.0.3-r1.ebuild
 2109072209 ./media-sound/easyeffects/easyeffects-6.1.0.ebuild
-2109181409 ./media-sound/easyeffects/easyeffects-6.1.1.ebuild
+2109191309 ./media-sound/easyeffects/easyeffects-6.1.1.ebuild
 2108190439 ./media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
 2101060224 ./media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
 2101060224 ./media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
@@ -21760,6 +21744,7 @@
 1805272138 ./media-video/subsync/subsync-0.0.1.ebuild
 2012252309 ./media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
 2102160539 ./media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild
+2109191539 ./media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
 2102141409 ./media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
 2002230040 ./media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild
 1807180009 ./media-video/super_demux/super_demux-0.3.ebuild
@@ -21781,8 +21766,6 @@
 2109061639 ./media-video/vcsi/vcsi-7.0.13.ebuild
 2106301339 ./media-video/vdr/vdr-2.2.0-r6.ebuild
 2106301339 ./media-video/vdr/vdr-2.2.0-r7.ebuild
-2106301339 ./media-video/vdr/vdr-2.4.1-r3.ebuild
-2106301339 ./media-video/vdr/vdr-2.4.6-r1.ebuild
 2107171739 ./media-video/vdr/vdr-2.4.7-r1.ebuild
 2004261539 ./media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
 2008271539 ./media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild
@@ -23231,6 +23214,7 @@
 2006111139 ./net-misc/getdate/getdate-1.2-r2.ebuild
 2106070939 ./net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
 2105032239 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1.ebuild
+2109191239 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild
 2109011509 ./net-misc/gns3-gui/gns3-gui-2.2.24.ebuild
 2109190009 ./net-misc/gns3-gui/gns3-gui-2.2.25.ebuild
 2109011509 ./net-misc/gns3-server/gns3-server-2.2.24.ebuild
@@ -23461,6 +23445,7 @@
 1702282250 ./net-misc/rwbs/rwbs-0.27-r2.ebuild
 2106302209 ./net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild
 2108050039 ./net-misc/rygel/rygel-0.40.1.ebuild
+2109191239 ./net-misc/rygel/rygel-0.40.2.ebuild
 2104031909 ./net-misc/s3cmd/s3cmd-2.1.0.ebuild
 2107222109 ./net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
 2012290439 ./net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
@@ -24579,6 +24564,7 @@
 2103192309 ./sci-chemistry/votca-csg/votca-csg-9999.ebuild
 2103281309 ./sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild
 2107190239 ./sci-chemistry/votca-csg/votca-csg-2021.1.ebuild
+2109191839 ./sci-chemistry/votca-csg/votca-csg-2021.2.ebuild
 2102150339 ./sci-chemistry/votca-csgapps/votca-csgapps-1.5.1.ebuild
 2103281309 ./sci-chemistry/votca-csgapps/votca-csgapps-1.6.4.ebuild
 2106030210 ./sci-chemistry/votca-ctp/votca-ctp-1.5.1-r1.ebuild
@@ -24586,6 +24572,7 @@
 2103281309 ./sci-chemistry/votca-xtp/votca-xtp-1.6.4.ebuild
 2107190239 ./sci-chemistry/votca-xtp/votca-xtp-2021.1.ebuild
 2107190239 ./sci-chemistry/votca-xtp/votca-xtp-9999.ebuild
+2109191839 ./sci-chemistry/votca-xtp/votca-xtp-2021.2.ebuild
 2104192239 ./sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild
 1808262139 ./sci-chemistry/xds-bin/xds-bin-20170930.ebuild
 1912310209 ./sci-chemistry/xyza2pipe/xyza2pipe-20121001.ebuild
@@ -24878,7 +24865,6 @@
 2108150239 ./sci-libs/geos/geos-3.9.1.ebuild
 2103270609 ./sci-libs/gerris/gerris-20131206-r1.ebuild
 2102191609 ./sci-libs/getdata/getdata-0.9.0-r3.ebuild
-2104092139 ./sci-libs/gmsh/gmsh-4.6.0.ebuild
 2106200739 ./sci-libs/gmsh/gmsh-4.8.4.ebuild
 2104130239 ./sci-libs/gsl/gsl-2.5-r1.ebuild
 2105252209 ./sci-libs/gsl/gsl-1.16.ebuild
@@ -25077,6 +25063,7 @@
 2104161439 ./sci-libs/votca-tools/votca-tools-1.5.1.ebuild
 2107190239 ./sci-libs/votca-tools/votca-tools-2021.1.ebuild
 2107190239 ./sci-libs/votca-tools/votca-tools-9999.ebuild
+2109191839 ./sci-libs/votca-tools/votca-tools-2021.2.ebuild
 2107172140 ./sci-libs/vtk/vtk-8.2.0-r4.ebuild
 2109051309 ./sci-libs/vtk/vtk-9.0.3.ebuild
 2102222209 ./sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
@@ -25093,7 +25080,7 @@
 2101310343 ./sci-libs/eccodes/eccodes-2.18.0.ebuild
 2003142039 ./sci-libs/spglib/spglib-1.14.1.ebuild
 2105292209 ./sci-libs/brial/brial-1.2.10.ebuild
-2012191809 ./sci-libs/cartopy/cartopy-0.18.0.ebuild
+2109191839 ./sci-libs/cartopy/cartopy-0.18.0.ebuild
 2108170539 ./sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
 2102150339 ./sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
 2102150339 ./sci-libs/ginkgo/ginkgo-9999.ebuild
@@ -25317,7 +25304,6 @@
 2109021839 ./sci-physics/vgm/vgm-4.8-r1.ebuild
 2109021839 ./sci-physics/vgm/vgm-4.9-r1.ebuild
 2102191639 ./sci-physics/xfoil/xfoil-6.99.ebuild
-2102140209 ./sci-physics/yoda/yoda-1.8.5.ebuild
 2106150139 ./sci-physics/yoda/yoda-1.9.0.ebuild
 2106290046 ./sci-physics/vmc/vmc-1.0_p3-r1.ebuild
 2106290046 ./sci-physics/vmc/vmc-9999.ebuild
@@ -27704,6 +27690,8 @@
 2109182309 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.67.ebuild
 2109182309 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.19.ebuild
 2109190009 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.6.ebuild
+2109191209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.67-r1.ebuild
+2109191209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.19-r1.ebuild
 2107210009 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.12.19.ebuild
 2108262240 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.13.13.ebuild
 2108280110 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.60.ebuild
@@ -27809,8 +27797,8 @@
 2108031409 ./sys-libs/libblockdev/libblockdev-2.25.ebuild
 2105262139 ./sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild
 2108170709 ./sys-libs/libcap/libcap-2.49-r1.ebuild
-2109051309 ./sys-libs/libcap/libcap-2.56.ebuild
 2109120310 ./sys-libs/libcap/libcap-2.57.ebuild
+2109191139 ./sys-libs/libcap/libcap-2.58.ebuild
 2008291639 ./sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
 2104221439 ./sys-libs/libcxx/libcxx-10.0.1.ebuild
 2104221439 ./sys-libs/libcxx/libcxx-11.1.0.ebuild
@@ -28968,8 +28956,8 @@
 2108221840 ./x11-libs/pango/pango-1.48.7-r1.ebuild
 2109112040 ./x11-libs/pango/pango-1.48.10.ebuild
 2109130009 ./x11-libs/pango/pango-1.48.5-r1.ebuild
-2106040440 ./x11-libs/pixman/pixman-0.40.0.ebuild
 2106040440 ./x11-libs/pixman/pixman-9999.ebuild
+2109191609 ./x11-libs/pixman/pixman-0.40.0.ebuild
 2107090610 ./x11-libs/qscintilla/qscintilla-2.13.0.ebuild
 2108031409 ./x11-libs/qscintilla/qscintilla-2.11.6.ebuild
 2103020539 ./x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
@@ -30985,8 +30973,6 @@
 2109040224 metadata/md5-cache/app-admin/keepassxc-2.6.6
 2109040224 metadata/md5-cache/app-admin/keepassxc-9999
 2109040224 metadata/md5-cache/app-admin/killproc-2.13-r1
-2109040224 metadata/md5-cache/app-admin/lnav-0.8.5-r1
-2109040224 metadata/md5-cache/app-admin/lnav-0.9.0-r2
 2109040224 metadata/md5-cache/app-admin/lnav-0.9.0-r3
 2109040224 metadata/md5-cache/app-admin/logmon-0.4.4-r1
 2109040224 metadata/md5-cache/app-admin/logsentry-1.1.1-r2
@@ -31209,9 +31195,9 @@
 2109180109 metadata/md5-cache/app-admin/puppetserver-7.4.0
 2109170139 metadata/md5-cache/app-admin/sudo-1.9.8_p1
 2109170139 metadata/md5-cache/app-admin/vault-1.8.2
-2109190939 metadata/md5-cache/app-admin/Manifest.gz
-2109190939 metadata/md5-cache/app-admin/setools-4.4.0-r1
 2109190939 metadata/md5-cache/app-admin/setools-9999
+2109192009 metadata/md5-cache/app-admin/Manifest.gz
+2109191639 metadata/md5-cache/app-admin/setools-4.4.0-r2
 2109040224 metadata/md5-cache/app-antivirus/clamav-0.103.2
 2109040224 metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
 2109142114 metadata/md5-cache/app-antivirus/Manifest.gz
@@ -31436,7 +31422,6 @@
 2109162239 metadata/md5-cache/app-backup/Manifest.gz
 2109162239 metadata/md5-cache/app-backup/consul-backinator-1.6.6
 2109162239 metadata/md5-cache/app-backup/deja-dup-42.7-r1
-1905211939 metadata/md5-cache/app-benchmarks/bonnie++-1.98
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 1910290939 metadata/md5-cache/app-benchmarks/geekbench-2.4.2
 1910290939 metadata/md5-cache/app-benchmarks/geekbench-2.4.3
@@ -31444,8 +31429,6 @@
 1910290939 metadata/md5-cache/app-benchmarks/geekbench-4.4.1
 2008091909 metadata/md5-cache/app-benchmarks/cpuburn-1.4a-r3
 2008091909 metadata/md5-cache/app-benchmarks/stress-1.0.4-r2
-2012311940 metadata/md5-cache/app-benchmarks/bonnie++-1.97.2
-2012311940 metadata/md5-cache/app-benchmarks/bonnie++-1.97.3
 2106030139 metadata/md5-cache/app-benchmarks/geekbench-5.4.1
 2109012139 metadata/md5-cache/app-benchmarks/bonnie++-2.00a
 2109040224 metadata/md5-cache/app-benchmarks/bashmark-0.6.2
@@ -31475,8 +31458,8 @@
 2109142114 metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
 2109150309 metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1
 2109171809 metadata/md5-cache/app-benchmarks/tiobench-0.5.0
-2109190139 metadata/md5-cache/app-benchmarks/Manifest.gz
 2109190139 metadata/md5-cache/app-benchmarks/stress-ng-0.13.03
+2109191609 metadata/md5-cache/app-benchmarks/Manifest.gz
 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
@@ -34635,7 +34618,6 @@
 2109110040 metadata/md5-cache/app-text/sword-modules-2.5
 2109110940 metadata/md5-cache/app-text/vgrep-2.5.1
 2109110010 metadata/md5-cache/app-text/xchm-1.32
-2109121040 metadata/md5-cache/app-text/htmltidy-5.8.0-r1
 2109121040 metadata/md5-cache/app-text/hyperestraier-1.4.13
 2109121040 metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19
 2109121040 metadata/md5-cache/app-text/ronn-0.7.3-r4
@@ -34723,9 +34705,10 @@
 2109142114 metadata/md5-cache/app-text/zathura-ps-9999
 2109180809 metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1
 2109181709 metadata/md5-cache/app-text/po4a-0.64
-2109182309 metadata/md5-cache/app-text/Manifest.gz
 2109182209 metadata/md5-cache/app-text/libmwaw-0.3.20
 2109182309 metadata/md5-cache/app-text/po4a-0.63-r1
+2109191609 metadata/md5-cache/app-text/Manifest.gz
+2109191609 metadata/md5-cache/app-text/htmltidy-5.8.0-r1
 2106210056 metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
 2106210056 metadata/md5-cache/app-vim/vim-spell-da-20060116-r1
 2106210056 metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
@@ -35302,44 +35285,38 @@
 2106210056 metadata/md5-cache/app-xemacs/zenirc-1.18
 2107122209 metadata/md5-cache/app-xemacs/Manifest.gz
 2107122209 metadata/md5-cache/app-xemacs/ebuild-mode-1.53
-2104101709 metadata/md5-cache/dev-ada/gnat-suite-bin-2017-r1
-2104101709 metadata/md5-cache/dev-ada/gnat-suite-bin-2018-r1
-2106210925 metadata/md5-cache/dev-ada/asis-2019-r1
-2106210925 metadata/md5-cache/dev-ada/aunit-2020
-2106210925 metadata/md5-cache/dev-ada/aws-2018-r2
-2106210925 metadata/md5-cache/dev-ada/aws-2019-r1
-2106210925 metadata/md5-cache/dev-ada/aws-2020
-2106210925 metadata/md5-cache/dev-ada/aws-2020-r1
-2106210925 metadata/md5-cache/dev-ada/gnatcoll-core-2020
-2106210925 metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1
-2106210925 metadata/md5-cache/dev-ada/xmlada-2020
-2106251009 metadata/md5-cache/dev-ada/xmlada-2021-r1
-2107200940 metadata/md5-cache/dev-ada/aunit-2021
-2107200940 metadata/md5-cache/dev-ada/aws-2021
-2107200940 metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1
-2109040224 metadata/md5-cache/dev-ada/gnatmem-2019-r1
-2109040224 metadata/md5-cache/dev-ada/gnatmem-2020
-2109040224 metadata/md5-cache/dev-ada/gnatmem-2021
-2109040224 metadata/md5-cache/dev-ada/gtkada-2019-r1
-2109040224 metadata/md5-cache/dev-ada/gtkada-2019-r2
-2109040224 metadata/md5-cache/dev-ada/gtkada-2020
-2109040224 metadata/md5-cache/dev-ada/gtkada-2021
-2109152309 metadata/md5-cache/dev-ada/Manifest.gz
-2109152039 metadata/md5-cache/dev-ada/gnat_util-2017-r2
-2109152039 metadata/md5-cache/dev-ada/gnat_util-2018-r2
-2109152039 metadata/md5-cache/dev-ada/gnat_util-2019-r1
-2109152239 metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1
-2109152239 metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2
-2109152239 metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
-2109152239 metadata/md5-cache/dev-ada/gnatsymbolize-2019-r1
-2109152239 metadata/md5-cache/dev-ada/gnatsymbolize-2020
-2109152239 metadata/md5-cache/dev-ada/gnatsymbolize-2021
-2109152309 metadata/md5-cache/dev-ada/gprbuild-2020
-2109152309 metadata/md5-cache/dev-ada/gprbuild-2020-r1
-2109152309 metadata/md5-cache/dev-ada/gprbuild-2021-r1
-2109152309 metadata/md5-cache/dev-ada/libgpr-2020
-2109152309 metadata/md5-cache/dev-ada/libgpr-2020-r1
-2109152309 metadata/md5-cache/dev-ada/libgpr-2021
+2109191839 metadata/md5-cache/dev-ada/Manifest.gz
+2109191639 metadata/md5-cache/dev-ada/asis-2019-r1
+2109191639 metadata/md5-cache/dev-ada/aunit-2020
+2109191639 metadata/md5-cache/dev-ada/aunit-2021
+2109191639 metadata/md5-cache/dev-ada/aws-2020
+2109191639 metadata/md5-cache/dev-ada/aws-2020-r1
+2109191639 metadata/md5-cache/dev-ada/aws-2021
+2109191639 metadata/md5-cache/dev-ada/gnat_util-2019-r1
+2109191639 metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1
+2109191639 metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2
+2109191639 metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
+2109191639 metadata/md5-cache/dev-ada/gnatcoll-core-2020
+2109191639 metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1
+2109191639 metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1
+2109191639 metadata/md5-cache/dev-ada/gnatmem-2019-r1
+2109191639 metadata/md5-cache/dev-ada/gnatmem-2020
+2109191639 metadata/md5-cache/dev-ada/gnatmem-2021
+2109191639 metadata/md5-cache/dev-ada/gnatsymbolize-2019-r1
+2109191639 metadata/md5-cache/dev-ada/gnatsymbolize-2020
+2109191639 metadata/md5-cache/dev-ada/gnatsymbolize-2021
+2109191639 metadata/md5-cache/dev-ada/gprbuild-2020
+2109191639 metadata/md5-cache/dev-ada/gprbuild-2020-r1
+2109191639 metadata/md5-cache/dev-ada/gprbuild-2021-r1
+2109191639 metadata/md5-cache/dev-ada/gtkada-2019-r1
+2109191639 metadata/md5-cache/dev-ada/gtkada-2019-r2
+2109191639 metadata/md5-cache/dev-ada/gtkada-2020
+2109191639 metadata/md5-cache/dev-ada/gtkada-2021
+2109191639 metadata/md5-cache/dev-ada/libgpr-2020
+2109191639 metadata/md5-cache/dev-ada/libgpr-2020-r1
+2109191639 metadata/md5-cache/dev-ada/libgpr-2021
+2109191639 metadata/md5-cache/dev-ada/xmlada-2020
+2109191639 metadata/md5-cache/dev-ada/xmlada-2021-r1
 1702282310 metadata/md5-cache/dev-cpp/pngpp-0.2.9
 2004032241 metadata/md5-cache/dev-cpp/asio-1.10.8
 2102171309 metadata/md5-cache/dev-cpp/random123-1.13.2
@@ -35548,11 +35525,6 @@
 2109040224 metadata/md5-cache/dev-db/mysql-cluster-7.3.22
 2109040224 metadata/md5-cache/dev-db/mysql-cluster-7.4.21
 2109040224 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12-r1
-2109040224 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.19
-2109040224 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.20
-2109040224 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.21
-2109040224 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.22
-2109040224 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.23
 2109040224 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.24
 2109040224 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.25
 2109040224 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.26
@@ -35715,7 +35687,7 @@
 2109181239 metadata/md5-cache/dev-db/citus-10.1.3
 2109181239 metadata/md5-cache/dev-db/citus-10.2.0
 2109181239 metadata/md5-cache/dev-db/citus-9.5.8
-2109191039 metadata/md5-cache/dev-db/Manifest.gz
+2109191609 metadata/md5-cache/dev-db/Manifest.gz
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2106290046 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.301
@@ -37644,11 +37616,11 @@
 2109150309 metadata/md5-cache/dev-lang/mono-6.12.0.122
 2109152309 metadata/md5-cache/dev-lang/ocaml-4.05.0-r7
 2109152309 metadata/md5-cache/dev-lang/ocaml-4.05.0-r8
-2109152309 metadata/md5-cache/dev-lang/spark-2021
-2109190739 metadata/md5-cache/dev-lang/Manifest.gz
 2109190639 metadata/md5-cache/dev-lang/ispc-1.16.0
 2109190739 metadata/md5-cache/dev-lang/perl-5.34.0-r2
 2109182009 metadata/md5-cache/dev-lang/python-3.9.6_p2
+2109191639 metadata/md5-cache/dev-lang/Manifest.gz
+2109191639 metadata/md5-cache/dev-lang/spark-2021
 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
@@ -37732,7 +37704,6 @@
 2106231354 metadata/md5-cache/dev-libs/gnulib-9999-r1
 2106231354 metadata/md5-cache/dev-libs/go-fuse-9999
 2106231354 metadata/md5-cache/dev-libs/libmowgli-9999
-2107021845 metadata/md5-cache/dev-libs/gobject-introspection-common-1.68.0
 2107021845 metadata/md5-cache/dev-libs/vala-common-0.52.3
 2107180040 metadata/md5-cache/dev-libs/cdk-5.0.20160131-r1
 2107210239 metadata/md5-cache/dev-libs/libp11-0.4.11-r1
@@ -37842,7 +37813,6 @@
 2109040224 metadata/md5-cache/dev-libs/ffcall-2.1
 2109040224 metadata/md5-cache/dev-libs/flatbuffers-1.12.0
 2109040224 metadata/md5-cache/dev-libs/foma-0.9.18-r1
-2109040224 metadata/md5-cache/dev-libs/fribidi-1.0.10
 2109040224 metadata/md5-cache/dev-libs/fstrm-0.6.0
 2109040224 metadata/md5-cache/dev-libs/fstrm-0.6.1
 2109040224 metadata/md5-cache/dev-libs/gdl-3.34.0
@@ -38376,7 +38346,6 @@
 2109142114 metadata/md5-cache/dev-libs/gjs-1.68.1-r1
 2109142114 metadata/md5-cache/dev-libs/gjs-1.68.2
 2109142114 metadata/md5-cache/dev-libs/gjs-1.68.3
-2109142114 metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
 2109142114 metadata/md5-cache/dev-libs/gom-0.4
 2109142114 metadata/md5-cache/dev-libs/granite-5.2.5-r1
 2109142114 metadata/md5-cache/dev-libs/granite-5.5.0
@@ -38529,9 +38498,6 @@
 2109162239 metadata/md5-cache/dev-libs/libtimezonemap-0.4.6-r1
 2109170039 metadata/md5-cache/dev-libs/openssl-1.1.1l
 2109171109 metadata/md5-cache/dev-libs/rinutils-0.8.0
-2109191009 metadata/md5-cache/dev-libs/Manifest.gz
-2109181939 metadata/md5-cache/dev-libs/gobject-introspection-1.70.0
-2109181939 metadata/md5-cache/dev-libs/gobject-introspection-common-1.70.0
 2109190109 metadata/md5-cache/dev-libs/intel-neo-21.37.20939
 2109190909 metadata/md5-cache/dev-libs/keystone-0.9.2
 2109190909 metadata/md5-cache/dev-libs/keystone-9999
@@ -38542,6 +38508,12 @@
 2109191009 metadata/md5-cache/dev-libs/libgcrypt-1.8.8
 2109182039 metadata/md5-cache/dev-libs/libinput-1.18.1
 2109191009 metadata/md5-cache/dev-libs/userspace-rcu-0.13.0
+2109191609 metadata/md5-cache/dev-libs/Manifest.gz
+2109191609 metadata/md5-cache/dev-libs/fribidi-1.0.10
+2109191609 metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
+2109191609 metadata/md5-cache/dev-libs/gobject-introspection-1.70.0
+2109191609 metadata/md5-cache/dev-libs/gobject-introspection-common-1.68.0
+2109191609 metadata/md5-cache/dev-libs/gobject-introspection-common-1.70.0
 2106291109 metadata/md5-cache/dev-lisp/asdf-3.1.5
 2108190940 metadata/md5-cache/dev-lisp/hyperspec-7.0-r3
 2109041509 metadata/md5-cache/dev-lisp/Manifest.gz
@@ -42042,7 +42014,6 @@
 2109142114 metadata/md5-cache/dev-python/gast-0.5.2
 2109142114 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
 2109142114 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.7
-2109142114 metadata/md5-cache/dev-python/genshi-0.7.5
 2109142114 metadata/md5-cache/dev-python/genson-1.1.0
 2109142114 metadata/md5-cache/dev-python/genty-1.3.2-r1
 2109142114 metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
@@ -42350,7 +42321,6 @@
 2109142114 metadata/md5-cache/dev-python/mando-0.6.4-r1
 2109142114 metadata/md5-cache/dev-python/manuel-1.10.1
 2109142114 metadata/md5-cache/dev-python/markdown-2.6.11
-2109142114 metadata/md5-cache/dev-python/markdown-3.3.4
 2109142114 metadata/md5-cache/dev-python/markups-3.1.1
 2109142114 metadata/md5-cache/dev-python/markups-3.1.2
 2109142114 metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
@@ -43011,7 +42981,6 @@
 2109142114 metadata/md5-cache/dev-python/pythondialog-3.5.1
 2109142114 metadata/md5-cache/dev-python/pythran-0.10.0
 2109142114 metadata/md5-cache/dev-python/pythran-0.9.12_p1
-2109142114 metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
 2109142114 metadata/md5-cache/dev-python/pytimeparse-1.1.8
 2109142114 metadata/md5-cache/dev-python/pytools-9999
 2109142114 metadata/md5-cache/dev-python/pytrie-0.4.0
@@ -43292,7 +43261,6 @@
 2109142114 metadata/md5-cache/dev-python/subprocess-tee-0.3.2
 2109142114 metadata/md5-cache/dev-python/subunit-1.4.0
 2109142114 metadata/md5-cache/dev-python/suds-0.8.4
-2109142114 metadata/md5-cache/dev-python/sure-2.0.0
 2109142114 metadata/md5-cache/dev-python/svg-path-4.1
 2109142114 metadata/md5-cache/dev-python/svgwrite-1.4
 2109142114 metadata/md5-cache/dev-python/svgwrite-1.4.1
@@ -43610,7 +43578,6 @@
 2109181539 metadata/md5-cache/dev-python/websockets-9.1-r1
 2109171139 metadata/md5-cache/dev-python/zeroconf-0.36.4
 2109181839 metadata/md5-cache/dev-python/PyECLib-1.6.0-r1
-2109191109 metadata/md5-cache/dev-python/Manifest.gz
 2109182309 metadata/md5-cache/dev-python/aioresponses-0.7.2
 2109181939 metadata/md5-cache/dev-python/async_generator-1.10-r1
 2109190109 metadata/md5-cache/dev-python/cfn-lint-0.53.1
@@ -43648,6 +43615,12 @@
 2109182309 metadata/md5-cache/dev-python/zeep-4.1.0
 2109182039 metadata/md5-cache/dev-python/zeroconf-0.35.1
 2109191109 metadata/md5-cache/dev-python/zeroconf-0.36.5
+2109191909 metadata/md5-cache/dev-python/Manifest.gz
+2109191609 metadata/md5-cache/dev-python/aesara-2.2.2
+2109191809 metadata/md5-cache/dev-python/genshi-0.7.5
+2109191609 metadata/md5-cache/dev-python/markdown-3.3.4
+2109191609 metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
+2109191909 metadata/md5-cache/dev-python/sure-2.0.0
 2109040224 metadata/md5-cache/dev-qt/qt-creator-4.15.1
 2109040224 metadata/md5-cache/dev-qt/qt-creator-9999
 2109040224 metadata/md5-cache/dev-qt/qtchooser-66
@@ -43743,12 +43716,11 @@
 2109082009 metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2-r1
 2109142114 metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r1
 2109142114 metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r10
-2109142114 metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210625
 2109142114 metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1
 2109150309 metadata/md5-cache/dev-qt/qtcore-5.15.2-r10
 2109150309 metadata/md5-cache/dev-qt/qtcore-5.15.2-r3
-2109190739 metadata/md5-cache/dev-qt/Manifest.gz
 2109190739 metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210824-r1
+2109191709 metadata/md5-cache/dev-qt/Manifest.gz
 2109142114 metadata/md5-cache/dev-ros/Manifest.gz
 2109142114 metadata/md5-cache/dev-ros/actionlib-1.13.2-r1
 2109142114 metadata/md5-cache/dev-ros/actionlib-9999
@@ -47904,8 +47876,9 @@
 2109142114 metadata/md5-cache/games-puzzle/pingus-0.7.6-r3
 2109142114 metadata/md5-cache/games-puzzle/quadrapassel-40.2
 2109142114 metadata/md5-cache/games-puzzle/swell-foop-40.1
-2109190009 metadata/md5-cache/games-puzzle/Manifest.gz
 2109190009 metadata/md5-cache/games-puzzle/quadra-1.3.0
+2109191239 metadata/md5-cache/games-puzzle/Manifest.gz
+2109191239 metadata/md5-cache/games-puzzle/hitori-3.38.3
 2104040939 metadata/md5-cache/games-roguelike/adom-1.1.1-r2
 2104100939 metadata/md5-cache/games-roguelike/FTL-1.5.13-r1
 2104101609 metadata/md5-cache/games-roguelike/adom-3.3.3-r1
@@ -48225,7 +48198,6 @@
 2109040224 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-43
 2109040224 metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
 2109040224 metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727
-2109040224 metadata/md5-cache/gnome-extra/gnome-user-docs-40.1
 2109040224 metadata/md5-cache/gnome-extra/gnome-user-docs-40.3
 2109040224 metadata/md5-cache/gnome-extra/gnome-user-docs-40.4
 2109040224 metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r2
@@ -48291,9 +48263,10 @@
 2109142114 metadata/md5-cache/gnome-extra/nemo-fileroller-5.0.1
 2109142114 metadata/md5-cache/gnome-extra/nm-applet-1.22.0
 2109142114 metadata/md5-cache/gnome-extra/sushi-3.38.1
-2109150309 metadata/md5-cache/gnome-extra/Manifest.gz
 2109150309 metadata/md5-cache/gnome-extra/gnome-boxes-40.2
 2109150309 metadata/md5-cache/gnome-extra/gnome-boxes-40.3
+2109191239 metadata/md5-cache/gnome-extra/Manifest.gz
+2109191239 metadata/md5-cache/gnome-extra/gnome-user-docs-40.5
 2109040224 metadata/md5-cache/gnustep-apps/Manifest.gz
 2109040224 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2109040224 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
@@ -49797,8 +49770,6 @@
 2109040224 metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2
 2109040224 metadata/md5-cache/media-gfx/nomacs-3.16.224-r2
 2109040224 metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r5
-2109040224 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
-2109040224 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2
 2109040224 metadata/md5-cache/media-gfx/opencsg-1.4.2-r1
 2109040224 metadata/md5-cache/media-gfx/openmesh-7.1
 2109040224 metadata/md5-cache/media-gfx/openscad-2021.01
@@ -49959,9 +49930,11 @@
 2109170609 metadata/md5-cache/media-gfx/graphicsmagick-1.3.36
 2109162239 metadata/md5-cache/media-gfx/inkscape-1.0.2-r2
 2109162239 metadata/md5-cache/media-gfx/inkscape-9999
-2109190639 metadata/md5-cache/media-gfx/Manifest.gz
 2109190639 metadata/md5-cache/media-gfx/blender-2.93.2
 2109182009 metadata/md5-cache/media-gfx/exact-image-1.0.2-r2
+2109191439 metadata/md5-cache/media-gfx/Manifest.gz
+2109191439 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
+2109191439 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1902171239 metadata/md5-cache/media-libs/libggimisc-2.2.2-r1
 1702282326 metadata/md5-cache/media-libs/libxtract-0.6.6
@@ -50194,7 +50167,6 @@
 2109040224 metadata/md5-cache/media-libs/libharu-2.3.0-r2
 2109040224 metadata/md5-cache/media-libs/libhdhomerun-20190621
 2109040224 metadata/md5-cache/media-libs/libhdhomerun-20200521
-2109040224 metadata/md5-cache/media-libs/libheif-9999
 2109040224 metadata/md5-cache/media-libs/libicns-0.8.1-r1
 2109040224 metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4
 2109040224 metadata/md5-cache/media-libs/libid3tag-0.16.1-r1
@@ -50423,7 +50395,6 @@
 2109071710 metadata/md5-cache/media-libs/kquickimageeditor-0.1.3
 2109070609 metadata/md5-cache/media-libs/libavif-0.9.0-r2
 2109070609 metadata/md5-cache/media-libs/libde265-1.0.8
-2109070609 metadata/md5-cache/media-libs/libheif-1.12.0
 2109072209 metadata/md5-cache/media-libs/openh264-2.1.1_p20190331
 2109072209 metadata/md5-cache/media-libs/pcaudiolib-1.1
 2109071710 metadata/md5-cache/media-libs/phonon-4.11.1-r1
@@ -50486,7 +50457,6 @@
 2109142114 metadata/md5-cache/media-libs/hamlib-4.2
 2109142114 metadata/md5-cache/media-libs/harfbuzz-2.8.1
 2109142114 metadata/md5-cache/media-libs/harfbuzz-2.8.2-r1
-2109142114 metadata/md5-cache/media-libs/harfbuzz-2.9.1
 2109142114 metadata/md5-cache/media-libs/harfbuzz-9999
 2109142114 metadata/md5-cache/media-libs/jbig2dec-0.18
 2109142114 metadata/md5-cache/media-libs/jbig2dec-0.19
@@ -50495,7 +50465,6 @@
 2109142114 metadata/md5-cache/media-libs/libepoxy-1.5.5
 2109142114 metadata/md5-cache/media-libs/libepoxy-1.5.9
 2109142114 metadata/md5-cache/media-libs/libepoxy-9999
-2109142114 metadata/md5-cache/media-libs/libffado-2.4.4-r1
 2109142114 metadata/md5-cache/media-libs/libglvnd-1.3.3
 2109142114 metadata/md5-cache/media-libs/libglvnd-1.3.4
 2109142114 metadata/md5-cache/media-libs/libglvnd-9999
@@ -50570,8 +50539,6 @@
 2109171109 metadata/md5-cache/media-libs/kcolorpicker-0.1.6
 2109171109 metadata/md5-cache/media-libs/kimageannotator-0.5.1
 2109181809 metadata/md5-cache/media-libs/hamlib-4.3.1
-2109181709 metadata/md5-cache/media-libs/harfbuzz-3.0.0
-2109190939 metadata/md5-cache/media-libs/Manifest.gz
 2109190639 metadata/md5-cache/media-libs/embree-3.13.0-r1
 2109190939 metadata/md5-cache/media-libs/glfw-3.3.4-r3
 2109190639 metadata/md5-cache/media-libs/oidn-1.4.1
@@ -50583,6 +50550,12 @@
 2109190839 metadata/md5-cache/media-libs/osl-1.12.0.2
 2109190839 metadata/md5-cache/media-libs/osl-1.12.0.2-r1
 2109190639 metadata/md5-cache/media-libs/partio-1.10.1
+2109191609 metadata/md5-cache/media-libs/Manifest.gz
+2109191609 metadata/md5-cache/media-libs/harfbuzz-2.9.1
+2109191609 metadata/md5-cache/media-libs/harfbuzz-3.0.0
+2109191539 metadata/md5-cache/media-libs/libffado-2.4.4-r1
+2109191139 metadata/md5-cache/media-libs/libheif-1.12.0-r1
+2109191139 metadata/md5-cache/media-libs/libheif-9999
 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
@@ -51140,7 +51113,6 @@
 2004131239 metadata/md5-cache/media-radio/dxcc-20191204
 2005281909 metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc5
 2104161439 metadata/md5-cache/media-radio/flamp-2.2.03
-2104161439 metadata/md5-cache/media-radio/flmsg-4.0.17
 2104161439 metadata/md5-cache/media-radio/xdx-2.5.0
 2104282139 metadata/md5-cache/media-radio/gpredict-2.3
 2105202109 metadata/md5-cache/media-radio/adifmerg-31-r1
@@ -51148,7 +51120,6 @@
 2106240909 metadata/md5-cache/media-radio/grig-0.8.1-r1
 2108031439 metadata/md5-cache/media-radio/cqrlog-2.4.0
 2109040224 metadata/md5-cache/media-radio/KochMorse-3.4.0-r1
-2109040224 metadata/md5-cache/media-radio/Manifest.gz
 2109040224 metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc5
 2109040224 metadata/md5-cache/media-radio/cwdaemon-0.10.2
 2109040224 metadata/md5-cache/media-radio/direwolf-1.5-r1
@@ -51179,6 +51150,7 @@
 2109040224 metadata/md5-cache/media-radio/xastir-2.1.6
 2109040224 metadata/md5-cache/media-radio/xlog-2.0.22
 2109040224 metadata/md5-cache/media-radio/xwxapt-3.4.2
+2109191609 metadata/md5-cache/media-radio/Manifest.gz
 1703120008 metadata/md5-cache/media-sound/SmarTagger-0.1-r2
 1805272138 metadata/md5-cache/media-sound/aseqview-0.2.8
 1910161509 metadata/md5-cache/media-sound/icecream-1.3
@@ -51597,7 +51569,6 @@
 2109142114 metadata/md5-cache/media-sound/playerctl-2.3.1
 2109142114 metadata/md5-cache/media-sound/puddletag-2.0.1-r1
 2109142114 metadata/md5-cache/media-sound/pulseaudio-15.0
-2109142114 metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
 2109142114 metadata/md5-cache/media-sound/pulsemixer-1.5.1
 2109142114 metadata/md5-cache/media-sound/pulsemixer-9999
 2109142114 metadata/md5-cache/media-sound/quodlibet-4.4.0
@@ -51623,11 +51594,12 @@
 2109150309 metadata/md5-cache/media-sound/mpd-0.22.9-r1
 2109150309 metadata/md5-cache/media-sound/pulseaudio-13.0-r1
 2109162109 metadata/md5-cache/media-sound/spotify-tray-1.3.2
-2109181409 metadata/md5-cache/media-sound/easyeffects-6.1.1
-2109190909 metadata/md5-cache/media-sound/Manifest.gz
 2109190909 metadata/md5-cache/media-sound/ecasound-2.9.3
 2109190709 metadata/md5-cache/media-sound/upmpdcli-1.5.12
 2109190809 metadata/md5-cache/media-sound/xmms2-0.8_p20201016
+2109191309 metadata/md5-cache/media-sound/Manifest.gz
+2109191309 metadata/md5-cache/media-sound/easyeffects-6.1.1
+2109191309 metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 1702282327 metadata/md5-cache/media-tv/mythtv-status-0.10.4
 1702282327 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8-r1
@@ -51822,8 +51794,6 @@
 2109040224 metadata/md5-cache/media-video/vcdimager-2.0.1
 2109040224 metadata/md5-cache/media-video/vdr-2.2.0-r6
 2109040224 metadata/md5-cache/media-video/vdr-2.2.0-r7
-2109040224 metadata/md5-cache/media-video/vdr-2.4.1-r3
-2109040224 metadata/md5-cache/media-video/vdr-2.4.6-r1
 2109040224 metadata/md5-cache/media-video/vdr-2.4.7-r1
 2109040224 metadata/md5-cache/media-video/vdr2jpeg-0.2.0
 2109040224 metadata/md5-cache/media-video/vdr2jpeg-0.2.0-r5
@@ -51895,8 +51865,9 @@
 2109170109 metadata/md5-cache/media-video/pipewire-9999
 2109181539 metadata/md5-cache/media-video/vlc-3.0.16-r6
 2109181309 metadata/md5-cache/media-video/yle-dl-20210917
-2109191039 metadata/md5-cache/media-video/Manifest.gz
 2109190439 metadata/md5-cache/media-video/pipewire-0.3.36
+2109192009 metadata/md5-cache/media-video/Manifest.gz
+2109191539 metadata/md5-cache/media-video/subtitleeditor-0.54.0_p5
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1910071209 metadata/md5-cache/net-analyzer/fprobe-1.1-r3
 1702282328 metadata/md5-cache/net-analyzer/ftester-1.0
@@ -53713,12 +53684,14 @@
 2109162239 metadata/md5-cache/net-misc/spice-gtk-9999
 2109170539 metadata/md5-cache/net-misc/tigervnc-1.11.0-r4
 2109171639 metadata/md5-cache/net-misc/usbip-4.13-r1
-2109191009 metadata/md5-cache/net-misc/Manifest.gz
 2109190009 metadata/md5-cache/net-misc/gns3-gui-2.2.25
 2109190009 metadata/md5-cache/net-misc/gns3-server-2.2.25
 2109191009 metadata/md5-cache/net-misc/iputils-20210722
 2109190709 metadata/md5-cache/net-misc/mrouted-4.3
 2109190709 metadata/md5-cache/net-misc/ndisc6-1.0.5
+2109191239 metadata/md5-cache/net-misc/Manifest.gz
+2109191239 metadata/md5-cache/net-misc/gnome-remote-desktop-40.2
+2109191239 metadata/md5-cache/net-misc/rygel-0.40.2
 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
@@ -54689,8 +54662,10 @@
 2109142114 metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1
 2109142114 metadata/md5-cache/sci-chemistry/pymol-2.5.0
 2109142114 metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha51
-2109152139 metadata/md5-cache/sci-chemistry/Manifest.gz
 2109152139 metadata/md5-cache/sci-chemistry/gromacs-2021.3
+2109191839 metadata/md5-cache/sci-chemistry/Manifest.gz
+2109191839 metadata/md5-cache/sci-chemistry/votca-csg-2021.2
+2109191839 metadata/md5-cache/sci-chemistry/votca-xtp-2021.2
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1704192008 metadata/md5-cache/sci-electronics/labone-16.12.42529
 1804171239 metadata/md5-cache/sci-electronics/vbs-1.4.0
@@ -55174,7 +55149,6 @@
 2109142114 metadata/md5-cache/sci-libs/bmrblib-1.0.4
 2109142114 metadata/md5-cache/sci-libs/branca-0.4.2-r1
 2109142114 metadata/md5-cache/sci-libs/cantera-2.5.1-r1
-2109142114 metadata/md5-cache/sci-libs/cartopy-0.18.0
 2109142114 metadata/md5-cache/sci-libs/ceres-solver-1.14.0
 2109142114 metadata/md5-cache/sci-libs/ceres-solver-2.0.0
 2109142114 metadata/md5-cache/sci-libs/clblas-2.12
@@ -55186,7 +55160,6 @@
 2109142114 metadata/md5-cache/sci-libs/gdal-3.3.0
 2109142114 metadata/md5-cache/sci-libs/gdal-3.3.1
 2109142114 metadata/md5-cache/sci-libs/gdal-3.3.2
-2109142114 metadata/md5-cache/sci-libs/gmsh-4.6.0
 2109142114 metadata/md5-cache/sci-libs/gmsh-4.8.4
 2109142114 metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
 2109142114 metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
@@ -55228,8 +55201,10 @@
 2109160839 metadata/md5-cache/sci-libs/scikit-learn-0.24.2
 2109171739 metadata/md5-cache/sci-libs/libgeotiff-1.7.0
 2109171109 metadata/md5-cache/sci-libs/shapelib-1.5.0
-2109182309 metadata/md5-cache/sci-libs/Manifest.gz
 2109182309 metadata/md5-cache/sci-libs/libqalculate-3.20.1-r1
+2109192009 metadata/md5-cache/sci-libs/Manifest.gz
+2109191839 metadata/md5-cache/sci-libs/cartopy-0.18.0
+2109191839 metadata/md5-cache/sci-libs/votca-tools-2021.2
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
 1912080309 metadata/md5-cache/sci-mathematics/unuran-1.8.1
@@ -55416,10 +55391,8 @@
 2109040224 metadata/md5-cache/sci-physics/vmc-1.0_p3-r1
 2109040224 metadata/md5-cache/sci-physics/vmc-9999
 2109040224 metadata/md5-cache/sci-physics/xfoil-6.99
-2109040224 metadata/md5-cache/sci-physics/yoda-1.8.5
 2109040224 metadata/md5-cache/sci-physics/yoda-1.9.0
 2109061309 metadata/md5-cache/sci-physics/clhep-2.4.5.1
-2109142114 metadata/md5-cache/sci-physics/Manifest.gz
 2109142114 metadata/md5-cache/sci-physics/espresso-4.1.3
 2109142114 metadata/md5-cache/sci-physics/espresso-9999
 2109142114 metadata/md5-cache/sci-physics/lammps-20200303-r1
@@ -55429,6 +55402,7 @@
 2109142114 metadata/md5-cache/sci-physics/root-6.24.06
 2109142114 metadata/md5-cache/sci-physics/root-6.24.9999
 2109142114 metadata/md5-cache/sci-physics/root-9999
+2109192009 metadata/md5-cache/sci-physics/Manifest.gz
 1702282331 metadata/md5-cache/sci-visualization/circos-0.55-r1
 2103132139 metadata/md5-cache/sci-visualization/g3data-1.5.4
 2106290046 metadata/md5-cache/sci-visualization/gri-2.12.23-r1
@@ -57832,7 +57806,6 @@
 2109171639 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.147
 2109171639 metadata/md5-cache/sys-kernel/zen-sources-5.13.10
 2109171639 metadata/md5-cache/sys-kernel/zen-sources-5.13.13
-2109190109 metadata/md5-cache/sys-kernel/Manifest.gz
 2109182309 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.67
 2109182309 metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.19
 2109190009 metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.6
@@ -57847,6 +57820,9 @@
 2109190009 metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.6
 2109190109 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.67
 2109190109 metadata/md5-cache/sys-kernel/vanilla-sources-5.14.6
+2109191209 metadata/md5-cache/sys-kernel/Manifest.gz
+2109191209 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.67-r1
+2109191209 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.19-r1
 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
@@ -57898,7 +57874,6 @@
 2109040224 metadata/md5-cache/sys-libs/libaal-1.0.7-r2
 2109040224 metadata/md5-cache/sys-libs/libavc1394-0.5.4-r2
 2109040224 metadata/md5-cache/sys-libs/libcap-2.49-r1
-2109051309 metadata/md5-cache/sys-libs/libcap-2.56
 2109040224 metadata/md5-cache/sys-libs/libfaketime-0.9.6-r3
 2109040224 metadata/md5-cache/sys-libs/libfaketime-0.9.9
 2109040224 metadata/md5-cache/sys-libs/libhx-3.24-r1
@@ -58047,8 +58022,9 @@
 2109161539 metadata/md5-cache/sys-libs/efivar-37
 2109180939 metadata/md5-cache/sys-libs/libunwind-1.6.0_rc2
 2109172339 metadata/md5-cache/sys-libs/libxcrypt-4.4.26
-2109182139 metadata/md5-cache/sys-libs/Manifest.gz
 2109182139 metadata/md5-cache/sys-libs/ncurses-6.2_p20210619
+2109191139 metadata/md5-cache/sys-libs/Manifest.gz
+2109191139 metadata/md5-cache/sys-libs/libcap-2.58
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 2009221209 metadata/md5-cache/sys-power/dptfxtract-1.4.3
@@ -59135,14 +59111,14 @@
 2109142114 metadata/md5-cache/x11-libs/pango-1.48.5-r1
 2109142114 metadata/md5-cache/x11-libs/pango-1.48.7-r1
 2109142114 metadata/md5-cache/x11-libs/pango-1.48.9
-2109142114 metadata/md5-cache/x11-libs/pixman-0.40.0
 2109142114 metadata/md5-cache/x11-libs/pixman-9999
 2109142114 metadata/md5-cache/x11-libs/vte-0.64.2
 2109142114 metadata/md5-cache/x11-libs/xapps-2.2.1
 2109142114 metadata/md5-cache/x11-libs/xapps-2.2.3
 2109152339 metadata/md5-cache/x11-libs/libXi-1.8
-2109181539 metadata/md5-cache/x11-libs/Manifest.gz
 2109181539 metadata/md5-cache/x11-libs/xcb-util-xrm-1.3-r1
+2109191609 metadata/md5-cache/x11-libs/Manifest.gz
+2109191609 metadata/md5-cache/x11-libs/pixman-0.40.0
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bblaunch-0.0.3
@@ -60108,4 +60084,4 @@
 2109150309 metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.4
 2109162239 metadata/md5-cache/xfce-extra/Manifest.gz
 2109162239 metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.11.0-r1
-2109191109 metadata/md5-cache/Manifest.gz
+2109192009 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c3438c209bc1..9364f72d9982 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Sep 2021 08:30:01 +0000
+Sun, 19 Sep 2021 17:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 99136aa2b396..29b9815bbeeb 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-dd4b9a107cd1373123336738b94d71afd6433f8b 1632037849 2021-09-19T07:50:49+00:00
+14c85cf310e124ba086cfc54626293f49e502d1b 1632070082 2021-09-19T16:48:02+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1af78d28ce9a..4107511ec256 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1632038701 Sun 19 Sep 2021 08:05:01 AM UTC
+1632071101 Sun 19 Sep 2021 05:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index aedfc9290e84..f6952f5e171d 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Sep 2021 08:09:02 +0000
+Sun, 19 Sep 2021 17:09:06 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b828feeab691..1785493ec8ad 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index c4add19dc980..0590dba8183a 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-remote-desktop-40.1.tar.xz 63980 BLAKE2B 6f5ebe7f00e2038f88740a994ee90f55b7f3ce6e4ea8898b7326d2f36dea2d89c721cffd253f92cde388b1273ad8d086242bfadaa86e4b87361844b3a3bca5b7 SHA512 39116afa16256820a69e020b71de5458fc5da8154bc8255d2157ff56fc679c39f4608f790d74eb4a0cb10cc61bd27d4172cfc547582100cab5b897644a700ee3
+DIST gnome-remote-desktop-40.2.tar.xz 65400 BLAKE2B 47be88529c365e5ab72b225aae1ad0fdca4748c39476ea1251db8f317e7fc25e90acf0b908f64f0a2111e0c59d8a213ede6945fe75151cdca6ab2cf8a77351cc SHA512 f39feb5b4b89d1c504a07c5dcf5962a4340cfc45c70d806a2b6739512ca80671dd8b7928a6dad83165dbba50b17c7961e329ecae0dd59f3f57f4fcf0f7969466
 EBUILD gnome-remote-desktop-40.1.ebuild 1226 BLAKE2B d6f64f25193c9f9b95f281d1ab31b09f7ee414472ab89a0c7bb8e3bd06e8f3b01009250747339a31c865e70e6e908fb4648ecb464bfb20e1135a5a50807e8050 SHA512 561a66e5a50b815657d68b5c22e0a33bcd58398fa77a687c166f0b93b8d58a2c5c9cea97cf6969fd08aa661f55b07f46b533b51166894ee3aa2db8bdbc1e838e
+EBUILD gnome-remote-desktop-40.2.ebuild 1227 BLAKE2B 009b113dc0ea796ee3b5007eb42436e1f58cff823805a793c3e3f461f573ed251746272e06cf497442528f87016dc854cffd52e89da4abfcc0a983b43b3323db SHA512 2c9f6267b7c55bf2d519cc4a5f497dc0a4efd72dfabc7372a29ea672bc3e809765a5d9e9eb386542349087364d0a6f69a56f64fea6c71003178e26797b7618c2
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild
new file mode 100644
index 000000000000..8df01c6524eb
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+rdp +vnc"
+REQUIRED_USE="|| ( rdp vnc )"
+RESTRICT="test" # Tests run xvfb-run directly
+
+DEPEND="
+	x11-libs/cairo
+	>=dev-libs/glib-2.68:2
+	>=media-video/pipewire-0.3.0:0/0.3
+	app-crypt/libsecret
+	x11-libs/libnotify
+	rdp? (
+		>=net-misc/freerdp-2.3:=[server]
+		>=sys-fs/fuse-3.9.1
+		>=x11-libs/libxkbcommon-1.0.0
+	)
+	vnc? (
+		net-libs/libvncserver
+	)
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i -e '/systemd_dep/d' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use rdp)
+		$(meson_use vnc)
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index b33d973155cb..a53d2dd1b7f3 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,3 +1,5 @@
 DIST rygel-0.40.1.tar.xz 1693996 BLAKE2B 505b96152c0b73bda2b7c81cb742f48cfea86738ea965f07afc1532a77e2262a5c0050eab185a33a831d57fc2f3c85247bc2a02bf73eab5d0be35817e8f00aac SHA512 180f143f394d7a2697c888eef7e7c2bdb5077b4ad289eb6e3f832cc1efde5147248b46e5ad9e77615d7976de7e7d3e68d737732bf7f91f01c42e18e06d8f89bb
+DIST rygel-0.40.2.tar.xz 1696072 BLAKE2B 9071be84a36c603f4c113c5741e427a9b960e97b7262b41c4e4b96bd125ee938508fbae9eceda1dbb9ac9d8cccb096d5fbb3545adee36895845908e79b0dab59 SHA512 23bd31ef4d6d605797dffea4c71eee3770889f5ec54ece39df3743b82973eb0b42a54f3cfc1123e870976f9927987d59d9c0c2b9f69cdec731168dba118b1771
 EBUILD rygel-0.40.1.ebuild 2198 BLAKE2B ef3f3b236482562b9394f8fccdbcaba8f42f5f1b4c3b45db32d99a47e1b3e1fe47c49cd82584760fe51cb907436035a23e730c8605f269a76720fd7e6ec4e36a SHA512 5516705acef67f4da77d2f94a158b8299dd5255268f1ad623527906b6ba92ee5cbd91066e7a455c581462632299b29e1f7f333b171d50c4e14cc8e45726359f5
+EBUILD rygel-0.40.2.ebuild 2196 BLAKE2B 8e795389da6068c88887ab07b0b5990cb62b8cd903b31289bb6d008dc0748a35fcb9ed16162ea3de07cda4dc0594a59e00fcdaa8b9918eef2c4ade87d655b47e SHA512 2f2e23b44b0e2b470c861ceeec76652da6a0f60ec1b89e0325ea2397f2d22154f91d5a0ed5751bf3aa88c6a45e351a9ce5fd0e1eb694cf4917022c2350be6a5b
 MISC metadata.xml 432 BLAKE2B efa83d6c3c964e076185ee541b7b25c59a7f46dd53f96900cc9a9b617133b476ec21747f6b70392fb3903075032774252b1580d90e512c0123d2dfc779d7591e SHA512 b8cf12e9798b778551cdf099ab7a87aa606e6c68697db1b1eb37e673cd2368781c80c9cbc41c5b492997ad4b39eed9f68075f7c4be8ec21ad021470757b72d1b
diff --git a/net-misc/rygel/rygel-0.40.2.ebuild b/net-misc/rygel/rygel-0.40.2.ebuild
new file mode 100644
index 000000000000..36099977232b
--- /dev/null
+++ b/net-misc/rygel/rygel-0.40.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.42"
+inherit gnome.org meson systemd vala xdg
+
+DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/libgee-0.8:0.8
+	>=dev-libs/libxml2-2.7:2
+	>=media-libs/gstreamer-1.12:1.0
+	>=media-libs/gst-plugins-base-1.12:1.0
+	media-libs/gstreamer-editing-services:1.0
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
+	>=media-libs/libmediaart-0.7:2.0[vala]
+	media-plugins/gst-plugins-soup:1.0
+	>=net-libs/gssdp-1.1.0:0=[vala]
+	>=net-libs/gupnp-1.1.0:0=[vala]
+	>=net-libs/gupnp-av-0.12.8:=
+	>=net-libs/libsoup-2.44:2.4
+	>=sys-apps/util-linux-2.20
+	x11-misc/shared-mime-info
+	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
+	sqlite? (
+		>=dev-db/sqlite-3.5:3
+		dev-libs/libunistring:=
+		x11-libs/gdk-pixbuf:2
+	)
+	tracker? ( app-misc/tracker:3= )
+	transcode? (
+		media-libs/gst-plugins-bad:1.0
+		media-plugins/gst-plugins-twolame:1.0
+		media-plugins/gst-plugins-libav:1.0
+	)
+	gtk? ( >=x11-libs/gtk+-3.22:3 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	$(vala_depend)
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+# Maintainer only
+#   app-text/docbook-xsl-stylesheets
+#	>=dev-lang/vala-0.36
+#   dev-libs/libxslt
+
+src_prepare() {
+	vala_src_prepare
+	default
+	# Disable test triggering call to gst-plugins-scanner which causes
+	# sandbox issues when plugins such as clutter are installed
+	#sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
+	#	-i tests/rygel-playbin-renderer-test.c || die
+
+	#default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc api-docs)
+		-Dsystemd-user-units-dir=$(systemd_get_userunitdir)
+		-Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3")
+		-Dengines=gstreamer
+		-Dexamples=false
+		$(meson_use test tests)
+		-Dgstreamer=enabled
+		$(meson_feature gtk)
+		$(meson_feature introspection)
+	)
+	meson_src_configure
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b3a3909583df..5fc0f2786fff 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index fd639a207cee..905219a5cd6a 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2021-09-19)
+# Non-stable deps.
+dev-python/matplotlib cairo gtk3
+
 # Michał Górny <mgorny@gentoo.org> (2021-09-18)
 # Prepare for stabilizing a minimal xorg-server, for Xvfb.
 media-libs/libglvnd -X
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index f247b2e74c1a..122a64163d1d 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# James Le Cuirot <chewi@gentoo.org> (2021-09-19)
+# Requires Ruby, which is broken on m68k.
+app-text/htmltidy test
+
+# James Le Cuirot <chewi@gentoo.org> (2021-09-19)
+# Requires texlive and friends to be keyworded.
+app-doc/doxygen doc
+
 # James Le Cuirot <chewi@gentoo.org> (2021-08-21)
 # Avoid having to keyword dev-python/sphinx and friends for now.
 dev-python/more-itertools doc
@@ -14,6 +22,7 @@ dev-python/lxml doc
 dev-python/py doc
 dev-python/pyasn1 doc
 dev-python/pygments doc
+dev-python/smartypants doc
 
 # James Le Cuirot <chewi@gentoo.org> (2021-08-21)
 # Avoid lots of unkeyworded dependencies of Python tests.
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 928ba43c6c73..5b0e9bb8eee3 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
+# James Le Cuirot <chewi@gentoo.org> (2021-09-19)
+# I tried Mesa under qemu-system-m68k with VirtIO-GPU. It didn't work.
+opengl
+
 # James Le Cuirot <chewi@gentoo.org> (2021-09-17)
 # Ruby just crashes on startup.
 ruby
@@ -74,19 +78,23 @@ unwind
 seccomp
 
 afs
+avif
 bluetooth
-cairo
 clang
+cups
 dbus
+devil
 diet
 djbfft
 djvu
 emacs
 emf
 gnome-keyring
+graphite
 gtk
 guile
 hardened
+heif
 latex
 ldap
 lqr
@@ -103,7 +111,6 @@ qdbm
 R
 samba
 slang
-svg
 systemd
 tcl
 tk
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index f5ac0ed02ef4..4f2f7a4f17e4 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,17 +1,36 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-09-19)
+# media-gfx/nvidia-texture-tools reports arch as unknown, fails to build
+media-libs/devil nvtt
+
 # Alex Fan <alexfanqi@yahoo.com> (2021-09-13)
-# dev-vcs/darcs depends on haskell
+# These depend on Haskell:
+#  - dev-vcs/darcs
 app-portage/layman darcs
+#  - app-text/pandoc
+sys-cluster/ceph pmdk
 
 # Sam James <sam@gentoo.org> (2021-09-12)
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # dev-ruby/asciidoctor isn't keyworded here
+dev-libs/nanomsg doc
 dev-util/ccache doc
 
+# Alex Fan <alexfanqi@yahoo.com> (2021-09-15)
 # Marek Szuba <marecki@gentoo.org> (2021-09-07)
-# firefox needs nodejs to build, no firefox-bin for riscv
+# All of these require net-libs/nodejs, which now builds on riscv
+# but fails tests (Bug #782913).
+#  - www-client/firefox (bdepend)
 dev-ruby/capybara test
+#  - dev-qt/qtwebengine (bdepend)
+dev-python/ipython qt5
+kde-apps/marble webengine
+kde-plasma/kdeplasma-addons webengine
+kde-plasma/libksysguard webengine
+
+# Marek Szuba <marecki@gentoo.org> (2021-09-07)
 # net-misc/memcached not keyworded yet due to failing tests (Bug #811477)
 dev-ruby/dalli test
 
@@ -54,20 +73,9 @@ gnome-base/gnome-control-center v4l
 gnome-base/gnome-shell telepathy browser-extension
 gnome-base/gdm accessibility
 
-# Marek Szuba <marecki@gentoo.org> (2021-08-18)
-# media-libs/libffado does not recognise this arch, fails src_configure
-# (Bug #808853).
-media-sound/jack2 ieee1394
-
-# Alex Fan <alexfanqi@yahoo.com> (2021-09-15)
 # Alex Fan <alexfanqi@yahoo.com> (2021-08-17)
-# dev-qt/qtwebengine requires nodejs to build.
-kde-plasma/kdeplasma-addons webengine
-kde-plasma/libksysguard webengine
 # dependencies not keyworded/tested
-kde-apps/marble webengine geolocation gps
 kde-plasma/powerdevil wireless
-kde-plasma/plasma-desktop emoji
 kde-plasma/plasma-meta accessibility grub plymouth pulseaudio
 
 # Marek Szuba <marecki@gentoo.org> (2021-08-17)
@@ -83,12 +91,6 @@ dev-ruby/webmock test
 # does not support riscv. Hopefully temporary, see Bug #807772.
 net-libs/libproxy spidermonkey
 
-# Alex Fan <alexfanqi@yahoo.com> (2021-08-09)
-# ipython[qt5] depends on qtconsole, which depends on QtPy.
-# QtPy cannot be tested atm because QtPy[test] has an indirect hard
-# dependency on dev-qt/qtwebengine, which requires nodejs to build.
-dev-python/ipython qt5
-
 # Marek Szuba <marecki@gentoo.org> (2021-08-14)
 # Alex Fan <alexfanqi@yahoo.com> (2021-08-05)
 # These USE flags depend on java, not (sustainably) supported yet
@@ -141,42 +143,13 @@ mail-mta/courier fax
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # Dependencies not keyworded here yet:
-#  - dev-ruby/asciidoctor
-dev-libs/nanomsg doc
-#  - media-gfx/nvidia-texture-tools
-media-libs/devil nvtt
 #  - dev-cpp/glog, sci-libs/vtk
 media-libs/opencv contribsfm glog vtk
 #  - dev-util/aruba
 sys-block/thin-provisioning-tools test
-#  - app-text/pandoc (-> dev-haskell/*)
-sys-cluster/ceph pmdk
 #  - sys-fabric/ofed
 sys-cluster/slurm ofed
 
-# Yixun Lan <dlan@gentoo.org> (2021-05-24)
-# Dependencies not keyworded, not tested
-virtual/notification-daemon gnome
-net-libs/gnome-online-accounts gnome
-
-# Alex Fan <alexfanqi@yahoo.com> (2021-08-17)
-# Ye Cao <ye.c@rioslab.org> (2021-07-31)
-# Piotr Karbowski <slashbeast@gentoo.org> (2021-06-22)
-# Yixun Lan <dlan@gentoo.org> (2021-05-21)
-# Mikle Kolyada <zlogene@gentoo.org> (2020-12-03)
-# Göktürk Yüksek <gokturk@gentoo.org> (2019-10-10)
-#   sys-libs/libunwind do not support riscv
-dev-libs/efl unwind
-dev-util/perf unwind
-dev-util/strace unwind
-media-gfx/gimp unwind
-media-libs/gstreamer unwind
-media-libs/mesa unwind
-net-libs/zeromq unwind
-net-mail/dovecot unwind
-x11-base/xorg-server unwind
-x11-base/xwayland unwind
-
 # This doesn't work for (any) riscv yet.
 dev-libs/libpcre2 jit
 dev-libs/libpcre jit
diff --git a/profiles/arch/riscv/use.force b/profiles/arch/riscv/use.force
index 7bf964bf53c8..684f397caa9f 100644
--- a/profiles/arch/riscv/use.force
+++ b/profiles/arch/riscv/use.force
@@ -3,7 +3,3 @@
 
 # Force the flag which corresponds to ARCH.
 riscv
-
-# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
-# sys-libs/libunwind not supported on RISC-V.
-llvm-libunwind
diff --git a/profiles/desc/ada_target.desc b/profiles/desc/ada_target.desc
index ff5c14576286..b4a38a397104 100644
--- a/profiles/desc/ada_target.desc
+++ b/profiles/desc/ada_target.desc
@@ -1,9 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 gnat_2020 - Compile with dev-lang/gnat-gpl-2020
 gnat_2021 - Compile with dev-lang/gnat-gpl-2021
diff --git a/profiles/package.mask b/profiles/package.mask
index 7c49be62c97f..e2f97cec0c81 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Alfredo Tupone <tupone@gentoo.org> (2021-09-19)
+# Mask gnat-gpl-2018 and gnat-gpl-2019. Please switch
+# to a fresher gnat-gpl branch.
+<dev-lang/gnat-gpl-2019
+
 # Sam James <sam@gentoo.org> (2021-09-18)
 # Drops an unstable API which some projects were using
 # including Chromium. Masked to avoid runtime breakage.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index af6439eefd2f..83edbc26760b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4178,7 +4178,6 @@ media-libs/libgroove:sound - Enable audio playing.
 media-libs/libheif:aom - Use media-libs/libaom for AVIF encoding/decoding
 media-libs/libheif:gdk-pixbuf - Enable x11-libs/gdk-pixbuf plugin
 media-libs/libheif:go - Enable building dev-lang/go code/examples
-media-libs/libheif:libde265 - Use media-libs/libde265 for HEIF decoding
 media-libs/libheif:rav1e - Use media-video/rav1e for AVIF encoding
 media-libs/libheif:x265 - Use media-libs/x265 for HEIF encoding
 media-libs/liblastfm:fingerprint - Build the lastfm-fingerprint library
@@ -4538,6 +4537,7 @@ media-sound/drumstick:fluidsynth - Enable support for media-sound/fluidsynth
 media-sound/drumstick:network - Build Network RT backend
 media-sound/easyeffects:bs2b - Enable use of media-libs/libbs2b for the crossfeed FX
 media-sound/easyeffects:calf - Enable use of media-plugins/calf for adding various FX
+media-sound/easyeffects:doc - Install packages needed to display built-in user documentation
 media-sound/easyeffects:mda-lv2 - Enable use of media-plugins/mda-lv2 for the loudness FX
 media-sound/easyeffects:rnnoise - Enable use of media-libs/rnnoise for the neural network-based noise-reduction FX
 media-sound/easyeffects:rubberband - Enable use of media-libs/rubberband for the pitch-shifting FX
@@ -4690,6 +4690,7 @@ media-sound/pulseaudio-modules-bt:native-headset - Build with native HSP (Headse
 media-sound/pulseaudio-modules-bt:ofono-headset - Build with oFono HFP (Hands Free Profile) headset for bluez 5, requires net-misc/ofono.
 media-sound/pulseeffects:bs2b - Enable use of media-libs/libbs2b for the crossfeed FX
 media-sound/pulseeffects:calf - Enable use of media-plugins/calf for adding various FX
+media-sound/pulseeffects:doc - Install packages needed to display built-in user documentation
 media-sound/pulseeffects:rnnoise - Enable use of media-libs/rnnoise for the neural network-based noise-reduction FX
 media-sound/pulseeffects:rubberband - Enable use of media-libs/rubberband for the pitch-shifting FX
 media-sound/pulseeffects:webrtc - Enable use of media-plugins/gst-plugins-webrtc for various voice-enhancement FX
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 3081663b0b39..efa4ea389a2a 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index 64dee625e8f5..9f887c957af1 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -1,16 +1,19 @@
 DIST votca-csg-1.5.1.tar.gz 708319 BLAKE2B 2ea75cf08dc3005bd08ebe85113d95743fe85bae4b7ac3c2e2d9b64be64a7103ecf30b9edf45cffa86b7588d5c57a0256aef02f4590fa6031cb63881480bd0fd SHA512 3559452182c325d5df72918ec6e12122c8214df9733d779c123ff199597fe47fc493fd75adf1f5dbc6b55016373863378ba3cc69fb6b61bc1531c6e591d8131c
 DIST votca-csg-1.6.4.tar.gz 537966 BLAKE2B c9ccc3aa28bdc4a2a2c080104b70602d8cf4be19a71e7d0b4a1c03d11f54b645984103d1662823a9308a4e4c4baedef731de06ff314b168f89e7326c0d3c8ee9 SHA512 4cdbf6c0a593720675f48f574ff9a93d038a48037543c1e09a4559d3eb262a2d8bf83d5f5dab85b4820a541e0c57f7cca78315d5b3382763e8acd8cc0fcb65ac
 DIST votca-csg-2021.1.tar.gz 4300862 BLAKE2B 4ef287a8b0e14e97bcbc293bebdc3a0c45a08bd0033044ef8aa1ac18bac04928010ab3f5edfb656f1d062926f4572a1f3b0e55b3b3b635fdc388e5b850ec3bba SHA512 e1abdd34a3d88aea253cc10e7832a18d2cffc44286e4591c5a1239bf34e68d6c40054d3eb907a902e5ab6af5a9dea4ec266ff5ce59073b500413f4e122885e94
+DIST votca-csg-2021.2.tar.gz 4300675 BLAKE2B 8db666e77bc7d6d8da34fed97b0466e5296019aa703f324d46531992c0af544c31b2e3e4595883791cef7acd6d2d52eff8edc7eeedecaae0eb9e0cbf334748ab SHA512 5808edd96199cad6e5fc803a0e489f3d2f376da3d64f565536cc37561a0fcd22960563af7d3f86522bcc7336c8d6f7c7f6501b36feb960aae5168904156bfbf6
 DIST votca-csg-2021.tar.gz 4300573 BLAKE2B ba589c97f22888b8a1a12c71314133c08c89e44c201bafa6e5f1d74dfe90c87dd84a5d1c2883b26402858b6aa990d37add57bdfb9db6836a7c287f0685a40a59 SHA512 8eacf4045ddc13d33e853cd35a67d03dfb63da60c3e879ea4f16e63f27a92aa13cbf4e367d9258778c9c09462443e4bb2b937c247c6246377ceeecf56bc6fc12
 DIST votca-csg-manual-1.5.1.pdf 1263719 BLAKE2B 29e2ce27215787a1121e45ec1e88ce7c61ba81709a2519aa0959eede505498b9aaf4f38666bb1a4f97837c98b862e7ed02405da07294a7ec76cc80390fe72e0d SHA512 7d9fb4c635383e1b9c9547691f8729e19f273fcafc4dab2a6b438b3ce98ea05bd31887d09bc4edc86ceb0b04d71a4371aed7aadc3ba6864f7be2ef3328ede642
 DIST votca-csg-manual-1.6.4.pdf 1242124 BLAKE2B 003a255d2869c8185f9e03038f646a80b682be3daceb18757c791f5d52101379402aee20c5dcb65ef8ce651bd6f6590ad5249e835e53ce92e04eb33214017a9e SHA512 36956acd24a21cb0a1dd26d6640b41b7473132948327c05856191b4f9531b4d1d5f98be68a9d1a847935d47633d483e87c2300634233a6e617a010c1fb563690
 DIST votca-csg-tutorials-1.5.1.tar.gz 5949467 BLAKE2B c6de6084fbb1d2c4ac2ce75d01a1153eabc63386063de800ff2dc6b483b0568191e7f06ddcb8be46123224ccfd3a97f5fb4e7cd603c0ee99a8636d7143f6c701 SHA512 f2e709ae31d914fe12a4ce37b5019deb878b15ade14972f2a8204bec8970ba2c8946b71b94a5bfd6f7569e41173bfbc75275ea09cbee4358ad1de0e84751049c
 DIST votca-csg-tutorials-1.6.4.tar.gz 5944389 BLAKE2B 66f1d4947bb28ec602250226ad2c08cc02278a90776acbcadca2df3078361435fb2353ee0fa299d0d19697d36682f20aab709d45539d5ac7e7070942601ebc3f SHA512 7e40037f2e70c861fd7f5c63806c17ad56672a340a8795fa745414940c55f593bef32b9f6b9050400131ed9e66aa927149e9d324a1c264364d8504baf1921e28
 DIST votca-csg-tutorials-2021.1.tar.gz 5941978 BLAKE2B 5e6c5cfc3860e287d93cf8d59862a75e3afe7ac1610e696427e99302a99c86d12ce12f7a23281f36c8859e48a25be138466b9316f4c0667d5bf784f33c27e6df SHA512 8370ac9e2e859153f9a54b2e02cd18692fd06810dafb50a6bf3d81eca5211847e1b75d9832df80b1436ae0f9dcab455aa0bfb4c8122165c584cabd14203408ba
+DIST votca-csg-tutorials-2021.2.tar.gz 5942042 BLAKE2B a03627406a3b56ebf978dc82629e1f0950bfbb121a0f6c7fd60341986efe4892ba8bf1e6b526e6df2df5fb81351177ad97816568521b9dc6a91e72d6853c1e62 SHA512 3ddeb3e57353e6d4e59163ee1303b39d4e3b623309875f280bf8c02dde76d0615b32a27ea960a301b61b81034a538df87dfe97a53dfdd0c81f52629eadd64f1f
 DIST votca-csg-tutorials-2021.tar.gz 5942031 BLAKE2B 60ef492c98bf07b5169c6f1be2298b6dac76003ef9981064463de9fdae649c215d469424e253d06b63637bb3eee9383c587a98322ab987995f8b4861bb0002e1 SHA512 844706407cb91d507c6b0433e23f4b27756dd4c882f6cef79d51f2b2acae6cd0114ccd91d626d090d0f61c58a57cc3c1eda0a0d10d6f4bfa522eda7ee8de21b3
 EBUILD votca-csg-1.5.1.ebuild 2522 BLAKE2B 0fe2b373307c76ebab320169b5ae837c463a734b029af1a328a87c2428b19484f138c75e7bb1e4ad91d0c099aa24c97c411c2f00308ebad051a81d0275e797be SHA512 2c6018212ae244e7387a2f63e186e970dd18825d77994f862c283131796ac93c6bb25a5233a41e306d8090ee75c82759025b74c3d1e0a0211adf67e0b3964449
 EBUILD votca-csg-1.6.4.ebuild 2290 BLAKE2B 1fa3398fce620103e69529a1b36f1b21fac4ff633ed602f218a61f8c41471376842c7e51e428bf6da165f225be8c54a6c76107fee7fd691c3cbf2a7fdcfcb6c8 SHA512 b794120a45fc6616873b31989e3d7df64c545673305ef714c189dce6f2725ab2f93e2e5625f38bf34fe6711583088e947ef3407e902ec0be5b5babac72316458
 EBUILD votca-csg-2021.1.ebuild 2097 BLAKE2B 3ff69560e5ed700f6c0cf3f15442d7ce277af2acab62e552fd921ca51f35348cd77ed25e89afa2208fdb6e0c8c4ac4771ada07fdb1fd85ba1bcb5d2d1dc647fd SHA512 5b52a2a2bb86cf0024fc64b60b3bd51fedb7f5d8dc4e2cfcb3e1e20dbd661469be79ec486c516c8c40b98d13e232ef5f3f7701e2c062ca3171beeebe047647ea
+EBUILD votca-csg-2021.2.ebuild 2097 BLAKE2B 3ff69560e5ed700f6c0cf3f15442d7ce277af2acab62e552fd921ca51f35348cd77ed25e89afa2208fdb6e0c8c4ac4771ada07fdb1fd85ba1bcb5d2d1dc647fd SHA512 5b52a2a2bb86cf0024fc64b60b3bd51fedb7f5d8dc4e2cfcb3e1e20dbd661469be79ec486c516c8c40b98d13e232ef5f3f7701e2c062ca3171beeebe047647ea
 EBUILD votca-csg-2021.ebuild 2033 BLAKE2B 77fc10474aff5882c3d99133175f67ee51704dd1a32e101a42afb5e4417f3c478b4311f9ed619d62c1eab13328b130cfb1e500ff1e890c518adc0b1fcf167c6c SHA512 de1e8c1d9cb22e75ebc8dc7c043aafb04dce6eaf3d7173f1e745a6578b7236e9f71ce3b75fa5698333eca7c5c74a41337eba3fb4cd5c037e8bf3172bf78296eb
 EBUILD votca-csg-9999.ebuild 2072 BLAKE2B 1b13ee8b2bd47a7bd17fbddf1cc46f3ac38a21ba4c2d6d5a453ef3c55e2894b31c20c0f32d2b335b76d76ca56df6838b2ed6a616ee96e9dcb6fb7981f2f10346 SHA512 561f20660a4db6bca57c3bcf10c69aab2834b0a054c2ce95245a52536a1064c1481840001594cf2bcc4c060e3c407078d9d0b67497bd861d3f0a1df6b0ba3678
 MISC metadata.xml 677 BLAKE2B 4d577f0229184293e80dca331cba9f8d234a73eb73b6eac92d7e87e2aefe90de69be1323d3e401cfedb0aa6f18ab77b7ae6f3f4c8c1aca836d7ac8a57184eb32 SHA512 f7999c1c10630ae72535609f9be857e7efbe89f0cc99f55268c66271625777e64c0a552317c49cde3ef5652be68c7e91630b8cd038b255b71a1566fac75b91e7
diff --git a/sci-chemistry/votca-csg/votca-csg-2021.2.ebuild b/sci-chemistry/votca-csg/votca-csg-2021.2.ebuild
new file mode 100644
index 000000000000..eb83c3f2c7a6
--- /dev/null
+++ b/sci-chemistry/votca-csg/votca-csg-2021.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+else
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		examples? (	https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	S="${WORKDIR}/${P#votca-}"
+fi
+
+DESCRIPTION="Votca coarse-graining engine"
+HOMEPAGE="https://www.votca.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="examples extras +gromacs hdf5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-shells/bash:*
+	>=dev-cpp/eigen-3.3
+	dev-lang/perl
+	~sci-libs/votca-tools-${PV}
+	gromacs? ( sci-chemistry/gromacs:= )
+	hdf5? ( sci-libs/hdf5 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig
+"
+
+DOCS=( README.rst NOTICE.rst CHANGELOG.rst )
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		if use examples; then
+			EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git"
+			EGIT_BRANCH="master"
+			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials" \
+				git-r3_src_unpack
+		fi
+	else
+		default
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_GROMACS=$(usex !gromacs)
+		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
+		-DBUILD_CSGAPPS=$(usex extras)
+		-DENABLE_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbashcomp "${ED}"/usr/share/votca/rc/csg-completion.bash csg_call
+	for i in "${ED}"/usr/bin/csg_*; do
+		[[ ${i} = *csg_call ]] && continue
+		bashcomp_alias csg_call "${i##*/}"
+	done
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/tutorials"
+		docompress -x "/usr/share/doc/${PF}/tutorials"
+		rm -rf "${WORKDIR}/${PN#votca-}"-tutorials*/CMake*
+		doins -r "${WORKDIR}/${PN#votca-}"-tutorials*/*
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please read and cite:"
+	einfo "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
+	einfo "https://dx.doi.org/10.1021/ct900369w"
+	einfo
+}
diff --git a/sci-chemistry/votca-xtp/Manifest b/sci-chemistry/votca-xtp/Manifest
index 4bf64e6d4fb6..b56afadc3d96 100644
--- a/sci-chemistry/votca-xtp/Manifest
+++ b/sci-chemistry/votca-xtp/Manifest
@@ -1,8 +1,10 @@
 DIST votca-xtp-1.6.4.tar.gz 1405299 BLAKE2B 9d4e9d3f87e0c6be886df77bf52f9d8c0b4010fb1d77621a51b739986f3f5d70c85637c0d7b4d6a8a06d7dfc7e70ff5491bdc833a1b9da6fe1e8a9742a82d220 SHA512 f35e9605f4ac92547c801b254de792b5c3bf40200e8636869467997412357251df08f88ad851bc76cb0ba15428f06f28dbd4f64043a7612273468c8d653e52af
 DIST votca-xtp-2021.1.tar.gz 2192322 BLAKE2B 8b15f17e1287249ff383fc2b66b5d37c7f78bac071ea6cc2f902811ab56cded26db764cd204371d5bebca55dfce73d840d680a4c62bc458a6cf55955d783a666 SHA512 ad0190f3e9235aec9c6db4ea16de7cd0daad96ff9836821672b46dcf098ed3bc1cdbb98ccf4b495dab172d1c1a971580eef8dbf341a2067964f684871ca6277f
+DIST votca-xtp-2021.2.tar.gz 2192074 BLAKE2B 75b835501d70d1f90010bffce7cdaf3718629c8ec07d0cc10b11e6422c64f37ae32ba30c5b3006cd04863bba1986de1214fe7dbe7a6a12d76c21b4fe3e3b075b SHA512 d79e2e8973ad35a47ac0b1872cc6906aaec3881f4c8dc5ef4d9001b661212592bc309b1a82982db9c4d2827ba7749cd0bbc3134e29798c0bfaf794dee04a7cb6
 DIST votca-xtp-2021.tar.gz 2192166 BLAKE2B bcacdfe92b8c9fbbe2fe949d7096c09928ef7ece3cc4e40adbf58f2894036588762f9905bce1a1595bea99d1dfb8bcd99f395bed2ce7b94eeaf51b1c33719558 SHA512 1444fd0a64a684fd2b1327a9c3af067ea812190fa95cab5f3bfcc7aae932cc7469d07fc219871ca594496fbfe74e277d3b6ccfbd7d5c24c162623515ee2fef0b
 EBUILD votca-xtp-1.6.4.ebuild 916 BLAKE2B 3f322407b39ca300186e1e283a6a85749b79518cbd7355577992fc4eeb7931c419e018a384a29d1e84becc5a7c94f7905c96d26cf6a750a9b0124ea35a40bd7a SHA512 65a479d3292c7296cbfb6543fe47e54f2824705dcbc2b2e75f6f2f4fda9f827ce15904aacff59c927061547a45c940eebef4f4fa3e3bcb226f401a6817dd74fc
 EBUILD votca-xtp-2021.1.ebuild 1072 BLAKE2B fd96c0a844636d52b3d4f10fc3cd4ad04061f6e015d1e8b087bcd50157e4d8a2586d7a4948b39987628d6efd9fc0c373d8bb77344bc62c3651d7b08704bc59fc SHA512 a1e95165d8c55351762d5a1cf70316862de2e30b765df1aaf8d904aa0cc0bf8d9e1f75aba3c88a4c7b273fee29d6a1bc89d710bb3fe298da5ee92b4f427a4f4a
+EBUILD votca-xtp-2021.2.ebuild 1072 BLAKE2B fd96c0a844636d52b3d4f10fc3cd4ad04061f6e015d1e8b087bcd50157e4d8a2586d7a4948b39987628d6efd9fc0c373d8bb77344bc62c3651d7b08704bc59fc SHA512 a1e95165d8c55351762d5a1cf70316862de2e30b765df1aaf8d904aa0cc0bf8d9e1f75aba3c88a4c7b273fee29d6a1bc89d710bb3fe298da5ee92b4f427a4f4a
 EBUILD votca-xtp-2021.ebuild 943 BLAKE2B a0596dab1f69c3c8e9afb3699b44ab0e49cd4e8f5ef6a397eed39ed051e13f0b457ca0b0e225329dcf73bc58799d4e3fc217805784f936d9e1ee09c3586bd998 SHA512 9c4688a19b3a4ef75c79a0500f253aaa1a99d38ed4e56948e4743ea03e734e613be845b56d084c67d783a8e76cd4ebc2888b94bfe3c6e67a9799bc22af6ff19b
 EBUILD votca-xtp-9999.ebuild 1092 BLAKE2B 4cc16fc9d7abf33f18b3120f9b756b1ada45dddfcb0686a28f0d522feb989ad39f54fb00249e7b388bdc4a063da89486cfd2827cfb7d3eddb0303f232fc3af91 SHA512 967feec2008dc88c8a15d825876d3d83058792843d2a7b7a67f702f7ea097a32c99397909c65eea1b0e27d5eb76cf156749ae1f68630cca8af2270f47928485d
 MISC metadata.xml 454 BLAKE2B 649578a46b3cbea28539fb2f2716518819f2740155433d1af07d3ee3163ccd3c2db2c69b75de829db3c46e3e2ef500892abae16b2b920b8ca5ac68e205c93cd8 SHA512 427fc4f2f5c0e265af0f6cbd7341860e3c8c62afcfacd0edf2ec53e9eb2228dfb3ada0f9f273127a0805f8fb87cbae4e14daefbc068d6afe655c917cb6c74df4
diff --git a/sci-chemistry/votca-xtp/votca-xtp-2021.2.ebuild b/sci-chemistry/votca-xtp/votca-xtp-2021.2.ebuild
new file mode 100644
index 000000000000..4d4db8635e4d
--- /dev/null
+++ b/sci-chemistry/votca-xtp/votca-xtp-2021.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+else
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	S="${WORKDIR}/${P#votca-}"
+fi
+
+DESCRIPTION="Votca excitation and charge properties module"
+HOMEPAGE="https://www.votca.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/eigen-3.3
+	~sci-chemistry/votca-csg-${PV}
+	sci-libs/hdf5[cxx]
+	sci-libs/libxc
+	sci-libs/libint:2
+	~sci-libs/votca-tools-${PV}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.rst NOTICE.rst CHANGELOG.rst )
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please read and cite:"
+	einfo "VOTCA-XTP, J. Chem. Theo. Comp. 14, 6353 (2018)"
+	einfo "https://doi.org/10.1021/acs.jctc.8b00617"
+	einfo
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 6a15164325f6..d359d7c93e15 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index c6bc4c0affc4..03fbe4e650d2 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1,3 @@
 DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc SHA512 912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
-EBUILD cartopy-0.18.0.ebuild 1674 BLAKE2B f50f63ce93119c04e31829f7c54b450e47634e606e222ae7d79cd0c46346b98415c81547513cd02c4b8a205238c72d1f2f2949912072e8102dcbff6617de881a SHA512 97f3346365bacc36d70dd4505da3df0710964a55d9dc3c466207f87c74a59257dc451378e95939d2914dab9525f3e2af1bd61e48817228637c2ccb840abbdf48
+EBUILD cartopy-0.18.0.ebuild 1708 BLAKE2B ba4dccb35ad843290b8ec0cf9433dbb640a1422011589c50e709004388e0b9787771b307789c5787c0b7b98c2081ed7c97dcc4256a52ab882ec42e01ae44adaf SHA512 ed9fb4e0abbab15feb9e4a21a7e4b2c04a4a76bbd0763b9239c4cb4148de894d9f8d048d514f60275388a4ae6e30bdc3d744fca100cdb5838c86f16482eb1c29
 MISC metadata.xml 603 BLAKE2B dc4da38fb25d4785362faa8475edb2d3b44aa99c0ce3f3f21ee3c1812a385a715a0d18ece3d58b63e298f997fdebd4762f8395335042bbac6e6fc2aadefee695 SHA512 3fb87e6057c17a7430519fc5e434847cfe13bdf06fa4aab6ed3b6aefe574a078c8750915c65a9d1ed12cecc8c25353e1218aae69dbe0a9e661b9d7499994dea3
diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index fbbee50514c9..ffeef0d90707 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 2863a11a1e76..5a1c671ee0aa 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,5 +1,3 @@
-DIST gmsh-4.6.0-source.tgz 12048076 BLAKE2B 2de1ded477ec675fa7bcb56c1e2a1352f6f6d642b9872dd5c167bafac0e7648cbbce6921b556d59796e035f40bc24e9ce38ccedb690ca54cbeab5f3ab94eeeea SHA512 9d6dde6b1f6b6193eb859cc6425a0161d42ccf449aeb84f43e1dba661b0ccb593821b9371272e06351c4dd26b7b8b6a5c39475c0f5b1332be188551abc88ae45
 DIST gmsh-4.8.4-source.tgz 13838352 BLAKE2B 26c7f68e41d1c339c7d5fd499b2261c2ce79c38648df9f4f3853ba69421d59be36992d8aac1d1ebc1fe872bb828769693c12fd9770878fa3b59c179176105ea4 SHA512 c3880e67af03aa6d00300b5f56fd229ffe37da9af66e8c7c87a3bbf7abcb3a90b4858ec76093ef8f039a70d4da1d5cc7f7c687c05b6642299c95e1a07f9513bf
-EBUILD gmsh-4.6.0.ebuild 1784 BLAKE2B 0cd3d1b0981c3dfd5739e10dc2bbf2e2c40130a09997982105ba331dec9ac1ac669e6e50ec12ecca5233cbe5e4e194af708334ec1e9c549fe2bdec9cec9ddd1a SHA512 aec9980a9dae689db3d6a1adcc44614c718922e624ce473571d00d59836b5a4d36027f7fd1c6a695d4cefe5320d22d6900ceb98c7f86eb1297a9962448616150
 EBUILD gmsh-4.8.4.ebuild 1784 BLAKE2B 0cd3d1b0981c3dfd5739e10dc2bbf2e2c40130a09997982105ba331dec9ac1ac669e6e50ec12ecca5233cbe5e4e194af708334ec1e9c549fe2bdec9cec9ddd1a SHA512 aec9980a9dae689db3d6a1adcc44614c718922e624ce473571d00d59836b5a4d36027f7fd1c6a695d4cefe5320d22d6900ceb98c7f86eb1297a9962448616150
 MISC metadata.xml 738 BLAKE2B 8df642f68bf20aaa8742b4e8c2e469b0af3e9c61f17905604a17f2dade702423927c2d146d68781b056335269a20717cee6502447eb9d30a7bc0684990cd1312 SHA512 5634ec209dad65d0b5845007b9f29aaee6137a6a85a142fde6c8e6d357e4d6acf339cf65c5dc3018305f73c40f653dfc50ed7ff9a321ced62407a98b6a3f710f
diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
deleted file mode 100644
index df5ea5533a0a..000000000000
--- a/sci-libs/gmsh/gmsh-4.6.0.ebuild
+++ /dev/null
@@ -1,76 +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} )
-
-inherit cmake-utils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/"
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
-
-LICENSE="GPL-3 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="blas cgns examples jpeg med metis mpi netgen opencascade petsc png python X zlib"
-
-REQUIRED_USE="med? ( mpi )"
-
-RDEPEND="
-	virtual/fortran
-	X? ( x11-libs/fltk:1 )
-	blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
-	cgns? ( sci-libs/cgnslib )
-	jpeg? ( virtual/jpeg:0 )
-	med? ( sci-libs/med[mpi] )
-	opencascade? ( sci-libs/opencascade:* )
-	png? ( media-libs/libpng:0 )
-	petsc? ( sci-mathematics/petsc[mpi=] )
-	zlib? ( sys-libs/zlib )
-	mpi? ( virtual/mpi[cxx] )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	python? ( dev-lang/swig:0 )
-	"
-
-S=${WORKDIR}/${P}-source
-
-pkg_setup() {
-	fortran-2_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=( )
-
-	use blas && \
-		mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
-
-	mycmakeargs+=(
-		-DENABLE_BLAS_LAPACK="$(usex blas)"
-		-DENABLE_CGNS="$(usex cgns)"
-		-DENABLE_FLTK="$(usex X)"
-		-DENABLE_GRAPHICS="$(usex X)"
-		-DENABLE_MED="$(usex med)"
-		-DENABLE_MPI="$(usex mpi)"
-		-DENABLE_METIS="$(usex metis)"
-		-DENABLE_NETGEN="$(usex netgen)"
-		-DENABLE_OCC="$(usex opencascade)"
-		-DENABLE_PETSC="$(usex petsc)"
-		-DENABLE_WRAP_PYTHON="$(usex python)")
-
-	cmake-utils_src_configure mycmakeargs
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r demos tutorial
-	fi
-}
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index fe0a2ee3f4bc..d584ca0c0a20 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,10 +1,12 @@
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
 DIST votca-tools-1.6.4.tar.gz 109929 BLAKE2B 8bc55fcd0a021002f11d412440a369a169c3c62ae5978781010de0a05502e43ed1ccbe5066e3d46ac8ef6fd0c1471baca70d35f6468ccbfd480dc0fa6f2b5047 SHA512 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a
 DIST votca-tools-2021.1.tar.gz 115082 BLAKE2B 994105769e9718fc4f6832fb88a958d0a769660a21d9de36d52e9f1ce3cf9f66d26cb138f300de8285117fb87890a7ace4fc5be5dfa1ec41b82ceff9bd680728 SHA512 9770f1e96b489413577e41858e659f11c0adc79070ae1058102c2ad2a771c3222fcdffd8646bae75b5d05450a7fa3b49eee7fce1ae16718dd809ff729b3dd25e
+DIST votca-tools-2021.2.tar.gz 115115 BLAKE2B 9ce16d96b6da7ee9cf9be60a69536555d21eebdad2260100bf35a0c4fe0a5b8cb76c2a3b54476fd843f5428ec5fb3fd33ae79b9fd6b27a90530637c550f06712 SHA512 84e756df4c6e355e149fd105835cfb0fd03935c824e2f7e4149ad92ed6fa81d5a43a7dd6aa532b5ee6e4a79794a94db08f8533e9f0cf99afa604c5ad9f7cb133
 DIST votca-tools-2021.tar.gz 114974 BLAKE2B 9f707a901b83f0d8a6c7e5c9b43b135c7539cf4f1fa44a4ed1a5c8f2f7066e1241515fc025ea436f2e52e6bf4aefb7c9a15575e8a588845dda7fbb6717f50b7e SHA512 5ddcbe49b1898713fa292655efbb2a1c081a7f98c9bae3ef37b273e0db49eecb3800b865221883d610802923132d57d5847cc35ddb008de4eb180f4c30db3dbf
 EBUILD votca-tools-1.5.1.ebuild 1087 BLAKE2B 00c2358c8c4e36c34dcf359cbfb8cf9962ca5cdf413fa78b7c86fafc6333a4c4ed01892e18a91a2d0bb8b0bb7f3b1c527510eb207cb7ddd87e557b8489b13f0d SHA512 b3ca29f58b0c65642985506cf3f32c6850483ba7e8e0763cc9194957523931e9a6f51c3a441ffcd550f154bb6ac6f234a244c16bb431ab29feb93c242bb0cc53
 EBUILD votca-tools-1.6.4.ebuild 749 BLAKE2B d5cd0bec7f6d8e375e1786d1c44c006276a9be8912498ae5b5f169bf9d44b097725915d44c1a2d55bd7f287182e597ad1eb4d35796544a971c47871c2109f106 SHA512 1f372e97bcd60d296aa9cc464ba23690ab9d8bed56ac6831f126bee24f3be33d1bf3cc1a5dcd2a90695dd38bc032022de1663e4f014a18068fb7bdf75c822d68
 EBUILD votca-tools-2021.1.ebuild 855 BLAKE2B f635ba0f513812a88ca1945ba50da22213102c6c79a92a7b4cfd0069f70d72058c1ad51586c9e3385013369e3f6c71b7c78a8d97ac3e5c9c3a37d76428db0ee2 SHA512 068dc366b9b2a6858a5ce27cfcc7d949a361992f834b7621fc71d80a30ece2c5e05b9e127a506b88fb295befafb25c38661e3cdc936cfc9b5c9f881177aac4e4
+EBUILD votca-tools-2021.2.ebuild 855 BLAKE2B f635ba0f513812a88ca1945ba50da22213102c6c79a92a7b4cfd0069f70d72058c1ad51586c9e3385013369e3f6c71b7c78a8d97ac3e5c9c3a37d76428db0ee2 SHA512 068dc366b9b2a6858a5ce27cfcc7d949a361992f834b7621fc71d80a30ece2c5e05b9e127a506b88fb295befafb25c38661e3cdc936cfc9b5c9f881177aac4e4
 EBUILD votca-tools-2021.ebuild 792 BLAKE2B f185fed01b8cac544c15627419534edb811e9a2d3f8d418d4487396db7c566f4f171f2fdfe41ee650a0ede653ac0b2bb43f7a17e79d404ec6d15d07314b433b0 SHA512 cdd7bd917b6d5dfe476d46e22d4d821b709513116b73c41a71f5f9c1a5e2b0dace7f381788f3f0baf22c3dd945904203ef433ea67d32a23eea98ce408355bb97
 EBUILD votca-tools-9999.ebuild 855 BLAKE2B f635ba0f513812a88ca1945ba50da22213102c6c79a92a7b4cfd0069f70d72058c1ad51586c9e3385013369e3f6c71b7c78a8d97ac3e5c9c3a37d76428db0ee2 SHA512 068dc366b9b2a6858a5ce27cfcc7d949a361992f834b7621fc71d80a30ece2c5e05b9e127a506b88fb295befafb25c38661e3cdc936cfc9b5c9f881177aac4e4
 MISC metadata.xml 456 BLAKE2B 872b69b5cc95376bf9a28d0c1a16ae7fa52b3b0c356ffef0f70f69ed95da623a335edf4e7917da06880747c469dce762ba5534e3c5854264d8b6895f530b33a5 SHA512 741e6734a956099207e96de6d1fce8db9601d0d3582130a2c45b6a7cb7b140ef56a300483b392d556d303aafbd39833e4f4dff7fd4d6605d39eb8d9a88c8b6aa
diff --git a/sci-libs/votca-tools/votca-tools-2021.2.ebuild b/sci-libs/votca-tools/votca-tools-2021.2.ebuild
new file mode 100644
index 000000000000..184243331d2d
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-2021.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	S="${WORKDIR}/${P#votca-}"
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="https://www.votca.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/eigen-3.3
+	dev-libs/boost:=
+	dev-libs/expat
+	sci-libs/fftw:3.0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DOCS=( NOTICE README.rst CHANGELOG.rst )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_RC_FILES=OFF
+		-DENABLE_TESTING=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON
+	)
+	cmake_src_configure
+}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 96e6294ff832..515c27fb3dbf 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/yoda/Manifest b/sci-physics/yoda/Manifest
index b6a387492b84..fdbc9f2fbd04 100644
--- a/sci-physics/yoda/Manifest
+++ b/sci-physics/yoda/Manifest
@@ -1,5 +1,3 @@
-DIST YODA-1.8.5.tar.bz2 1057576 BLAKE2B 3c6abb680afcfb8250c3ae340a1b1307cb5498b726199ecf9afe593fc49c4099fd2b4ac881568c303abd10c22fcf91ffae4283021443fc6230456376617f0de1 SHA512 d1fffa55af069f894b3c88bcd105f77a3105095281febf9c06c0cea2fadea6c63d69df5bde4aa96646d2d560bd83cade6802d9ed19d5a30553cd003ace19dfc8
 DIST YODA-1.9.0.tar.bz2 1061105 BLAKE2B 70d68d31456747fcb14e27585aae245930061b5135b8a96c8ff3fe0375175d00a1c2d24a6c1ca3f18fc8464e610ef6287184f3990e12ff3fb108def600e34189 SHA512 eb82f1df832c2124dd81e07c06f165ddf13c4c4b70fcd0113f85045e22085d82751325bc57bfbd167649580980d98a15b666de56dada639160f24682b58b2f71
-EBUILD yoda-1.8.5.ebuild 841 BLAKE2B 451e469bbca5da56c96177719bb2766ddae3a7302f31dd7461df5a2190736bd2953e82e0da02730dd65568abb9748d781796460f78a029bd9cdb66251d6ec6fa SHA512 e50f47d5664dd5e5888bb40fa7355081ad04cea31ebcfcb0501e445239c19cf426aa996494fd64610eaada2bcc3d683dc642d546683b65c17661985215ecd30b
 EBUILD yoda-1.9.0.ebuild 843 BLAKE2B 94946e19f1b8f36dd4151592207d99ccf0c0d4a46e29323d3cce470dcfcb2f07fe050ce712726a12394f4388de43c5af1ccab56cbf8d4d2f861725d70c8c1634 SHA512 8aa5189d75b21b1d88b56952557c1be48ffa9b81e2ba0d292a99fbbab47f792bbcb89454c055d0c0319fe31b43243a369e6b0d88fdab792e36f15d401d49a0d5
 MISC metadata.xml 660 BLAKE2B 7bc7ad4089af06b0a7b80028e99a551c8adf18c7066f4b9743e74bbcdb8b831b47917faa98f6183e6fd70856f385c2a45a84366cdb5b9f25ec3881efecb4a723 SHA512 64002092f2032d225f2bd4dcc4668c00cc23b9e60b58052b93a0618794f4e17104ab11a0982428ad956ca6b894e93e230523b52918bc9d41d2c01d22abe18e90
diff --git a/sci-physics/yoda/yoda-1.8.5.ebuild b/sci-physics/yoda/yoda-1.8.5.ebuild
deleted file mode 100644
index 5e3646209677..000000000000
--- a/sci-physics/yoda/yoda-1.8.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis"
-HOMEPAGE="https://yoda.hepforge.org/"
-SRC_URI="https://www.hepforge.org/archive/${PN}/${P^^}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="root"
-
-RDEPEND="root? ( sci-physics/root:= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P^^}"
-
-src_configure() {
-	econf \
-		--disable-pyext \
-		--disable-static \
-		$(use_enable root)
-}
-
-src_test() {
-	# PYTESTS and SHTESTS both require python tools
-	emake check PYTESTS= SHTESTS=
-}
-
-src_install() {
-	default
-	newbashcomp "${ED}"/usr/share/YODA/yoda-completion yoda
-	rm "${ED}"/usr/share/YODA/yoda-completion || die
-	rm -r "${ED}"/usr/etc || die
-}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index e91cedd6de84..ef685a14453c 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9710f5f5fb54..13d7fdd1da28 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -65,6 +65,7 @@ DIST gentoo-kernel-5.10.66-1.amd64.xpak 65538037 BLAKE2B 87488caaae9aeaba831f546
 DIST gentoo-kernel-5.10.66-1.arm64.xpak 61278978 BLAKE2B 74962fb0328ae347c15a0c20b8081b9c2ea74acbe7651ec3a213c08531b25755d0341b1235bd5010ed8c2810767599010021361af4b8d18a203411a30bfbf049 SHA512 898bbac8b9314030a938f30b3fc0ec85c162be61a467b27cf2663fb7baa6190bd15aaf7a86e4b56d00edef16545c79b880ceff0156407dda0d6cde08ab1764ce
 DIST gentoo-kernel-5.10.66-1.x86.xpak 57245309 BLAKE2B 2a67657d2797243fc22bbe38a25db77052d4d2342e53907a007d383c7ebf45d150cebaf5ab3b542f3533b17670d8c7740c926ac8636b7a982e875f36e1a8eb45 SHA512 e27b532e9d0716e3afab61f487575d004f58abe40a29c5e82260df53fd853e6dd58fb6ddc73455a2a08157a2fba3e9fb34d58558eed5df62c1eb0ef525743a08
 DIST gentoo-kernel-5.10.67-1.amd64.xpak 65526439 BLAKE2B 4552be9d5338bc265ae029aadfb3036214618be5248809d9704298cb30bcf3e9dbe29b38220d494bb2ba9b1969d6d97d6366a034c29c258073eea89cf083dd38 SHA512 3c887fef9c7da630536990ed7aafce8af0e95579cac8d0172a9c0ff346ec1af32ce23b423e4f2b4ed9350c059f43f640801db9d70ba1706e4a06f3db301b343d
+DIST gentoo-kernel-5.10.67-1.arm64.xpak 61235476 BLAKE2B 39b83dbfe1c24722c031e9e99edab5e122cce7c090ed9068e34d36e425475ddcdbd61ab0112c4a717e973ff1fe8c1ceff748db56247279cf8a3b9b6926612f0c SHA512 912548b1ab861e399650f45c3b0df6ff5766d51e5b14ab516a3a0617c737b360ec0ddd2dbbec7649b396d55ded43e3b5ce44778463ed6b81dcba0f8e194dc7d3
 DIST gentoo-kernel-5.10.67-1.x86.xpak 57237065 BLAKE2B e4353197d04495693ad90edd183c8117911be4a0b155fd52b63c07d13dcb845cf2b4968e1e496f1500821b39894cc0edbd7804f59fbd1abe4da36c32741fdc58 SHA512 0744532b539c34eac84589fa73e0c774df24a39afc8bd9669c58cdc813eb22858631f47fe036a9e4eee3c92d73a17e04566a6c5f0f75a60d157ed2d2eacb76ae
 DIST gentoo-kernel-5.12.19-1.amd64.xpak 66346655 BLAKE2B a03cbcdcd1a90d48d7e11e988d03efa43980f4d5d8af4b74e4c81f195faa01803af45fb38f7dc1f5af7e9b5338a53bc6f34837c37f7e853c088ec6c1dc084e44 SHA512 3d7f78c488ecee2532f8a8ad61e3aa0f5e238e4cd520d29288715a3dc5c488670d7378f3dc5bc110252dff10108dfbda27a54722c6b044151999428d002b34e1
 DIST gentoo-kernel-5.12.19-1.arm64.xpak 60043529 BLAKE2B 8746081847a39e1847b8e9f35fcd68565370b116d6418edf803c4cdca9d750ac8ada58c4a7fd377480a1c75b3c805864d419c02ee21675bc77ac195731385a18 SHA512 d1a8a9210a1ab3d3c1894be1fe524e64b859b0a02763feacfed1a24655540ade6c28af751b23e924fcc04fb9abd56e84c43d634ad80bbb4d5de79ed533b5ea50
@@ -87,6 +88,7 @@ DIST gentoo-kernel-5.13.18-1.amd64.xpak 67341241 BLAKE2B 5c6a220b20bc426daa42c7d
 DIST gentoo-kernel-5.13.18-1.arm64.xpak 62764880 BLAKE2B bb1777be907a947fa0ee5cd5df47d8bd1c5e0a5b082d545a5fd2ade99f53e553d9ec6b57d6f9b5e42703a17cfbb9775520fcd1d6015f3a45f7dad391bbf3ed25 SHA512 2f54c28b717ec76a4d7fc8a17c37c963861ae65f0e50a3ebd025ee4d993f168114cd77fbf2621a5dbd77e59f5f2590ba8524e8829462af1b5193ec8eea8b8e78
 DIST gentoo-kernel-5.13.18-1.x86.xpak 58523160 BLAKE2B 044081a07799be765552561fcfb7f3a9ff083e05d4e231041842c01c61d478bb78fb84bf628cd6f739961f622f440110578ae1ff7851e5ce10338b7abc775b6e SHA512 67b1e99eac517b1266d9d6aa88bda6885e4669ac388b78efee6e1de354580a6f795b5cbc2fba298a38dc8c95721a8d26312eeb9cc24b9396bb548cc9632ef40a
 DIST gentoo-kernel-5.13.19-1.amd64.xpak 67338326 BLAKE2B d9e718a94bf9a341f5b57063cbde2f3f1f0ea6d03f1805051c084b792388789494a49786d643f1570871ca2b6366a206497aed83f9ed00837c542ac970a71fc6 SHA512 aea74f6f39861752f7a5dae16d955d541f65d3e7b8a0e5fba593011d9ca8583f3dd0964e76aa21daa6583d5d26e3616885aeca8a04dbba222e0aae2a85062b40
+DIST gentoo-kernel-5.13.19-1.arm64.xpak 62747957 BLAKE2B 1981ddb4e35d2210e1c678856ac58e088cd100ecbd70d2b5c88ffe8eb25b56f3f0c90e45d12adb74c7a0fb881dfd36b1d46d6fdfb837dbdff1881ded066b906d SHA512 d8c1e524a3e58def5352b3faae07c42074a2d67015cc62b9601e20bb9b7f29d44d2843e7771e0399e9150be1de2be2b28776f96f7fe75ba7ec4e8f2c31e1f715
 DIST gentoo-kernel-5.13.19-1.x86.xpak 58517020 BLAKE2B 1dcd347af7693696f93f7a28326aff4c7936c4b71238500b6dd2a4b7cd2b88891436c7c8b7c6a56f638182b722ba5e75f52a1befc74eef4bfe9e6f6fd7d8ef8e SHA512 7bf1cf45d06cf4c6331d8d0c0378d253f6760dbd2f564cac6f7e53d30748ea01ea2d96a6c409a0d653ed74366d319e28ae1e2924b07f4ce7899c5bae121a3630
 DIST gentoo-kernel-5.14.6-1.amd64.xpak 68042594 BLAKE2B e65f4a2fc48c0d5989e6b5eebfb6d26d97ca0772fa40cdae0591d264544fcc7ef8575a230bc4a74277dc3136cbb5ad9f95fbf7c1dbaeb2615022c43fc505ffff SHA512 36cb5b165c29e1dff1cc6ec062f99a5e566050dfe83d696384d43f93767bb1a8b2914d92f2a1bcf8dc5b61947bf2b2586ba05f37833f8666ec6849509aac8bbc
 DIST gentoo-kernel-5.14.6-1.x86.xpak 59165165 BLAKE2B b376b096789549da8fb39bd6d0fd294e09d1c23b83dec963c14a1fc45ae81bd296d7de91721ff7722af12feb3547d2d8d415025d5c573a8ae35b7edee61f9937 SHA512 1c5ec62b7de43a8337496868781d44be96b846c159e7f14a382a442fbb2dd6cc49a95686302705d5d8e30eb92aea397dd18eb0da4c1183692bdc159c07502b72
@@ -125,6 +127,7 @@ EBUILD gentoo-kernel-bin-5.10.64.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9db
 EBUILD gentoo-kernel-bin-5.10.65.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
 EBUILD gentoo-kernel-bin-5.10.66-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
 EBUILD gentoo-kernel-bin-5.10.66.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
+EBUILD gentoo-kernel-bin-5.10.67-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
 EBUILD gentoo-kernel-bin-5.10.67.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
 EBUILD gentoo-kernel-bin-5.12.19-r2.ebuild 2544 BLAKE2B 7f3517bdd2c1bc73ded6502b5ed35fc403fd5013075a4e9e21335bb610be88ab6e17cb298d74e739beb3e330a7e3d52fe2a3e24cf0d254eaf61590f3a413f92e SHA512 abf32b339058742ec4e95e8ac134bec00d68a5a599efc6ff208299370e2032ea8dc9600eaa21e23047289ce9ec807819a26c232c17893d52e180a852034c70f2
 EBUILD gentoo-kernel-bin-5.12.19.ebuild 2675 BLAKE2B 72309c486946ff627032085b25686e89b43a29fe5c68ecd57be8b6ae8556d76651ea1a41b88f99fc5317880df9589ae6ce49d580d1df3f0d6c7409bf7227ce72 SHA512 5378f15c4f5e70117f8e12726a27d81e26f91e2443936eca2ce086a16dcb61eba1d28f16ae42d5b2f97c88e96e5fbf95b71ecdb79f2a8526627236ed5b408ea4
@@ -139,6 +142,7 @@ EBUILD gentoo-kernel-bin-5.13.16.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a
 EBUILD gentoo-kernel-bin-5.13.17.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
 EBUILD gentoo-kernel-bin-5.13.18-r1.ebuild 2541 BLAKE2B f4293af94bfc918c3c5707dd020ca21551fd6101e5290230345aedad820f6832f217f307eea4c53e950414ef8675255e84ad0da7202f7f55d2da3d7a98c4ae27 SHA512 f7628a110b0bedc7d604eaaf758ae42211b4a68f3ad244387d19cc3411d9fb4f7d5ed391309f7e365b6e104ef0859b05f0c8e4bd2b4b26c15152d7119d426a97
 EBUILD gentoo-kernel-bin-5.13.18.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
+EBUILD gentoo-kernel-bin-5.13.19-r1.ebuild 2541 BLAKE2B f4293af94bfc918c3c5707dd020ca21551fd6101e5290230345aedad820f6832f217f307eea4c53e950414ef8675255e84ad0da7202f7f55d2da3d7a98c4ae27 SHA512 f7628a110b0bedc7d604eaaf758ae42211b4a68f3ad244387d19cc3411d9fb4f7d5ed391309f7e365b6e104ef0859b05f0c8e4bd2b4b26c15152d7119d426a97
 EBUILD gentoo-kernel-bin-5.13.19.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
 EBUILD gentoo-kernel-bin-5.14.6.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
 EBUILD gentoo-kernel-bin-5.4.142-r1.ebuild 2541 BLAKE2B 582eeb0da7630287ae863a8787a85275b9e913186b46f817edf3d37cbfc19c03517df23d1457a23eebd3c4a8c7875cb6a7869fe50c6e6d58528eefc6978fb167 SHA512 dbb6667f53bef8c8d1c9ce2cc38b79aaa817a1c13ea36c7802dab0c5c13bc75c3f49a661b11af0fc111d71f684512411cae7b99cd7e56f2efc7bee83155cc0c1
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.67-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.67-r1.ebuild
new file mode 100644
index 000000000000..9f8ae493e215
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.67-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.19-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.19-r1.ebuild
new file mode 100644
index 000000000000..56164dd0991a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.19-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+		-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index d193b6c8b89a..a69e54bc32a7 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 57b7a448aa38..923ca345d813 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -5,9 +5,9 @@ AUX libcap-2.48-build-system-fixes.patch 6274 BLAKE2B 4c81eb50b0a682ca9df03145a5
 AUX libcap-2.56-build-system-fixes.patch 6367 BLAKE2B 3625df48d4444071d710406a78599bab9b25d2fc1b0fe0b722053690b7ac99e62a1d66ef3597678752dab506680425b0c47fed386c1b83b86e13e357f0408157 SHA512 560f54b2018602ba9c39938ea7623ee363eca9c0f11467a38292f074a0e53b9cd0f38724cdcc952d759c0da0952199627aabc1d253da0aecb1c2301f595bf714
 AUX libcap-2.57-parallel-make.patch 1103 BLAKE2B f5c1517577d7c34ed8a4b9fcc8527e93a5b6301b3c2bbcfda21f3caa4bd3c22e6d524ea19f93c645f4f93153a71f93c132c97bac90594d4abbb3bb629d175daf SHA512 06e2d5d3bc757760b3bddedaec88373a7aef7d9052003bac46fe491d2e356247f0f1b199dc1ea11cfd368a5c047e8621e8f0cf8a1d82407deeee2ebde60f67a5
 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0
-DIST libcap-2.56.tar.xz 167056 BLAKE2B 97d1cf6196bcbcb48e335f810385ca2b36e7c3e234a1f99172fe00419ecc4af7337f208e107f012e5ffd46c1b6207a9d4515f3a677a924dd26ed8a699a080a5a SHA512 8a5c6c99458b0996c9599e00648e99e53b222ddf429535c475099c1af02796331b864fbfae767c16cfb7f2899cf0beaf74095e26a52988361ea1400f012f30c8
 DIST libcap-2.57.tar.xz 167740 BLAKE2B e0c004f3d11caf824d907315e6102707bb34c0ef3e9d430f23c191d711f073267ef6dc44463e2ce8041b8d13658b0c20560f7f3c6387f770ff9e66b81ff9f5d3 SHA512 5c70b3c6a1248ca0de92538614f0d0d516d72f6f25b135c92738c377b67533662e6fd6b0b61cb051ec99f406387d3334fcc7ddb54789626e4c387bcf46ebffbf
+DIST libcap-2.58.tar.xz 168520 BLAKE2B 9f160c08e7e8bcb9eb49ab6a7a0805145461613a946ccfebeadc269b26331eadc9f467437b2f5b022e9a545b034ea4fd8fed4d5893e84d9a48dd85318810b974 SHA512 092e45f82113293e1c2db7e51dca7298496c2a3af08eb41107e8c2b4798c25d3c9059e152181dc048b232fe0e59c4c3beaa158da2e5798cd6e1013d85226a9cf
 EBUILD libcap-2.49-r1.ebuild 2127 BLAKE2B d77712422b1cb13b04b1a18e573c20151b03098a9effaee4a62b51f4035eac2f3dcc2760f6050d05220dca63edbd978df79299e6be4c885a73ec7a079d1cd558 SHA512 fb01c7f3c68d3fa55221bc0602c21ddb399121f97a0a3c9ef5788bbecb3912cc9f9924bd0339e27acc3103d3a1e110b4029f99c27a7232fd83229075383d898b
-EBUILD libcap-2.56.ebuild 2215 BLAKE2B 2538bc88c4f445d7eada3e0b3fdde720d95d03cf4bb56b8cf29d94061fbdf742f5ab951e08eed276f541de38ef0640276a83802bc7a86eed7537b84f00b0d23d SHA512 4eb915980141d110bd8c706e080a9190854f0d1e203185254a34433245197867fda31c70fa90d495cc866bc0b4ab23af0742879871b53240eca98da8a0b66621
 EBUILD libcap-2.57.ebuild 2218 BLAKE2B 31b59f3288097cbad2db73d8a08f6c92dd20e8f3db24ca3a70e38d6d8d07294833eb6773db1822b508c11fc7af47f30b422f0c578dd7f4d029e5af278e77cfd9 SHA512 ebf697457e90c80c89f67b0d1087856edb50a5ec7dc2cc45d13ad3e83c060bd71b519f88c02e70d2207d24e85941942663f370fe5ce488364cffa1c7e8b5f7b3
+EBUILD libcap-2.58.ebuild 2136 BLAKE2B 01dfe09c3089be3dc63da9d5c2ab8a1804979bb2a901d229cdd1f4722050307dc020f6745609bebc2e3d331065fa0ab06bcff2ce0b53588276eb3087f8afacb2 SHA512 75de17b063652f6c0788c26d19589c1790d5e713c47558f1e6ff28e4e7adfc6a66683be2fbc8cf6250ebc3e8670e4bcbee8f8f1d692846550b3aeb35334dbac9
 MISC metadata.xml 438 BLAKE2B b5260cc84a3fe6b992bb6218846c738af296522d7a467337c05a6240fd07fc9d6cece779bd9fcf24a11486a70874e17acae8182647d307a31cf43e1c19c3a2d3 SHA512 fa3713dcf6b7bb2ea6d4c2fdefc05e92ae345c76a6187ebcb40dab8c4ce0148650a8301f236efcb8cf53fff25730977a385578dbaa160b800159c6d6abbf37a9
diff --git a/sys-libs/libcap/libcap-2.56.ebuild b/sys-libs/libcap/libcap-2.58.ebuild
similarity index 96%
rename from sys-libs/libcap/libcap-2.56.ebuild
rename to sys-libs/libcap/libcap-2.58.ebuild
index 0298367e4475..ea1e6af49768 100644
--- a/sys-libs/libcap/libcap-2.56.ebuild
+++ b/sys-libs/libcap/libcap-2.58.ebuild
@@ -23,8 +23,6 @@ DEPEND="${PDEPEND}
 BDEPEND="tools? ( dev-lang/go )"
 
 PATCHES=(
-	# backport, remove on bump
-	"${FILESDIR}"/${PN}-2.56-build-system-fixes.patch
 	"${FILESDIR}"/${PN}-2.38-no_perl.patch
 	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
 )
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 8e04fbfb5913..ecd2fce18703 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index e37afada0f2a..cb2373f34a0c 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
-EBUILD pixman-0.40.0.ebuild 1660 BLAKE2B c33785d34facb8218a6826e44bf86d4dde5d1bfc4e7296ef0a2c8e408745b72cdbedf8bdaadfeaf7d9deb56865ad154e1ded0d677bfd2e0eb1884f70d9a0984d SHA512 f7fe9c0703050119a91791a2ff9939aad162a2ab7a5f90ca2cfff012e6b06c752d7265939c704c5f37e94597b75211f43b22eecc17f966e177e8c25ee018fcf3
+EBUILD pixman-0.40.0.ebuild 1666 BLAKE2B 8339d9706ca95fe69b4867a434d38a3e18d361c6bea96019ada8c9112559b5b025262415a30ba53f5e91e0b66a890ab906d9c76c5e0712b31434c6b8e731e928 SHA512 2cd680ad534d5eec4783a8339c128af3d32553f041fcf34e226041946fd1db30476b4c6ac2f28f88d0556e2578cf708b9c1edd627452f757908462c8add5d3f5
 EBUILD pixman-9999.ebuild 1661 BLAKE2B 50684ad73e5be11ede13f57afbd56ba5653550774654cfc3f6fb82b2501479e72db9e5e67277b17146e4517e643ba0c0ab30bd2057524dfadb4ed52cdbbd8cc2 SHA512 168e5004344045e3146023463bd5f364d073a71ff3c1097b84f6a4e1c93552ea16d2649d5c1597f68bde71d0cb53c12eab190db0177c6da33a7c6a4073ee7709
 MISC metadata.xml 392 BLAKE2B 5ad5ba991fefef08fe1fa364ce726a90a338c6840947cd6fb9ac57b7e4cdff0389d9a6fac955164529a51ee5ec92cd2e478e4d330484593fcfdfc8d5325ca21b SHA512 ae68e9a2a492e899bff3ea5c70c88f054fde927c18e9d4a3c08030c8b2f5b6f2977bf9590b4d4776bb1151a3cd9de72bc18460c0ebdc2f506c8ff51b99a5b3c5
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index 65d7123b398b..90fff3bb9046 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	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 ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi