gentoo auto-resync : 20:12:2022 - 01:49:56

238 files changed, 1665 insertions, 900 deletions

diff --git a/Manifest b/Manifest
index cef9fb529146..e8f19fc2e32c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29805 BLAKE2B 65d706caa14e7f269b5db1c9804cc1edff5ecceec290d19adba32f196725f50ecabff7507ebdac94db579a8bffc594891b8af7878836600af8695680b34e786b SHA512 cfe57c026cf7800084de6dcd73963546dbcc2ddea8879b872063696e723b8c6aaa6bcfe6c5cafbc4a170ac77e5306f44568a9016e789eeb26f87d01f6f59d04a
-TIMESTAMP 2022-12-19T19:09:57Z
+MANIFEST Manifest.files.gz 29791 BLAKE2B ee8022c9373b02dbf189f8a5b70c9b928d68d4a9d459fe0ec264a09f6de94a6589057e20640a17bbf004e6a18adaa3cbdd4d97cad64e6a2dc95bfeb28c1904e5 SHA512 bcb2b3dcc23c95dea6be53e599e00a161470767b1da0c4e2500032349d6123aa4af0cbd5c8ae5765848c4af0b02cb0bdb3dfa92be5787bccbb71b1ea28b7df16
+TIMESTAMP 2022-12-20T01:09:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOgtwVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOhC2ZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB4Ng//UlNN/C2V/kgypm7M2Q3vQjx88aHSP3TlhPVM5XnQpfU71u6o1Cqcv3zE
-1mZgj6jokVAIF4eNSz1kOCyqEQvp0YMs2+36wJ7woIoWaGxcEdlKNCW8xMOzCMSa
-uX5IJKC9jO1SZIP6skNc1stZLc8DbyBgbhoEkUq28GfwDsUWzco6E3CedeiB0U4g
-O4uu3UDiheEjMdoLrqySNWhexoEvSOPJSYfqjbuoiAhWC6kKXMHTid3Fot6b4gbn
-H4iM8HwIYmDOKjYfBxN2/c5PeXcYLYIvo1Ge8ZWJKGO2QJKLtX3gJ9xck0ljlgc7
-Rt66NgkW6Syecfq9CxiawPAQXH7nrMwYfxzWrkku/eVip5fkSl2LMhvH7K+35t+b
-PSjwBf8DNNPc92cJMA78NFvbi+wQpzc/mfDNlgWlCuNc9Gy7D6nEypeqa4IpiZEK
-25cjCVdJJs7x2cWQ2FzwdwvXXompzZ1QZvrP51PYgHYmidngTfgElKKYgCMt2iBM
-oRXJKyQ575pGccOeDWwwqjckiKBbQUYDczusiKD9yiQ1mRB2zomAWI7L3o3kmAli
-bTt9eUjeUixIpn2fNG1UqU8eavBWydFqfpqhg8Qx4GBBmr0WlCyohp8UdKCmySi8
-Gob2J0oZwVB0iFAOqYg6ZDoouCd1RyPT7WmH2FfElrOuBAODOLU=
-=9JIL
+klCJUA/+Mhkddit05bfJh2eCHI1Ao+fLtm/Vjz7YwdvCC4ytrg1odBjLo9icpOjQ
+rGfthN91CgI/guOibJTZigaDKWlV9kNflptha0qfEjzDAsxPwqdnNqOcedZ807I2
+vJsYI8fq0Hvvf5TTM+KwXYagRVfTVIzqxpO8jY2Gooj7+XfssPLzCSzpgwVHas8D
+9wBbshXQ8n3HavWpyD/IiLzWWiyRGsKbeUdmQ4sONIw7aXy/b8ZDmz3M19C3MsEK
++56UaduaUs+4BMdLWTX1n44IK7RgQDHXpjOr6igZXXtAsGCddh0l8wjjicyB7+DS
+Q0M+hyX1L1PcHzm/rNXgOJMp3//WTRnRw+c2zerDL3CxzH95PPrYAkZ9984Wazh5
+vOAJQrkCxro4TQXaGe/heIqoLje9OqcxFj6Z3eMrUuwl/jK1Rs+TAdkhNKt/+GHL
+mQtNDk2t+9+wlIWp41NLW5zEYb206HVrGbPjOkCZ9f0bYmB44c7kbidSWsrb+xxM
+q9hbVgeVhWWGt0QOW6bp0/5ZVxqYLKtR/WY2bqd5Q8saZAvCerQqYu6cjF38cGKN
+JeyewfPva/pqd8Hm/oGyyJNztasAEsz/CMBN1kBJujf7P242ucM7KJwx+j7St+Be
+p+tQ7A7UqlQj6I89gDllKoARztY4AHmcd3KE9hKjisDOB8zJINg=
+=blPx
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a947e2caac27..d43ade9b0314 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 38fecccd2ee0..24aff0357434 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 3fea224d618e..4f05e6c5ed44 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,7 +1,8 @@
 AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f704466836a81ed3f3215afd646a10750274f0ce4bac1bd3f02545af71b0b834e51a6dd26aabb48449dc876d743045bce323408818 SHA512 b3a25b6d18256381fde7ae9cb91d7eabedaca27214398fb29949b5a816d2ac0dced8dd188aade8469186cc82df8e4c5620489a3ca0f0598b337885a8fff3b741
+AUX rdiff-backup-2.2.0-no-manpages.patch 1627 BLAKE2B 5662aa2a29199150fe78da472638edf3df20532274e3b077e752e6a14471c63c104bbb51661335a739961f4df43475a4ec1eca2c2c89c955c10dc9b508bb2e02 SHA512 f40f377372bc0cf83d8cabdae573828675ea36352345ecd2cf5ccff8a1da9da0dafd76aee9e8195fcce4acb9172efcc1a33f4bd594c590b19d96574f66d9597d
 DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
 DIST rdiff-backup-2.2.0-manpages.tar.gz 30062 BLAKE2B 88a9afa238e7a1551aed5f60801d5445a268a6a0e80035564a8a37379f2e356a7eb8f9f39180948a7fd12ba153e08f400c77fa5badc61f79f322054842cad81a SHA512 23f2112b16e4d3340a15be3c58f2a716177268a2d38e5ba28eb72230522a25799ae3a8faf5ffc777777fd262023b2b2dfab09198112bb24751a3a8c4766e85af
 DIST rdiff-backup-2.2.0.tar.gz 903121 BLAKE2B 53adaa64842609e40bbc7aafc14b9a2b062fb5aae17ee6eb5c649a93f7dddc99e3ba681587aad2f9e1adb7fc8191073ccbbcb9e26bf09a90274740b013fd10e3 SHA512 3cae2ada5766c85c7aa1d1c15bd4068e406f524143abcae58775ef24b022ceec499c3262e54bef184f70a1c22c4eb2ce3fb06babbaea64dc0a9115b80831fde5
 EBUILD rdiff-backup-2.0.5-r1.ebuild 1012 BLAKE2B c1ef8d9afb892cb47dee4e2201953467f56faf7751ae477d23ecfb34a846b28c7bb0f0624728f2c03d343c592a07e67cd0b0b8e553193fb45b5b561f2f3b34b7 SHA512 4007839a1cf39081ed66a5de4de32bf189b313d370c8934c865f1f81745e8d7e4fcac1c6b7c6a716a9bed463d10f0cf08b8a0d689ea9566caf014efac8b207d2
-EBUILD rdiff-backup-2.2.0.ebuild 1069 BLAKE2B 9ccf23b9d656872c16d6f3a506d577a4c2e95be1302801608983afc62ef740c38be48c58efdda89ecc00deecf8adcc06ffc4a9d7b38231949935050940eac0df SHA512 044562d11deb61657b47b890aea69307b4984eec26280adb39444c840128706e975f5be73f1fe50c36e1608b8a25b56b653a5757a84e621dede25260f665bca3
+EBUILD rdiff-backup-2.2.0.ebuild 1155 BLAKE2B dfef04919ccb2a2b9f1624dc97771a7b9597c75f6dfaca5e44bf15e55291f21746dc552032137685d95be0e6c93f818c4287a59cb3a0b1c2ea0cc7cb08890155 SHA512 4bb52a1f69ade65750d97f48921935309fc78a513e587e1d08bfc04b3778ec907820868b61b9099b47ea46712421a9306fb114acf6621a98b293624fbb5cd74d
 MISC metadata.xml 343 BLAKE2B 6ad7958e3c4aea63c7f11fa7810796dc0a83d8bf199e84e44aa3b60f67487cd56ed09ba96c1e7b138ec38b9b812d4b5450a34f81ffd5a5b849c3aad22f1ae38f SHA512 68aad43eb0e9c6e48f3203ad5596384865b0ced8fa46f45aa5214450d6c840cd0ffe90d975435cee4ee2ff58950486430a29ecf37b61e9e539cc8c8300425d53
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch
new file mode 100644
index 000000000000..207bf6cfe106
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch
@@ -0,0 +1,35 @@
+diff -Naur rdiff-backup-2.2.0.orig/setup.py rdiff-backup-2.2.0/setup.py
+--- rdiff-backup-2.2.0.orig/setup.py	2022-12-18 09:19:30.000000000 +0100
++++ rdiff-backup-2.2.0/setup.py	2022-12-19 22:00:43.289239007 +0100
+@@ -283,10 +283,7 @@
+         ),
+     ],
+     data_files=[
+-        ("share/man/man1", ["build/rdiff-backup.1",
+-                            "build/rdiff-backup-old.1",
+-                            "build/rdiff-backup-delete.1",
+-                            "build/rdiff-backup-statistics.1"]),
++        ("share/man/man1", ["build/rdiff-backup-old.1"]),
+         (
+             "share/doc/rdiff-backup", [
+                 "CHANGELOG.adoc",
+@@ -311,19 +308,6 @@
+             ("tools/rdiff-backup.spec.template-fedora", "build/rdiff-backup.fedora.spec"),
+             ("docs/rdiff-backup-old.1", "build/rdiff-backup-old.1"),
+         ]},
+-        "build_exec": {"commands": [
+-            ("asciidoctor -b manpage -a revdate=\"{date}\" "
+-             "-a revnumber=\"{ver}\" -o {outfile} {infile}",
+-             ("docs", "rdiff-backup.1.adoc"), ("build", "rdiff-backup.1")),
+-            ("asciidoctor -b manpage -a revdate=\"{date}\" "
+-             "-a revnumber=\"{ver}\" -o {outfile} {infile}",
+-             ("docs", "rdiff-backup-statistics.1.adoc"),
+-             ("build", "rdiff-backup-statistics.1")),
+-            ("asciidoctor -b manpage -a revdate=\"{date}\" "
+-             "-a revnumber=\"{ver}\" -o {outfile} {infile}",
+-             ("docs", "rdiff-backup-delete.1.adoc"),
+-             ("build", "rdiff-backup-delete.1")),
+-        ]},
+     },
+     cmdclass={
+         'build_exec': build_exec,
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
index 398e35fac70f..b65b8b6ec227 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
@@ -26,10 +26,16 @@ RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=net-libs/librsync-1.0:0="
 
-src_prepare() {
-	mkdir build || die
-	cp "${S}"-manpages/*.1 build || die
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-no-manpages.patch"
+)
 
+src_prepare() {
 	sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die
 	default
 }
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman "${S}"-manpages/*.1
+}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index c068f278134f..856701759df5 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/distrobox/Manifest b/app-containers/distrobox/Manifest
index 2c55efa77295..cd7066bdc774 100644
--- a/app-containers/distrobox/Manifest
+++ b/app-containers/distrobox/Manifest
@@ -1,4 +1,6 @@
 DIST distrobox-1.4.1.tar.gz 231405 BLAKE2B 920fc2ccf20ad2b6af2a3ea3dfe5c209cd779d6490e6fb95110af5e74ce56354aa264f413c070a6814253a5c51e82be110b8fc86e536a4ae0881fa22afc16630 SHA512 6cee6b734bf22e678529b93f15cdf98f09506642ef5e204ae73590c29a85e205a16715588c9e49b1c39b71023ea906565078e9c2c1f6368df885d20bf37136e2
+DIST distrobox-1.4.2.1.tar.gz 235019 BLAKE2B dd512b183763a2e4c7e2b495bb50cc3fc3d764c48ce902b83e0b543587b60b458c6b9ae937057bfc91860dc415f9ad68fb648cf06faeeb56d0a4c27180e4c2e0 SHA512 d3bc1de91bf33b7ac500c0ae471feb28c9b1efdef6878bf1aed50ef394f69d2d36f99296f0a8182b139d9339558720b891f7dc1249a7f91c883c00bac5597283
 EBUILD distrobox-1.4.1.ebuild 723 BLAKE2B 19fdaf771bc7ba3217245b84fd5eccc86285e106671dc44d37ffd94b4827849c68f327d80e91aae35c9ff5dca6f6a575770d96281066c6c27a7e7fde6fb95604 SHA512 ed1ab9ee3115fc409b9e2aefc2cd5063cc76d05e3fac891fe5ddea3dbb527cc576b76ff0f49e30c28e8b32e06a466968ae0b28bfd1f3f00b4613ff340b21dbfa
+EBUILD distrobox-1.4.2.1.ebuild 723 BLAKE2B 19fdaf771bc7ba3217245b84fd5eccc86285e106671dc44d37ffd94b4827849c68f327d80e91aae35c9ff5dca6f6a575770d96281066c6c27a7e7fde6fb95604 SHA512 ed1ab9ee3115fc409b9e2aefc2cd5063cc76d05e3fac891fe5ddea3dbb527cc576b76ff0f49e30c28e8b32e06a466968ae0b28bfd1f3f00b4613ff340b21dbfa
 EBUILD distrobox-9999.ebuild 723 BLAKE2B 19fdaf771bc7ba3217245b84fd5eccc86285e106671dc44d37ffd94b4827849c68f327d80e91aae35c9ff5dca6f6a575770d96281066c6c27a7e7fde6fb95604 SHA512 ed1ab9ee3115fc409b9e2aefc2cd5063cc76d05e3fac891fe5ddea3dbb527cc576b76ff0f49e30c28e8b32e06a466968ae0b28bfd1f3f00b4613ff340b21dbfa
 MISC metadata.xml 957 BLAKE2B a02f57f2c65a9241edbc6a1e99170712ceca000977c2271ba51c5311e7718471585ea791ed8c978a86a961d02450623c05b5f9006d4386be2130df08341b0e49 SHA512 65f455bcfd246a8de0084e1534dc85f09435f1fad2590ba87dda0bed90d8fa976d3fad2142b2006a596e713d3d91f0d3d3156017cebacf9dc7883596edb0740f
diff --git a/app-containers/distrobox/distrobox-1.4.2.1.ebuild b/app-containers/distrobox/distrobox-1.4.2.1.ebuild
new file mode 100644
index 000000000000..f3fc5a365796
--- /dev/null
+++ b/app-containers/distrobox/distrobox-1.4.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Use any Linux distribution inside your terminal (powered by docker/podman)"
+HOMEPAGE="https://distrobox.privatedns.org/
+	https://github.com/89luca89/distrobox/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/89luca89/${PN}.git"
+else
+	SRC_URI="https://github.com/89luca89/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"  # GPL-3.0-only !
+SLOT="0"
+
+RDEPEND="
+	|| (
+		app-containers/docker
+		app-containers/podman
+	)
+"
+
+src_install() {
+	sh ./install --prefix "${ED}"/usr || die "${PN} install script failed"
+	dodoc *.md
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d0f73098282c..a2f0a1035252 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/engrave-faces/Manifest b/app-emacs/engrave-faces/Manifest
new file mode 100644
index 000000000000..ca66c14c6d8e
--- /dev/null
+++ b/app-emacs/engrave-faces/Manifest
@@ -0,0 +1,4 @@
+AUX 50engrave-faces-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST engrave-faces-0.3.1.tar.gz 23748 BLAKE2B e58e8a0c03c80682c6d1a69f00148d61fa23ae5df1bf87604e2e259e436f2fe3dafe26dd49aaf520fb8779e4171a609f54442cfcdfd2b608f2d896527a3b230b SHA512 97303d9324013028feda5d357004315536733f2f605995b5cdb69b22a955e030654b8e1595bc80b9070a22e280c3be3f44cbe1e74c12bd5e6d7066e884fc59ce
+EBUILD engrave-faces-0.3.1.ebuild 436 BLAKE2B 6a81fceb82f2c263e03b1a3eed24d57d3b6da9d4046fbd9205aed589872284b1a8bfb247ff5c8095e8138e86d8f4cef792b38d1e54cb344db64e676499ab24f9 SHA512 272a6426c43c8d249a50e6a4225d3e3ec1eeafbd4336fa4e4fe38d528807b9a094331d788f019979a719733d604ea95382893f7461392be1a4f80961e176d30d
+MISC metadata.xml 702 BLAKE2B c2180ee33595ea3e89012c9e387470b742fcdbacecb115640f53766771ab820ba05507a55d2615fd50f25727e15350d628d789f17ef6d5740b6c41aeb4a0816c SHA512 e55e94c681df0eae400228b09a01ffbae8fcef95f643b777f9fbe2e9ae9f2245c4229a830a5918bab7c19579ceaf8aa7ba01381834262316fb2f2e82c2b6a880
diff --git a/app-emacs/engrave-faces/engrave-faces-0.3.1.ebuild b/app-emacs/engrave-faces/engrave-faces-0.3.1.ebuild
new file mode 100644
index 000000000000..52f2efb4ab39
--- /dev/null
+++ b/app-emacs/engrave-faces/engrave-faces-0.3.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Convert font-lock faces to other formats"
+HOMEPAGE="https://github.com/tecosaur/engrave-faces/"
+SRC_URI="https://github.com/tecosaur/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/engrave-faces/files/50engrave-faces-gentoo.el b/app-emacs/engrave-faces/files/50engrave-faces-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/engrave-faces/files/50engrave-faces-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/engrave-faces/metadata.xml b/app-emacs/engrave-faces/metadata.xml
new file mode 100644
index 000000000000..91d9312e75dc
--- /dev/null
+++ b/app-emacs/engrave-faces/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    This package aims to produce a versatile generic core which can process a
+    fontified buffer and elegantly pass the data to any number of backends
+    which can deal with specific output formats.
+  </longdescription>
+  <stabilize-allarches />
+  <upstream>
+    <bugs-to>https://github.com/tecosaur/engrave-faces/issues/</bugs-to>
+    <remote-id type="github">tecosaur/engrave-faces</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/orderless/Manifest b/app-emacs/orderless/Manifest
index 5565112a781a..35d9c710b45e 100644
--- a/app-emacs/orderless/Manifest
+++ b/app-emacs/orderless/Manifest
@@ -1,4 +1,6 @@
 AUX 50orderless-gentoo.el 84 BLAKE2B 663573f2689256eb1de3111304494fa84a0e136af0a9e247717b02d6a6012c44615cf3690241ae3db8a19c0de07f9055997b5ebe368ba633542cd054fd3f8f3d SHA512 727586260e0da7f0302e3a0e1177bd0bc1c2f8d9f40d0a8c858a85bc539bb1cfd4c881b53f44e66a4eecfd4aac854e10993e876de381152f4913ea7ec9c13b70
 DIST orderless-0.7.tar.gz 160435 BLAKE2B bf4c3380b368458fb14c9e851532f3dc591ab3576da1ee26b7232e38eaa2e8e7dc7a18cb46bd005de4e30a47d0395e83fd1e36f38017b0758bca549d3ef853af SHA512 7f3a5781ed5e8787a9b47cae8c9397538434ab508c9638e80e19ef0f074cfd94b2522c3f2bb64f4e8a008f59dc44ea8ddd21b6690c4df1e997c89a921297ed10
+DIST orderless-0.8.tar.gz 161385 BLAKE2B 32c929f9bf26313392f7df62eac45431ee15ecbd23cfad23e0ea4f92930c126df5c940828ad39d4fee2aa1540c3099f0ad12d87f21d800f968f0c21fd2b775d1 SHA512 3c72b35da1d56c4090ac19c672a24d8a9858c0827eb25bf50ca53de9885dc5bfea53afccd5d2e4428e87c7dbdf59dc3cb5236046210f60486aeae12c61821fd9
 EBUILD orderless-0.7.ebuild 690 BLAKE2B 569a305b8fd0d1a4ab2b9578ba454c5f017d7e68d79a25087879f93a586c043d1996aaaf46f8e7667daeefa4a8c1ec9c26775f9f9e509b01b1fb184031f2ea6a SHA512 476fb691dab7263bbfa1dcda6ef21790f010b3ac413113fd4c8cd224891696e1f707d23c4b283cf49e85b6a68dc434b2fe17868785863f8c4c4da2ee0ce3ce00
+EBUILD orderless-0.8.ebuild 690 BLAKE2B 569a305b8fd0d1a4ab2b9578ba454c5f017d7e68d79a25087879f93a586c043d1996aaaf46f8e7667daeefa4a8c1ec9c26775f9f9e509b01b1fb184031f2ea6a SHA512 476fb691dab7263bbfa1dcda6ef21790f010b3ac413113fd4c8cd224891696e1f707d23c4b283cf49e85b6a68dc434b2fe17868785863f8c4c4da2ee0ce3ce00
 MISC metadata.xml 364 BLAKE2B 3866465d96c2508dcaed43f67f6bdd861cce2c8b2d98d9bcaccf28a566a868051861c10aaf43479fc0228054a86ceeca7da1e0bec7e7ffe87e6eb6f858628c52 SHA512 a8490a67c98d10206bbd5bac7c960ff0d216a29731d73d6570d0300153b40f2de85d09556ef39d0db9f7a0d24c0c643452e3bbd2dfb4973941fe73236c3206f9
diff --git a/app-emacs/orderless/orderless-0.8.ebuild b/app-emacs/orderless/orderless-0.8.ebuild
new file mode 100644
index 000000000000..4e2b3347a81c
--- /dev/null
+++ b/app-emacs/orderless/orderless-0.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=26
+
+inherit readme.gentoo-r1 elisp
+
+DESCRIPTION="Completion style that matches multiple regexps in any order"
+HOMEPAGE="https://github.com/oantolin/orderless"
+SRC_URI="https://github.com/oantolin/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Enable orderless completion by placing
+	\"(setq completion-styles '(orderless))\" in your .emacs file."
+ELISP_TEXTINFO="${PN}.texi"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index d45b42dd2727..c5ffe2da9b58 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index 83e94fd58cd1..226858bb93af 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -2,6 +2,8 @@ AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb8
 AUX aunit-22.0.0-redundant.patch 804 BLAKE2B 2bff62c0b0a19b617af6bbdcae90af536f3fd23e645d0f2e5e93dd1c6a334e3ecc112df8c3051aa7d58f3e9ab3ea41756e916dad4a395de8bb79ce86e0ef90f4 SHA512 de5154c286a06b795da449a0d0de27e5153a4b5c216bd6f484ca89ca6a249a0f89ff608a25d4f67b4e002a86b05f3eb1386a9e7d7980ffc1144ac3cfbd034433
 DIST aunit-2021-20210518-19DC5-src.tar.gz 625153 BLAKE2B 385478bcc889d5f764a3498d98915928671a546c7345d8ca3e4f092d85a92c7b196d2a3f7a81f2199237f472f691d30b05b2f3308f063c509d8e9f3e834d620e SHA512 c365ed5ffe4ff60413969e92989396c6d2849a1f16ceb4b8b3fd666153f6cb480f4d74c42362fb751c522a29a555996e3bc5fdd0e80ba2e817940599f8be4798
 DIST aunit-22.0.0.tar.gz 131442 BLAKE2B 6ddc2f37ea06cfd5c7ad4d145b8889e171169108b90252feacf600a00acbd4740e638e7d478e4ac474953f9f3dcb118a4c5486a1cca6380b054661cf4b5f7e18 SHA512 5380fcb18ede7422507aff566f97521760fcc8a713d0e90195128189807784fec828c2e2c538aa0ac897cbdeb15fa2120e67b9e998875aac0ade2636dbea4e96
+DIST aunit-23.0.0.tar.gz 131699 BLAKE2B 04ff77214ab6f4f5d59ea0609fffbc6fcfb4695d2fbbed45efa14e2b745c33868e1c134e5d00a7c3d8f11b1a8d15c6212110c78a53df4230b5862fb9b912a434 SHA512 450caa79e4808188107cd065665ca9cab599934e3934d18406b08d3ccebe26c1e95cd0c712ea3403d6082c7c5e8fd9ecf09ae3b63d231b80ad575048b3d61943
 EBUILD aunit-2021.ebuild 1184 BLAKE2B 503bdee703b8efe0f788a632aa34e388ad39c8f8920cd00895b5e9533272b6a85177a165f95411008d9a6f1debb81bf329162577bfc5daa0915cb821b2a01583 SHA512 3a42b2a1ecd14a6e1304571ac967dbe9f200247a57c18d40e06113714ba0a2b54c8bfb631113d875c6024bbdbcb9d20af92fa86b33b052f479d32f53c0d4e4ed
 EBUILD aunit-22.0.0.ebuild 998 BLAKE2B 2eae35418e29ef5886a6ec8e83f739aa2c1c6cb4fb56e6f400b659170d42e0bc0bd6a7e579ace57086c30a334ace13d1c517d662dc234a3c379632bdc599324e SHA512 0abd859324d79bc81bd135d82d3af28be13ed66d37784a3485e5c0206eef89107f923b46fa812a5abda814ab794fafcc33ed5b7620f227010b916319a773e848
+EBUILD aunit-23.0.0.ebuild 925 BLAKE2B 10735bcc40e107342faa0c39fefadba09eb44ac231ed968fc387bdf56f07507f69ab0c72e5d51661853d91541aecc5001e6649eaba6d6c6a8511caf14b6fd4b9 SHA512 dba0addd11b6e6c96f1089c3e29f9a112c1b94035ff13c321ee9416f21dbdc02914d9627eac77c03a396b747c98b5dc1e5f60372fa8fc12a5cef57a908d0b5b7
 MISC metadata.xml 843 BLAKE2B 3f8a899e8d22a411596aae79b739e3cf47b7b867bedede255761146d65e70adfd810544528018212b8a3f36a59f2d886682146a6370ab33c976f676d331b9390 SHA512 2ae746ded1a937362aad360ccd273143b495e43e71aeffb23dbcc71f93154bcc2fce6fcf6fa99d2a7ab1140ffb52ece0b08d1a010a627c0d10ee80e7984fdc92
diff --git a/dev-ada/aunit/aunit-23.0.0.ebuild b/dev-ada/aunit/aunit-23.0.0.ebuild
new file mode 100644
index 000000000000..af510a7829ab
--- /dev/null
+++ b/dev-ada/aunit/aunit-23.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+inherit ada multiprocessing
+
+DESCRIPTION="Ada unit testing framework"
+HOMEPAGE="http://libre.adacore.com/tools/aunit/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+src_compile() {
+	emake GPROPTS_EXTRA="-j$(makeopts_jobs) -v -cargs ${ADAFLAGS}"
+}
+
+src_install() {
+	emake INSTALL="${D}"/usr install
+	einstalldocs
+	mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die
+	rmdir "${D}"/usr/share/examples || die
+	rm -r "${D}"/usr/share/gpr/manifests || die
+}
+
+src_test() {
+	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a949dc5e3613..b6681d034bb4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/teakra/Manifest b/dev-libs/teakra/Manifest
index 9b8c88c32da0..b2a6b0a49af1 100644
--- a/dev-libs/teakra/Manifest
+++ b/dev-libs/teakra/Manifest
@@ -1,3 +1,3 @@
 DIST teakra-20220224.tar.gz 983295 BLAKE2B 79c399f2bd3358fd558b4e7558dbbfb95a74ea16d8c9e79037a5ae258066bd5dcab903bd776b2cd355dacb60ee4dfb5de2802ed318d12985a4655f87dd958604 SHA512 b8c37b9d82431b00bcd22554e3f507466f0e6823bcd0cb7c22d38cf5ffd63bf270dd6f70472063adf4db02cac3e4dbe85ceba2946d7ba0ca13b166bf7f197e02
-EBUILD teakra-20220224.ebuild 779 BLAKE2B 425ae698ae86c6c9eb0d0ad93f93e6693a6a847a8cbba7b57d6e74f647bc6b2e5104b32b446767e3a4c5c35524de95712d8f0111bcc545f07c56adec7631d1a4 SHA512 04b506fa2ebb8067e3dbd8326ad4c33c0f54ac89bf97370fb6c1ee8668e6691a68d6039cb77823dd344c1bf240607f2110bcdc3820d7249aed8a256d065e91d5
+EBUILD teakra-20220224.ebuild 870 BLAKE2B 15edee8552d61e3bc40533a436e34518877dce56da84501771f3e3e4430fbb5b68d1dcd5692830fb2c03ca4982d9134af1965c19a88a417012dd166c31c45d0b SHA512 b3a3458b9730e0e4a8202438597726c5c249ed88dc80e1f8c25495b70f01e19ecb9454b85ccc5d96edf3dded5b78c87b8c9ee75ea354d3d73332b68779406bce
 MISC metadata.xml 399 BLAKE2B 4e2f75b603401bfe8ac3d275d343728996602ebf01cdbc834ca2338ea255a4a5ec314bc5ede4dc9442aca8f701e228415a259b077cb591d8377daf8fc223c485 SHA512 3e67a8e432beb3ff9c1a647c36d168e6cbc8fa150a9c137df425ef34f48df2fefd3bf9f69367d54823a0e32308cc782e5527de880eb12801f888fd1f0fffdc5f
diff --git a/dev-libs/teakra/teakra-20220224.ebuild b/dev-libs/teakra/teakra-20220224.ebuild
index 33314aae07cb..9553e9149c97 100644
--- a/dev-libs/teakra/teakra-20220224.ebuild
+++ b/dev-libs/teakra/teakra-20220224.ebuild
@@ -16,6 +16,12 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+src_prepare() {
+	sed -i "s|-Werror||g" "${S}"/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index e48de8200d72..17e3c01136df 100644
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -2,10 +2,11 @@ AUX 1.11.0_pre797991-as-needed.patch 4803 BLAKE2B 1dd127bb9fd93cc58ac0a09e45354d
 AUX 1.11.0_pre797991-bugfixes.patch 1409 BLAKE2B 78c628ae10560bf950c7fed9ae4c28216bfb97bc7936064f20ee91403e74297d0b15ea1755901f26d900e53ba935fee937b726bee65511272e305f2731bdc94d SHA512 3eaa70d2936b7091e036d936ff8b35cbf2399ccbb81444b8a6a9583cbd11aa865e7f927a035b1d0223c172eb8de891e4da3b7113b155dfc4e8b19d0da5c4c4da
 AUX 1.11.0_pre797991-parallel-build.patch 2530 BLAKE2B 2d88ed70b30643cae4bcf6a88de56706fd1f0cf5b71e2d12dd24812217ce06023b08b8914dcbcfd828e8c8ba8b116d227d621cc785fbd3591a2d2d502be5fa37 SHA512 be994c118b212b3b96409c273b01d2b00b0a8b0f7ec53338f8efc6ec9d9dccd4fb6fdcaf7c365351024a965e96992ff23ba849c90d6d6aa1e7086c51c763cbef
 AUX xalan-c-1.12-fix-lto.patch 823 BLAKE2B db4000d8959e5869d0f0afd92ede88f2bb279af6a9dfb1109655628a23357673dfe1594033d49eb595b8e0bfe1197ecb4492be81b47df6d367fa78378f3bae59 SHA512 efe6df198bd68ae4feb5f75e9679b57a2d53e21b1efa724889cb74a9fa90ac77fc598bada8042bac01e1a898a53ad0ef9e7b9bc3a328aab22b9c5506d477b671
+AUX xalan-c-1.12-fix-threads.patch 1074 BLAKE2B 086208fa8dbebc3b5edc5119386ba3976d7a939e505a81c625ab6fb7b8dddd198aa41bbc93177e575d8475a8ee4fdec62d27d4c3442121c29f72c341a123df8d SHA512 33aa9cc55bc4cc29e3d1fedd9dbd1792695ad52f50e2ed46f7872585892dca579d75622ad91d4d854d9ed1dabf38b282c69ef39a3d909321ad2b48e5e8244066
 DIST Xalan-C_r1153059-src.tar.gz 1573651 BLAKE2B 5e684b80bc962776c1e0102a97023ee3a9b9357b6fc05e02687971d5d879b01a5dc426fd6ab2af68a7ad6ec48a799d70fd912a4e3a30d8e3a22a954d84d21f59 SHA512 2382c1343ae97d0196d84053139758d3b3b7574bcd835b754e34acdc6ab708a58fc23d2f27d41870c768c78a1de7be1bb6031cc78d205b6024f1ad7cd6fca653
 DIST xalan_c-1.12.tar.gz 1130924 BLAKE2B c2f0fb98d39e516d5219ab0e075517c2c916b451bfce6d90399899870a8a73fb59f8d2465f58bd97208d19c5a7a18df5a49ece156d8dfe47bf57fc875793fb43 SHA512 a9f72f0e8e199ee2cfb4c19ecf390d5007f597aad96a53f55bc475805190302c7e0d800d776b7fb20fe8e2dddb6391e70aa3a8861a2303370135e8b0a5fd15fc
 DIST xalan_c-1.12.tar.gz.asc 488 BLAKE2B 1e5d7091ca184ac7e2897fe52417b01d9618ab0435f2bcc7748d563287ad81692e61bee92ec9bc71e5c21c11bc8245a4ec09ff7e6ed44a4b3113264b096ba277 SHA512 1c532367d5a3f16622cda3eaca05eac648b415a9de8685cf43f5e62683db30b396e669b6952f5bbe161327b8171cd1e54ad4dbefa54122243aa01298d53d400d
 EBUILD xalan-c-1.11.0_pre1153059.ebuild 2180 BLAKE2B a31ce8f492efc514caec802d6d855d0329561d47c7692c3bc864415c545f644decd633427eb03f4065799215f80a8fa8c0e309391f6542f808e876bb036b249d SHA512 948a65343d58b40f06aae2cf4625782679528e714a1f3de5f2ecd10062135d4cdc39d49a84b1248989e7b42d3ee11e7ea83d4aef4ad9ee5fb06cd062aedc845b
-EBUILD xalan-c-1.12-r2.ebuild 1209 BLAKE2B cd6b0f9300bae7e46336aadfab066098794868181fc25c46266f7292ef0eca0c1b6bea899a25008648b380de50c7da3d789e426f38ae511437efa3081a138651 SHA512 a94bba534dd15fa62082adc1a96e07c96d4e2f832aaa9e4c9e8fbc4d186bcea5a95f00a7250e532633cea7c1e33c89d87ef8f38a9f0ce3678b818d1155763ac9
+EBUILD xalan-c-1.12-r2.ebuild 1247 BLAKE2B bf9bb59fbba8408dce961936e656d157130eda7a8c182f4f4eac7ece7e0e122a0eb74dd44fc58843adf2dc033cfffa59091a313e8d3fc6921c58793935d8c8d5 SHA512 2e9d660bf1d79796e24e58b47f8c683d3b736310d145f8047483bf1dd93e4b023f5784cecde829c5e4e037d0c4706d24fe9d838faee9e1444d4bf840cf07911f
 EBUILD xalan-c-9999.ebuild 1215 BLAKE2B 6d7e50d203f4533e17a5846d4d74a189c7e6bf9f6fc39954fbf6b1db524a9b40e91e631ef884bc98a93839e2444543d31846916eca1a9779f82c7b8d0a4321a4 SHA512 23183fa1e95f45ac7e9d5d2da6a6676f924b1ca4128e22f45fccdb4961c481e0e7da88429a7854cc94d7af7a99648745b8454d6a2270d47b7b7cab65723e031f
 MISC metadata.xml 321 BLAKE2B a2e8e4499ce42f511537b6f3a1975f857ef40205dca2220536cc124bcb9f94c1017efe3f5e9124490f65758ac277b5db57bace8987e8118ea4a524b57d1a07a2 SHA512 af706a4b4d2a6e5f9ce31f83f367423097168c97fc8ca42e82a1c93a542329cd699d52902aaa63fc9b43cfc5a5c15cd26a87b754cc314d25131f9bb8652447ef
diff --git a/dev-libs/xalan-c/files/xalan-c-1.12-fix-threads.patch b/dev-libs/xalan-c/files/xalan-c-1.12-fix-threads.patch
new file mode 100644
index 000000000000..4a8e0e582621
--- /dev/null
+++ b/dev-libs/xalan-c/files/xalan-c-1.12-fix-threads.patch
@@ -0,0 +1,51 @@
+xercesc::XMLMutex doesn't work, replace it by std::mutex
+Bug: https://bugs.gentoo.org/887197
+
+--- a/Tests/Threads/ThreadTest.cpp
++++ b/Tests/Threads/ThreadTest.cpp
+@@ -49,6 +49,7 @@
+ 
+ #if defined(XALAN_USE_THREAD_STD)
+ #include <thread>
++#include <mutex>
+ #elif defined(XALAN_USE_THREAD_WINDOWS)
+ 
+ #include <process.h>
+@@ -95,8 +96,8 @@
+ 
+ 
+ 
+-typedef xercesc::XMLMutex         XMLMutexType;
+-typedef xercesc::XMLMutexLock     XMLMutexLockType;
++typedef std::mutex                  XMLMutexType;
++typedef std::lock_guard<std::mutex> XMLMutexLockType;
+ 
+ 
+ 
+@@ -121,7 +122,7 @@
+ 
+     XMLMutexType    m_mutex;
+ 
+-    long            m_counter;
++    volatile long   m_counter;
+ };
+ 
+ 
+@@ -143,7 +144,7 @@
+ void
+ SynchronizedCounter::increment()
+ {
+-    const XMLMutexLockType  theLock(&m_mutex);
++    const XMLMutexLockType  theLock(m_mutex);
+ 
+     if (m_counter < LONG_MAX)
+     {
+@@ -156,7 +157,7 @@
+ void
+ SynchronizedCounter::decrement()
+ {
+-    const XMLMutexLockType  theLock(&m_mutex);
++    const XMLMutexLockType  theLock(m_mutex);
+ 
+     if (m_counter > 0)
+     {
diff --git a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
index cd8b913943ee..74e63f8e818f 100644
--- a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
@@ -43,6 +43,7 @@ BDEPEND+="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-lto.patch
+	"${FILESDIR}"/${P}-fix-threads.patch
 )
 
 src_configure() {
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index ae4c76aae411..47ffab04472f 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/minted/Manifest b/dev-tex/minted/Manifest
new file mode 100644
index 000000000000..367283d698f5
--- /dev/null
+++ b/dev-tex/minted/Manifest
@@ -0,0 +1,3 @@
+DIST minted-2.6.tar.gz 891134 BLAKE2B b8f1686adeb138c61c232502b10aa420f1054180c5a460e9e5058d40435e13d336c15a044202923bd1acd7b62a7b780d95c62cf1a589181c90b9058712479c43 SHA512 6fb28485fca7238053ad177ee5579c27740e72b8753c6dcaa59afe20bc97d7e81ec20d189e97522445b6435f17cef1f8326aaa41c154bf21f59519c9abf10485
+EBUILD minted-2.6.ebuild 715 BLAKE2B c22af6ae3aeee704829999a89fe76937296b0603cd20679602943d00969b4d057dd6b6559fc77f2ff62f6deea85cb2cb770a15ddfc61f5c1ba3e5617a4be11a7 SHA512 7c30a6d31868de5729671d26f57af62b8cce030e580fa36f155ae887827924a145005a005fc64634c580f5986266dcc2d61b6c1c5abfe7a38cc33727bd8096b4
+MISC metadata.xml 686 BLAKE2B ee2d79732e91314c8510becada8fccafb07e42908ee507f736b0e2e21a7c425a25651a36c6518b741797c4854640dc3389925d3f278cd3cc0bdc09a5cddcab2b SHA512 91d269ccde32922509dc72057a52f78bb4c86c7a5f8093fdc61d2e930c7cc81c35a9082ca8b4159bd34e35c87dd9307f3094ea8932eb14145d141c27672b1aaf
diff --git a/dev-tex/minted/metadata.xml b/dev-tex/minted/metadata.xml
new file mode 100644
index 000000000000..b7abb2929fd4
--- /dev/null
+++ b/dev-tex/minted/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    minted is a LaTeX package that facilitates expressive syntax highlighting
+    using the Pygments library. The package also provides options to customize
+    the highlighted source code output using fancyvrb.
+  </longdescription>
+  <stabilize-allarches />
+  <upstream>
+    <bugs-to>https://github.com/gpoore/minted/issues/</bugs-to>
+    <remote-id type="github">gpoore/minted</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-tex/minted/minted-2.6.ebuild b/dev-tex/minted/minted-2.6.ebuild
new file mode 100644
index 000000000000..eb8f3b628aa0
--- /dev/null
+++ b/dev-tex/minted/minted-2.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit latex-package
+
+DESCRIPTION="LaTeX package for source code syntax highlighting"
+HOMEPAGE="https://github.com/gpoore/minted/"
+SRC_URI="https://github.com/gpoore/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${P}/source
+
+SLOT="0"
+LICENSE="|| ( BSD LPPL-1.3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/pygments
+	dev-texlive/texlive-latexextra
+"
+
+DOCS=( ../CHANGES.md ../README.md )
+
+src_prepare() {
+	default
+
+	rm "${S}"/${PN}.pdf || die
+}
+
+src_install() {
+	LATEX_DOC_ARGUMENTS="-shell-escape"
+
+	latex-package_src_install
+
+	use doc && latex-package_src_doinstall pdf
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 98547e359770..46e022478c4a 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 2f66be04d758..d1b697d7db2a 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -2,10 +2,8 @@ AUX wesnoth-1.16.6-fix-build-with-boost-1.81.patch 1907 BLAKE2B 8c98e374f17ceb8a
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20 SHA512 7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
 DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758 SHA512 fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
-DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830 SHA512 7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377
-DIST wesnoth-1.17.9.tar.bz2 420547403 BLAKE2B 8fcef89b72057ce60e292a7a986010f4b0d060e7542ff20029306cde4580473f5e8240f9d99a6248d23147be7a61345a04dca97fa70fb9a1fa039603b8ddd8d9 SHA512 c8f9eb8cc77ea239e710e52a23333636700b34cea5fc8d73d5a62f80d0b58867ee633f556c170700e65e4ad234a69ea1746a1a4148efb64979cf22129ee59157
+DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449 SHA512 8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a
 EBUILD wesnoth-1.16.3.ebuild 2230 BLAKE2B 72027fdc814cc0aa769a94d971b7eb5f769265861ffadf1a30f612ef1d01b89725e04d16ffd32f9889c4a2b19796be7dfd072504fce1826f4dbb4afd37e9b73f SHA512 2efd412cce8e8cda42cf3421de5d60ff514778bd7355155c7252ef06859eb23ccb650719677968339b2a77a060cbb6b911a6ca23523e44a5b91f95147b1f72a2
 EBUILD wesnoth-1.16.6.ebuild 2304 BLAKE2B 29929dda7e4950588c33ae9a1159c072ce0bd284df9bcde29e1d7540b89d4e91eca9ddb54781f835ff2f0cdbad691e61ef9657df755fb6551dc40531863861b7 SHA512 57435db84babedb9d0aba64dcc083f569eba539632b0bd2fe3827a8177cdc283df881af9ca049d4a5077faa6d341a777a82fe76f97e7833b825b87dad0d99479
-EBUILD wesnoth-1.17.5.ebuild 2203 BLAKE2B 9c5f81f08b619e228052ca7bc4c8d667524a15df4e8d81db47a3a54bc3165f53ee07db38f593debf37f0d4fbee1af4242147e7843f1a0e47923f082397fec4a3 SHA512 4776a5abc4f2d048e4f628d29ee5ebbe4a372dd4d6e049965b4c583258f09c3c8e688175d99121228a842b314ae91a6f40086f1e8d1aec5d8f2034c78be5cb27
-EBUILD wesnoth-1.17.9.ebuild 2203 BLAKE2B 9c5f81f08b619e228052ca7bc4c8d667524a15df4e8d81db47a3a54bc3165f53ee07db38f593debf37f0d4fbee1af4242147e7843f1a0e47923f082397fec4a3 SHA512 4776a5abc4f2d048e4f628d29ee5ebbe4a372dd4d6e049965b4c583258f09c3c8e688175d99121228a842b314ae91a6f40086f1e8d1aec5d8f2034c78be5cb27
+EBUILD wesnoth-1.17.11.ebuild 2203 BLAKE2B 9c5f81f08b619e228052ca7bc4c8d667524a15df4e8d81db47a3a54bc3165f53ee07db38f593debf37f0d4fbee1af4242147e7843f1a0e47923f082397fec4a3 SHA512 4776a5abc4f2d048e4f628d29ee5ebbe4a372dd4d6e049965b4c583258f09c3c8e688175d99121228a842b314ae91a6f40086f1e8d1aec5d8f2034c78be5cb27
 MISC metadata.xml 418 BLAKE2B 636dfbbd604111ba7c6241fbbc8ba8bd9a4f1f6e30811c9f3788a3624deadf751ad62dca9e24a74f19709900c32530fd3b12363ba288a94d2d94eb9c7e15b6f1 SHA512 298467b69ae7455c096e186061df02c45dd42aa33241ea12bd672a551589dd62a7cf5d2e383a6e94a6ee1332bc29b24f80e4597cbb0771e64b40d3bee5249102
diff --git a/games-strategy/wesnoth/wesnoth-1.17.5.ebuild b/games-strategy/wesnoth/wesnoth-1.17.11.ebuild
index 5724bdef29fa..5724bdef29fa 100644
--- a/games-strategy/wesnoth/wesnoth-1.17.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.17.11.ebuild
diff --git a/games-strategy/wesnoth/wesnoth-1.17.9.ebuild b/games-strategy/wesnoth/wesnoth-1.17.9.ebuild
deleted file mode 100644
index 5724bdef29fa..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.17.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-	https://github.com/wesnoth/wesnoth"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-	acct-group/wesnoth
-	acct-user/wesnoth
-	dev-libs/boost:=[bzip2,context,icu,nls]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		dev-libs/openssl:0=
-		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
-		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		media-libs/libvorbis
-		>=x11-libs/pango-1.22.0
-		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0=
-		dbus? ( sys-apps/dbus )
-	)"
-DEPEND="${RDEPEND}
-	x11-libs/libX11
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local lang langs=()
-		for lang in $(cat po/LINGUAS) ; do
-			has ${lang} ${LINGUAS} && langs+=( ${lang} )
-		done
-		echo "${langs[@]}" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="ON"
-			-DENABLE_SERVER="ON"
-			-DSERVER_UID="${PN}"
-			-DSERVER_GID="${PN}"
-			-DFIFO_DIR="/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="OFF"
-			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		)
-	cmake_src_configure
-}
-
-src_install() {
-	local DOCS=( README.md changelog.md )
-	cmake_src_install
-	if use dedicated || use server ; then
-		rmdir "${ED}"/run{/wesnothd,} || die
-		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-	fi
-}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index fe675a4b214c..26b26d890d24 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index d48a7d0d100d..02d9de2e02bf 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -10,5 +10,5 @@ EBUILD claws-mail-3.19.0-r1.ebuild 5624 BLAKE2B 386b65a62cf0363a93237a0a0cc396d9
 EBUILD claws-mail-3.19.0-r2.ebuild 5672 BLAKE2B 4ffd0a3e656607e2ae73b46830b152a8cd648c063a62dea16ae51cbc9f470d8bd0a29ed8c802471dfc2862c405db4ff4864a5fa41535056945db83ce773b222d SHA512 d3eee1202cd360bf528dcc01f113596dda31da62174c88fc6209b3ff7efe27104a839d2a0c337f91b8d33421ded39b3ab3882f134a5981d28adb13f03699f2c5
 EBUILD claws-mail-4.1.0-r1.ebuild 5797 BLAKE2B eb1e94c468ff7e4f47e9067ac2f7f1c945fe707198ca9d6c0f847ae2b65adc6b3cb5ca8619f42e9dc0a9cc3f889f9a05ae4a3e9496967dfef42a6a9873d9b9d8 SHA512 2c762f57d3bb59db8c6a5f85bdc9c82982c3c37b869f86d0ddec248996d0c41820e190d7ee6091578c219229e1e5b4149a10f75d02169e4d95bcc590a33032a5
 EBUILD claws-mail-4.1.1-r1.ebuild 5703 BLAKE2B 9eaf12bda92ab66b4e188b67484fea92a4c7fdd8156cee18876eaff62763228f44be830b994dc4ded07b8ef34e1806d9f2ba2e68dff22ac2338a64290d0a475b SHA512 769f392ea59b4acc115bfdc020bec180b8f1538717210d343400fa3b8247d73938889680738c5a717685ec5d4ecf50dda23e234a9b40dcaa4e2dbb39ad550a94
-EBUILD claws-mail-9999.ebuild 5662 BLAKE2B edb58f01ef8bb3c1f95ed4bf58efa7451f638f7f78914f90518d7b2dfdd6fc6890581f0096f59f20f1c2e366a827d4ce36131099efcca1d63891789efc71c786 SHA512 5d910018153542eeb9b787011d3c135277ed8fe22836a3d58ae7f4a4c2c54a1afd390eee02d1e8cdde0395256cd5db8249b3d62cba436dd9eb119498211a87c7
+EBUILD claws-mail-9999.ebuild 5745 BLAKE2B 5779931a6e898df9b3cdc5675b751d52255bc1b43cf80cf0708d6ace8c86127b80e43b30b1b636be67682ceb4532e686cf8dccae110e7543aeb57866fccb72c6 SHA512 6b32515d8e554844247b6a2e17120e17076c3e899dbad2acde76bddcf94e9800f3214514e97a254b8c46507d49b8195f6e9f77f946e9519d1986bd1a1c3dae48
 MISC metadata.xml 1445 BLAKE2B 2c20d83b5af1f03c791c733c9cdaa970ea070fe9ee63cfe4d8f4b2c5284bb791579fa0629f1b70c336440b8a8dae7c70d460b906fc34e7e314b074b67ae00523 SHA512 a956df8043597fb5be434fec8747c49088fdd82ea8c7d2a32d8b9a3d88d058cf4bf8cb3a8cc77463ebb8484729f155c258f58dd581b96eb0703de1464ead73b9
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index 9c1bd9f56275..86c585b408a7 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -142,6 +142,8 @@ src_configure() {
 		$(use_enable clamav clamd-plugin)
 		$(use_enable dbus)
 		$(use_enable debug crash-dialog)
+		$(use_enable debug more-addressbook-debug)
+		$(use_enable debug more-ldap-debug)
 		$(use_enable dillo dillo-plugin)
 		$(use_enable doc manual)
 		$(use_enable gdata gdata-plugin)
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d81049de9e31..0e2d458b58f5 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index f1513d8af3d2..80a726577212 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,6 @@
 DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B 4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038 SHA512 fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853
+DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
 EBUILD hugin-2021.0.0-r1.ebuild 2133 BLAKE2B 659fb635d57baa0e63c6d182d68ac56635bb920b6b6a15851878496442f9938baf125827436d4f818d0445ea452f292163aff8249de4c9cb0402462c40757583 SHA512 1d81e1ae941fc4c1f9a2f2bd963becb1f7972827276881b182f01f9cd420dfaf2da537becedac41e9cb9f24a1fb366b1b4cab0b169d072f9f0948ef41051155a
-EBUILD hugin-9999.ebuild 2076 BLAKE2B e7920e9474581bbdebaed92a9531b6ce4045a93d287a74990f640a95e0564111d7962f52a61b40d648e2963f38416b6f2dbbd209dedca609e07e21c6e4300ae8 SHA512 488a303661ac36853c19b2f1b870b5409d6611ebe58e59b9b6bcb36f230dee3d430cbd55e5fc67969e12c153f92a9d1347d619d81fdf8b681ad5424fef71d0df
+EBUILD hugin-2022.0.0.ebuild 2118 BLAKE2B e09e810724c4b00a34ebbb7f18694113f6d92f9403c1758fb1fe2b212af6d7c9f47ec2c52896a8d86f5e706bd28de5dba3454308b3503b9b437befd7518ba539 SHA512 0c8e74c38c8ba7d302e2a0c444328fd1c6f44da69224044d1668333a14202ae510fee18b3df90073133578ff9d7edbfffda3cc671fc558c0e79eb399a5827946
+EBUILD hugin-9999.ebuild 2058 BLAKE2B 56e0e82076d2c5f19463fe33f374692c1394d8361e11b9c7fd76a6a790efb7ba7011b675ec3ce63bcc47f35efb0b72e9e69aa86b2bc03e7390deaf5b37a5a073 SHA512 0f2ba5fdb8bd6d5879f6c4509c7c50b8af5984665b4d4598977fff26a8d6bc4afd827bdd099334c32ac4469b247f8061292b88c28d9574e1c63c13d2724f1040
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2022.0.0.ebuild b/media-gfx/hugin/hugin-2022.0.0.ebuild
new file mode 100644
index 000000000000..76bca342c75e
--- /dev/null
+++ b/media-gfx/hugin/hugin-2022.0.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-single-r1 wxwidgets cmake xdg
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
+
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+	dev-db/sqlite:3
+	dev-libs/boost:=
+	dev-libs/zthread
+	>=media-gfx/enblend-4.0
+	media-gfx/exiv2:=
+	media-libs/freeglut
+	media-libs/glew:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libpano13-2.9.19_beta1:=
+	media-libs/libpng:=
+	media-libs/openexr:=
+	media-libs/tiff:=
+	>=media-libs/vigra-1.11.1-r5[openexr]
+	sci-libs/fftw:3.0=
+	sci-libs/flann
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
+	lapack? ( virtual/blas virtual/lapack )
+	python? ( ${PYTHON_DEPS} )
+	sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+	media-libs/exiftool
+	raw? ( media-gfx/dcraw )"
+DEPEND="${CDEPEND}
+	dev-cpp/tclap
+	sys-devel/gettext
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_prepare() {
+	sed -i \
+		-e "/COMMAND.*GZIP/d" \
+		-e "s/\.gz//g" \
+		"${S}"/doc/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HSI=$(usex python)
+		-DENABLE_LAPACK=$(usex lapack)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+
+	local lang
+	for lang in ${LANGS} ; do
+		case ${lang} in
+			ca) dir=ca_ES;;
+			ca-valencia) dir=ca_ES@valencia;;
+			cs) dir=cs_CZ;;
+			*) dir=${lang/-/_};;
+		esac
+		if ! use l10n_${lang} ; then
+			rm -r "${ED}"/usr/share/locale/${dir} || die
+		fi
+	done
+}
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 2d80dcb4c7c8..7d99806d9fa0 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -22,7 +22,6 @@ LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk
 IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
 
 CDEPEND="
-	!!dev-util/cocom
 	dev-db/sqlite:3
 	dev-libs/boost:=
 	dev-libs/zthread
@@ -30,8 +29,8 @@ CDEPEND="
 	media-gfx/exiv2:=
 	media-libs/freeglut
 	media-libs/glew:=
-	>=media-libs/libpano13-2.9.19_beta1:=
 	media-libs/libjpeg-turbo:=
+	>=media-libs/libpano13-2.9.19_beta1:=
 	media-libs/libpng:=
 	media-libs/openexr:=
 	media-libs/tiff:=
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8b3abf677e2a..c9e156ff0a2e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index 26d428c928fa..25d60171b015 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -2,4 +2,5 @@ DIST libpano13-2.9.20.tar.gz 3564544 BLAKE2B aabf9d8a3dac5b01e4a5bdb6d5ad6b56ea3
 DIST libpano13-2.9.21.tar.gz 2801535 BLAKE2B e4b2ea3894b4b53e6bbaaea39370254ad3bd1a981a1857376ff96e801cf167115ceacbe3ef4c790c3dcd380e3b0ec4a6d2b3d116e212f22cc4a56eb373f3447f SHA512 d344b81b56ba6e7dd38c0826e7e085ad5e20f5d2b09b27369ffae1e30d8f5bc03ab00d656d472069429b843d2e1eeceb173eeac39ee31a3622ca851387daef04
 EBUILD libpano13-2.9.20-r3.ebuild 876 BLAKE2B e38b0ede730cc146a881046c25c2ae8b493be48e6c76249d9c9bc9d62e47d9954c13b365051ec57b71d012dfb0e8da2aa4418f276e42c0562fcf7681e213567f SHA512 d13eb34eeb9440a87a7323e1436a974041c066bac85333a0f32505916f5d3f2887ae633bb5314410a0d4bbf7eec645e7e76186511ad520354f2d9bb714296b55
 EBUILD libpano13-2.9.21-r1.ebuild 764 BLAKE2B 0c976d8559b165d36c0d4ac4a4c33fa7d192ee58e3645dd633f312e481ff8cbe0b9df4155ec2ef00b2bfa9f8b6f965c824868e56f948832cdd923bff4fb3fe45 SHA512 d29970c3db1953355ffe12cd83ceaefdde7f10620ac79b77a82b880ab8775b37c212ee4f3ba491a03d68a4e1227fad71a0ebc465859d657d1ce81c705bb034a5
+EBUILD libpano13-2.9.21-r2.ebuild 899 BLAKE2B 7f6e65df8531f79d263a9715e7d8f423d16797b92e173c68758839c496ea003513e42c063aa39d4e336a1221bc2fb704f216ae68dbfc2689b1cebb50a434511d SHA512 14d55e6d134a07bf32e1cb49457066f1de6b98b3f6715fa0c73be893f223803da17b64c1313c2f23e7d286ec73f07de1ca372ecb3ea30ff3a66bcca137f1b08c
 MISC metadata.xml 462 BLAKE2B 2043b0e6c260305e607a04d5d8e541c82408344a00e920c891eb1981aa05b75998f845800bb0a4fd16f3e1c83bcd2f4118e673845e47142a3ec58fa5df86ac3b SHA512 6f05c609c8a8f5a41b18009a1fa5258071328b99b33a670e0e2c56e1aaea398112759c42902b2e822684dc0f5b2979cda7efc59adf97dfe53c27d14707e1a6f0
diff --git a/media-libs/libpano13/libpano13-2.9.21-r2.ebuild b/media-libs/libpano13/libpano13-2.9.21-r2.ebuild
new file mode 100644
index 000000000000..1eed41af5ec4
--- /dev/null
+++ b/media-libs/libpano13/libpano13-2.9.21-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake
+
+DESCRIPTION="Helmut Dersch's panorama toolbox library"
+HOMEPAGE="http://panotools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="java static-libs suitesparse"
+
+DEPEND="media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib
+	java? ( >=virtual/jdk-1.8:* )
+	suitesparse? ( sci-libs/suitesparse )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSUPPORT_JAVA_PROGRAMS=$(usex java)
+		-DUSE_SPARSE_LEVMAR=$(usex suitesparse)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs ; then
+		find "${D}" -name "*.a" -type f -delete || die
+	fi
+}
diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest
index 3aff2acb1eae..a4c225b1975c 100644
--- a/media-libs/libpgf/Manifest
+++ b/media-libs/libpgf/Manifest
@@ -1,4 +1,3 @@
 DIST libpgf-7.21.7.zip 2075722 BLAKE2B 31c5ab5930ef5658ca9b320fa3df94b7d8566467a657df6d255781664a4750d6b5cb7b351c828cad7c60b42f8cb8926c51bb0271d5c51e2484426a15f18b5eb2 SHA512 dbc17d9dce1afbeffb272df0d573059914d2ac79d652d1d43e67c49509fd6e643be8594bbd1a3058a5aa3a9d30db100c6dcf641051345049cf8f9375d49e2799
 EBUILD libpgf-7.21.7-r1.ebuild 1184 BLAKE2B 001c376ddcdf1e3776bed7bfa87f712f82678b6c9a9d5e5207115f55c372cbcb8ecf134ded2fee10bfde8a0467a6b79e61db630650e5cfb0fb85eca101762497 SHA512 290e74170813c80e061cd6b095187bd8461fb380150482dec6b22fda97f601f943574f3c04c559b0fe1190bb83f48a7b0d37ad789d485ee75624900d99d63ac5
-EBUILD libpgf-7.21.7.ebuild 968 BLAKE2B 4da545e6f56dfe15d1a7f0bd837076bc92b5d9614d040b88c3426ac63fe0c97c94019c8a609b8a2f703b834481207e101fd9422daafdc5df821c7af690c761c1 SHA512 64ecf531a41fd11b89534f294bef4b212e944f3b30c8a2e199fdc48cca452438e42c34e40b33b13a08221e8c6b867f39a618e48d656d802349c5c1c0f8500ca8
-MISC metadata.xml 249 BLAKE2B 3bc7510e014ef8df90da064f4ef969eab6cc3311951a6dd556ca7b6f4e2e74e229f12a16ceb641393d1ec1f89d1942718267ecc664a8136df194c40de94a58e4 SHA512 63f88d798d410e4fb6670d199a86a665ab61b09cb9508b4047f13fe73070c682231d35a27c9d2c1fd82a1b8a84676d857b534c96bd09f4562cf13d7fc8de36b2
+MISC metadata.xml 325 BLAKE2B 2dc17e97d5c74f7679dcd00ab589cacc7ed2303413a07de0632abb4a0ede84b60d9ef085f71ff7ec983c8d79d6ca35a3901bdd4d1885e1ddda535d2fd7b7a8a9 SHA512 ce6fce6a25d71afa9a6834a43ccd22e3e6a8855b5963534295b3c8f13e22a817319ed77a5aa6eb441d6f97de31a9bd94065e6e021e8aa87727c0c40d23a9e53e
diff --git a/media-libs/libpgf/libpgf-7.21.7.ebuild b/media-libs/libpgf/libpgf-7.21.7.ebuild
deleted file mode 100644
index 38c981e62582..000000000000
--- a/media-libs/libpgf/libpgf-7.21.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix
-
-DESCRIPTION="Library to load, handle and manipulate images in the PGF format"
-HOMEPAGE="https://www.libpgf.org/"
-SRC_URI="https://downloads.sourceforge.net/project/libpgf/libpgf/${PV}/libpgf.zip -> ${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-BDEPEND="
-	app-arch/unzip
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/libpgf"
-
-src_prepare() {
-	default
-
-	# configure.ac has wrong version number
-	sed -i "s/7.15.32/${PV}/g" configure.ac || die
-
-	# many files, including configure.ac and Makefile.am, are saved in dos format, causing errors in autotools
-	edos2unix *.{am,ac,in,sh} */*.{am,in}
-
-	if ! use doc; then
-		sed -i -e "/HAS_DOXYGEN/{N;N;d}" Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libpgf/metadata.xml b/media-libs/libpgf/metadata.xml
index b22a815172dd..d9ebb7cecc3d 100644
--- a/media-libs/libpgf/metadata.xml
+++ b/media-libs/libpgf/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ceamac@gentoo.org</email>
 		<name>Viorel Munteanu</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">libpgf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d0efa4ebc6b2..6719ccd87751 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 459877cde543..5da36c6daff1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Dec 2022 19:09:52 +0000
+Tue, 20 Dec 2022 01:09:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 79a7b21acf3c..46f4c2536148 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538471 BLAKE2B b7385901234c82cabfe7b6fe500f9a2de535ba832c5fe98f7b1adcf90342ab9ac009a4eefb2c71141609f93233148e5db41c6f760cbea8413d0a285b67c25f90 SHA512 8b561e583b67bc367b59eefc1d958442632b1001434a1d0874a9ae00334c80cc4a27278dac1813b0d7b255f214d060c5e60573b828bb87fc8e319dc9233f12aa
-TIMESTAMP 2022-12-19T19:09:56Z
+TIMESTAMP 2022-12-20T01:09:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOgtwRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOhC2ZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDg9w//TScy8OjgtMqfGa61LJfgcy6hBnTv7dPqvS+5F5NsOpWtEyLQieIQY1NC
-wI4QZtgN+sn06jIPGDfcDixq/1v7IEBK1cxZyuaQ77SgAnnU0zlDRKUiLCgA+XlK
-pjVss04uf5eidgi6RBCvFiTe44meNm+6R55Zsd1rpbrnRHbGCS+svAL2x7LVNGqx
-4S2qmWMmCDWWsTGcCexbdilolPgQ+FS5h4FZ3W1nv8TYvsBqgKULDDqb6YMmBpIl
-kMJb40P8YbHz/Twz5YX7oFm/MiiMFpnY7maOAUyxe9eGvdAvslQLQ0JGAI/13rnX
-ePR2IdLvtS29Je51TqzZrAAE7YmXB4nc+6v96eiLh61yzumy6+FveYdtO+BZwWVs
-7QA2S8CR0uvqajtz49m7gPMlAtF1Hz+LvbyWooWU4O0Q8KhRERFUgc1keMGNi62x
-fwq9zShCd2aecOL4TuwnagikGuTFUI0rhQfnkDsSW7gUFMqrcY3d1AXN3imQGwOQ
-UxK9y48cdFC25yKYPM+Pc6w8Tj+zJ+H/Pa5zK5Fup8CHraUDmqaWSn1L27MiS90q
-t0wfVQfFdR7BWknIjzS7cL2JmaTTEVEKAdhyAvfZuVohRoG3ipyv/MqwxABJR0fX
-WcoOYKW4ZGXu28yF1oRRkEjdN0JVfBwQ9a/05y0CrWDamPC4VUw=
-=GyIh
+klBMew//YZM7AQAN/9odx9P06U/zPAhmXpEm5fetLVqMfHFYqDb4MbsK2//W7/Rc
+cSn8xYekaOG5JVq/GtekhhQzBceg6Bms4TdGfGur3uZCqOJIq5uW+F8pprw/twYG
+ZLpTCjAJNViv/skEqDJC+Y/i+0eUjqsXHXx2tB29VSTFIx/sS7345UqU1kzj2sA+
+QkL3OoC1L7C1k8o7AylBGW4rOdtZO0NHuBPNo44YPpK9yBxhO+4gFNraZMILZfap
+AYiHcT4t+XNwQpQnfQ0/U70TfHpgzSdON2mRczMy+IDQc70OPNX4XgurX25lP2SR
+RdWQINFOaWjWi3gkavLMpSWdMR2o/MJnZ4vY+ZK2BfV1AtjWzpE1za6rX45HQtfb
+pHrrELNKAJToN34I9nP3FzfL4QWdvX4r8nmn8HtnX3ZnNNLSFuLqF+UDHAsE2wwN
+y3GApZmhBroddqtaehegdkuo+x+OKU86NvOEi3QEmRpZUioLJ78Fd8j4viaq/zNl
+u6PaaFrW+LSwWHxcaioh5ehKf2J6VHtpBQpAzxPLWTQuFiS4W/9pX83eJhJ/ATgm
+wPRd4TtHPN1z2eFbXfSxi1d2nCCspMZrmS3q/Gfn5zwnAGYgWcWkp9sI5ZNK7uqS
++oPXnHbbQVJlmoiwQyNC2m7Tp0Tdl2aRFRAUqGjlCenbaqKGeVc=
+=QYIE
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 459877cde543..5da36c6daff1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Dec 2022 19:09:52 +0000
+Tue, 20 Dec 2022 01:09:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 08644be50d2f..219956f2c04b 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 516a609f12a0..69f3771123ba 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.2.0 b/metadata/md5-cache/app-backup/rdiff-backup-2.2.0
index dface79c56e6..2dbbc063ec64 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.2.0
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.2.0
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.2.0/rdiff-backup-2.2.0.tar.gz https://dev.gentoo.org/~voyageur/distfiles/rdiff-backup-2.2.0-manpages.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=9353d0b5348e7541a2b3914a9f45ba22
+_md5_=bfac5245860936010927a70d492b4899
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 2e7789fb9560..f77d4e0990e5 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/distrobox-1.4.2.1 b/metadata/md5-cache/app-containers/distrobox-1.4.2.1
new file mode 100644
index 000000000000..f95f3cea27ee
--- /dev/null
+++ b/metadata/md5-cache/app-containers/distrobox-1.4.2.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Use any Linux distribution inside your terminal (powered by docker/podman)
+EAPI=8
+HOMEPAGE=https://distrobox.privatedns.org/ https://github.com/89luca89/distrobox/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( app-containers/docker app-containers/podman )
+SLOT=0
+SRC_URI=https://github.com/89luca89/distrobox/archive/1.4.2.1.tar.gz -> distrobox-1.4.2.1.tar.gz
+_md5_=860f20c0b2f91c7328eec1be49bd3561
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 7687263755e0..b9e4256d6ba9 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/engrave-faces-0.3.1 b/metadata/md5-cache/app-emacs/engrave-faces-0.3.1
new file mode 100644
index 000000000000..369791ad2db5
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/engrave-faces-0.3.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-27.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Convert font-lock faces to other formats
+EAPI=8
+HOMEPAGE=https://github.com/tecosaur/engrave-faces/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-27.1:*
+SLOT=0
+SRC_URI=https://github.com/tecosaur/engrave-faces/archive/v0.3.1.tar.gz -> engrave-faces-0.3.1.tar.gz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=2c0cfab4abf89915d1d8ce67b4d4ab5f
diff --git a/metadata/md5-cache/app-emacs/orderless-0.8 b/metadata/md5-cache/app-emacs/orderless-0.8
new file mode 100644
index 000000000000..f2e44c2b7008
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/orderless-0.8
@@ -0,0 +1,13 @@
+BDEPEND=sys-apps/texinfo >=app-editors/emacs-26:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Completion style that matches multiple regexps in any order
+EAPI=8
+HOMEPAGE=https://github.com/oantolin/orderless
+INHERIT=readme.gentoo-r1 elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-26:*
+SLOT=0
+SRC_URI=https://github.com/oantolin/orderless/archive/refs/tags/0.8.tar.gz -> orderless-0.8.tar.gz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=ab6bf7e60647c90c379d055a27b318fd
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 2265d753dd02..5922d5e09f8d 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/aunit-23.0.0 b/metadata/md5-cache/dev-ada/aunit-23.0.0
new file mode 100644
index 000000000000..cfba82b43d4b
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/aunit-23.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup test
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
+DESCRIPTION=Ada unit testing framework
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/tools/aunit/
+INHERIT=ada multiprocessing
+IUSE=ada_target_gnat_2021 ada_target_gcc_12_2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
+REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
+SLOT=0
+SRC_URI=https://github.com/AdaCore/aunit/archive/refs/tags/v23.0.0.tar.gz -> aunit-23.0.0.tar.gz
+_eclasses_=ada	74e7e253be1d030be8dd460f536a0564	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=f1123e69a9124e33f854c322d96e9f4d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index d903f204b8a1..4f27c44bdc28 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/teakra-20220224 b/metadata/md5-cache/dev-libs/teakra-20220224
index 59ef764f427e..4afe401a15cc 100644
--- a/metadata/md5-cache/dev-libs/teakra-20220224
+++ b/metadata/md5-cache/dev-libs/teakra-20220224
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/wwylele/teakra/archive/01db7cdd00aabcce559a8dddce8798dabb71949b.tar.gz -> teakra-20220224.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9e30a8f6c044b9c976ab417ff2b0fff5
+_md5_=ad8bfd4e4a55dc5e7442fef15cef7382
diff --git a/metadata/md5-cache/dev-libs/xalan-c-1.12-r2 b/metadata/md5-cache/dev-libs/xalan-c-1.12-r2
index 26956c8af001..1172987798cc 100644
--- a/metadata/md5-cache/dev-libs/xalan-c-1.12-r2
+++ b/metadata/md5-cache/dev-libs/xalan-c-1.12-r2
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/icu:= dev-libs/xerces-c[icu]
 SLOT=0/1.12
 SRC_URI=mirror://apache/xalan/xalan-c/sources/xalan_c-1.12.tar.gz verify-sig? ( https://dlcdn.apache.org/xalan/xalan-c/sources/xalan_c-1.12.tar.gz.asc )
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d82f1fc75aac8002f1c1ed8bc9989122
+_md5_=2c418ceb40fd89fe6276faff65889b50
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index e551d7a8242d..7f61cb2fe6c3 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/minted-2.6 b/metadata/md5-cache/dev-tex/minted-2.6
new file mode 100644
index 000000000000..ccdf763eb6bb
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/minted-2.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEFINED_PHASES=compile install postinst postrm prepare
+DESCRIPTION=LaTeX package for source code syntax highlighting
+EAPI=8
+HOMEPAGE=https://github.com/gpoore/minted/
+INHERIT=latex-package
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( BSD LPPL-1.3 )
+RDEPEND=dev-python/pygments dev-texlive/texlive-latexextra virtual/latex-base
+SLOT=0
+SRC_URI=https://github.com/gpoore/minted/archive/v2.6.tar.gz -> minted-2.6.tar.gz
+_eclasses_=latex-package	c20e442c3953c765f636630631c96194
+_md5_=338e1f3ad8701cd612339918faf7f051
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 0c74b61a71c1..8b4ba7a5da6c 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.17.9 b/metadata/md5-cache/games-strategy/wesnoth-1.17.11
index dd6f0ce1c180..517e22540465 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.17.9
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.17.11
@@ -10,6 +10,6 @@ IUSE=dbus dedicated doc nls server
 LICENSE=GPL-2
 RDEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,nls] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.17.9.tar.bz2
+SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.17.11.tar.bz2
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=f41da7d6cca55a0c0d86f6d10e8956c9
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.17.5 b/metadata/md5-cache/games-strategy/wesnoth-1.17.5
deleted file mode 100644
index dc6fde7f3f74..000000000000
--- a/metadata/md5-cache/games-strategy/wesnoth-1.17.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,nls] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) ) x11-libs/libX11
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=8
-HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake flag-o-matic xdg
-IUSE=dbus dedicated doc nls server
-LICENSE=GPL-2
-RDEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,nls] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.17.5.tar.bz2
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f41da7d6cca55a0c0d86f6d10e8956c9
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 7f0929ef6602..fe4c5e61e9ef 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/claws-mail-9999 b/metadata/md5-cache/mail-client/claws-mail-9999
index 7cd37a4a077f..20ef2e481832 100644
--- a/metadata/md5-cache/mail-client/claws-mail-9999
+++ b/metadata/md5-cache/mail-client/claws-mail-9999
@@ -13,4 +13,4 @@ RDEPEND=>=dev-libs/glib-2.50:2 dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:=
 REQUIRED_USE=libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) oauth? ( gnutls ) smime? ( pgp )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=28bdafac48c3d8d484abd0377be75dfb
+_md5_=492419f520d7a709bcecb9cf59ede208
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 0ab7158e9a52..87561081cce6 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/hugin-2022.0.0 b/metadata/md5-cache/media-gfx/hugin-2022.0.0
new file mode 100644
index 000000000000..bdb845266f6d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hugin-2022.0.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GUI for the creation & processing of panoramic images
+EAPI=7
+HOMEPAGE=http://hugin.sf.net
+INHERIT=python-single-r1 wxwidgets cmake xdg
+IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=amd64 arm64 x86
+LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
+RDEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/hugin/hugin-2022.0.0.tar.bz2
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b9ce5c3c95336f2c18746537be5170ba
diff --git a/metadata/md5-cache/media-gfx/hugin-9999 b/metadata/md5-cache/media-gfx/hugin-9999
index 10364936afbd..54453e094448 100644
--- a/metadata/md5-cache/media-gfx/hugin-9999
+++ b/metadata/md5-cache/media-gfx/hugin-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-vcs/mercurial >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI for the creation & processing of panoramic images
 EAPI=7
 HOMEPAGE=http://hugin.sf.net
@@ -8,8 +8,8 @@ INHERIT=mercurial python-single-r1 wxwidgets cmake xdg
 IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
 PROPERTIES=live
-RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
+RDEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6b231a393a58f29e153300450b3f0c46
+_md5_=ab6ede68ff5cb966d0e70fb1797020be
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 2d0875515b6f..9f7197419808 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.21-r2 b/metadata/md5-cache/media-libs/libpano13-2.9.21-r2
new file mode 100644
index 000000000000..8cc1d9b1b039
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libpano13-2.9.21-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= sys-libs/zlib java? ( >=virtual/jdk-1.8:* ) suitesparse? ( sci-libs/suitesparse )
+DESCRIPTION=Helmut Dersch's panorama toolbox library
+EAPI=8
+HOMEPAGE=http://panotools.sourceforge.net/
+INHERIT=cmake
+IUSE=java static-libs suitesparse
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= sys-libs/zlib java? ( >=virtual/jdk-1.8:* ) suitesparse? ( sci-libs/suitesparse )
+SLOT=0/3
+SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.21.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8463cb154a3368522ed5604fed7353b5
diff --git a/metadata/md5-cache/media-libs/libpgf-7.21.7 b/metadata/md5-cache/media-libs/libpgf-7.21.7
deleted file mode 100644
index 098bfd0c1544..000000000000
--- a/metadata/md5-cache/media-libs/libpgf-7.21.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Library to load, handle and manipulate images in the PGF format
-EAPI=7
-HOMEPAGE=https://www.libpgf.org/
-INHERIT=autotools edos2unix
-IUSE=doc
-KEYWORDS=amd64 ~ppc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/project/libpgf/libpgf/7.21.7/libpgf.zip -> libpgf-7.21.7.zip
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c53e2231fc5ab6b7d0efa6c69009336a
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index ccd96893f153..87229d21c828 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.36.7 b/metadata/md5-cache/net-libs/webkit-gtk-2.36.7
deleted file mode 100644
index 4211b8eb1d54..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.36.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Open source web browser engine
-EAPI=7
-HOMEPAGE=https://www.webkitgtk.org
-INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
-REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.36.7.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f77b1d809dfc57f12eb8e0d748d477ea
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 373b57d59204..392558383ae4 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/openssh-9.1_p1-r1 b/metadata/md5-cache/net-misc/openssh-9.1_p1-r1
new file mode 100644
index 000000000000..f3f4d5f17fa5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-9.1_p1-r1
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/autoconf virtual/pkgconfig || ( >=sys-devel/gcc-config-2.6 >=sys-devel/clang-toolchain-symlinks-14-r1:14 >=sys-devel/clang-toolchain-symlinks-15-r1:15 >=sys-devel/clang-toolchain-symlinks-16-r1:* ) verify-sig? ( sec-keys/openpgp-keys-openssh ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst preinst prepare pretend test unpack
+DEPEND=acct-group/sshd acct-user/sshd !static? ( !<sys-devel/gcc-config-2.6 audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( !<sys-devel/gcc-config-2.6 audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] )
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=7
+HOMEPAGE=https://www.openssh.com/
+INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+IUSE=abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD GPL-2
+RDEPEND=acct-group/sshd acct-user/sshd !static? ( !<sys-devel/gcc-config-2.6 audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.1p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.1p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.1_p1-hpn-15.2-glue.patch.xz ) X509? ( https://roumenpetrov.info/openssh/x509-14.0.1/openssh-9.1p1+x509-14.0.1.diff.gz https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.1_p1-X509-glue-14.0.1.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.1_p1-hpn-15.2-X509-14.0.1-glue.patch.xz ) ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.1p1.tar.gz.asc )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	user-info	69a1ed744ec33cf2c910ff2bd6084d11	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=347f321030fbf9d25bb375f465b58050
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index a669ef2f285e..b501046cd570 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.10.5.0 b/metadata/md5-cache/net-wireless/gnuradio-3.10.5.0-r1
index 4c96f38936a6..24f4cebafe74 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.10.5.0
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.10.5.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/jsonschema[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jsonschema[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) dev-libs/spdlog dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_8? ( net-wireless/soapysdr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-wireless/soapysdr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-wireless/soapysdr[python_targets_python3_10(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_9(-)] ) python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/pygccxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygccxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-libs/mathjax ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/jsonschema[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jsonschema[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) dev-libs/spdlog dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_8? ( net-wireless/soapysdr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-wireless/soapysdr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-wireless/soapysdr[python_targets_python3_10(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_9(-)] ) python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-libs/mathjax ) grc? ( x11-misc/xdg-utils ) modtool? ( python_single_target_python3_8? ( dev-python/pygccxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygccxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=8
 HOMEPAGE=https://www.gnuradio.org/
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/3.10.5.0
 SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.10.5.0.tar.gz -> gnuradio-3.10.5.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0f457bf78a43591777b4594daeba3c0f
+_md5_=b4259ae13d0f4c466a41d6b70c0523ed
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index a16be0b2c358..99d8d3a3fe34 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/jsonschema[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jsonschema[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) dev-libs/spdlog dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_8? ( net-wireless/soapysdr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-wireless/soapysdr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-wireless/soapysdr[python_targets_python3_10(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_9(-)] ) python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/pygccxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygccxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-libs/mathjax ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/jsonschema[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jsonschema[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) dev-libs/spdlog dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_8? ( net-wireless/soapysdr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-wireless/soapysdr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-wireless/soapysdr[python_targets_python3_10(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_9(-)] ) python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-libs/mathjax ) grc? ( x11-misc/xdg-utils ) modtool? ( python_single_target_python3_8? ( dev-python/pygccxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygccxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=8
 HOMEPAGE=https://www.gnuradio.org/
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d09080b8e34f49ccc146666e51c4276e
+_md5_=97d07ea67372c37a46703a304f0d3ffe
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index eecfea2bb825..c98e44b94da2 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/libpoly-0.1.11 b/metadata/md5-cache/sci-mathematics/libpoly-0.1.11
index 4f67e04347c5..b241c7363c93 100644
--- a/metadata/md5-cache/sci-mathematics/libpoly-0.1.11
+++ b/metadata/md5-cache/sci-mathematics/libpoly-0.1.11
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 SLOT=0/0.1.11
 SRC_URI=https://github.com/SRI-CSL/libpoly/archive/v0.1.11.tar.gz -> libpoly-0.1.11.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=846bf1c77874f0632e6392186877a8da
+_md5_=cfb18f31a7346211318f2a67cab7b7e7
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 3b10e32d18ab..418e3fd44982 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20211216 b/metadata/md5-cache/sys-kernel/linux-firmware-20211216
deleted file mode 100644
index d782cc60a4dd..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20211216
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=initramfs? ( app-arch/cpio )
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
-DESCRIPTION=Linux firmware files
-EAPI=7
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-INHERIT=mount-boot savedconfig
-IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
-RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
-REQUIRED_USE=initramfs? ( redistributable )
-RESTRICT=binchecks strip test unknown-license? ( bindist )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20211216.tar.xz
-_eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341
-_md5_=ddba19864e11507bf93317b13859b8f4
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 0bd880adc026..77c924bd7290 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.6 b/metadata/md5-cache/x11-base/xorg-server-21.1.6
new file mode 100644
index 000000000000..9703870582b9
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-21.1.6
@@ -0,0 +1,18 @@
+BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 )
+DESCRIPTION=X.Org X servers
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
+INHERIT=flag-o-matic xorg-3 meson
+IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
+RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
+REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0/21.1.6
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.6.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
+_md5_=f79e6390285a037e50abe783fa78c46a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2684514b30ce..ebef9466d269 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14601 BLAKE2B b2b03f784771869c2af8238b7eb177f68542d9936c68fb72d5570f7586fc5bfa6ebef91d68006df82de3cb72959aeb4bab278be90309ec4475d99a0a7c116698 SHA512 63ddd1056929f887c0a4815b7d7a2bf2cee40e7678885b8dae9d5f1bfc4b69ae36456367dc791d7e3ada9047919456bd6d6dbfc92df0cef91b9e64733254a40c
-TIMESTAMP 2022-12-19T19:09:56Z
+TIMESTAMP 2022-12-20T01:09:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOgtwRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOhC2ZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC26RAAkvsA7kK6gG3TN8jGKywJP5tvEAZrS/F18JxzF+t0BMstrMjx9EoWQtRk
-InrlWsay2yDsi2cMdkR2ZNsfYna3rRufACyTagjhrUH3em2SVsL2+02801TmYvpm
-9qfd4+Lv9IbnInfn48fG1slAaMtaHP2Foe27BMG/71+GKwVhKafRVKZWxRgCbbw0
-KtdbujDjHOn6oshpmEup+HkkV3Pq2TSlG9hgSh8PW/fQkPiUjjABdnp1tevXxXZX
-8H/W9AAHj+rSXTQAzru2sJrPHXnC+lNH3LwsSWu6fGRnii0QvPDFRI+fGt0LcXMG
-QZ32izNK91PBIIMb8v5lFSd2RNBkfpI8ifF68294aJBX/BjVPS7WzW0NGUuI00vn
-kctdcF95gNYTmMyDU5TloEPZPRUW9Pr0dSoqDu2W6pJc5I7h6lAZ+E6mmDFN0q4G
-QKwwr/yTYCs9YSueICbvcA0vh2chbvgXlFptKJ/iuMLmrwnuBi948lMBSGmmR961
-HtEu8IwnoYb6C0euoTtU/hqGYkGrihfI+njGVLP/RXp0cxBKu6EDrTFBMQFMduHd
-1SObmD67x9bdKoeZDQwsk6H6/JP8+Eyr5nq1kGPS4nqnkHMQCsXOf8LnF0rUSE/k
-8LGB9VcqkDcQtxdMQq4DJgksxW3qwj7pHPdC3IgZyUq2PVwvmFs=
-=55RX
+klCLCg/+JEtnXFNQT39dfs+wti4aOwHtIT5hB+Ett9r+V6Rwb23ump9zwTx3tLD7
+IE2DymHlCmWcdJtWYccvPDGWHUSefb5MjDX02xicDCSxqDXnsi2cq/IF9kW19BAt
+zXrabdxZL/ULmmVAr1Q1rzxCTQMwIkZrPRi3ncT2rQjF3fhXFxZahbC4iNskJSaO
+71APfM1hKiJBgjd/Xjr7qQG3rXtdg71qYc9/1M5xennfTWotn27UShCYSlzLhHx0
+KLlXIP/RacLfugJ2iP3jHsLX7Wh5cExOPgsfXp06t7Mhfs+w6T5cAVlZXjD4R7yf
+xcs+FjdPBfuGGDTAEIhaNfXvAUY7GfVPSFasazKFuoUF2pHfktfqx26QpVXJje4Y
+BSgG9plBphycYc0ZMw6BVr7p7X3Xfyr6+hBLOm0suJhK7pshc08Buiq1Q1x3cpWw
+xZ19CHblTrLIlnTz6hB5OEXUaCKz0kycNyVdjUWKuYGPPN74d/r7D0Dh8DIWh/H+
+pxnhe0vmn8SYlSM32Rh32P92b5Ulxk9Pb7wU9+WNLx4QCBRophNofy2bcFH3F/Fm
+PD7rvbqPEne2YXW/PsKDJleunaLIcOBpOPLPrI29lGPEd0Sj6IzJPxMsXtwnn1Qt
+/pAqhmKr1PHr0Xy52VwL709yomh3O029K1AHIodMwz9MWYiAvdM=
+=l+Lb
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 459877cde543..5da36c6daff1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Dec 2022 19:09:52 +0000
+Tue, 20 Dec 2022 01:09:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1651ce085b27..905fa70dac5d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Dec 19 07:09:52 PM UTC 2022
+Tue Dec 20 01:09:53 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c941752f458b..926b59a3b1ab 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Dec 2022 19:15:01 +0000
+Tue, 20 Dec 2022 01:15:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 97b5947db218..df5da9e7ffe7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-7eef9321e7b7e00d219f58340726f903f4fab15f 1671476205 2022-12-19T18:56:45+00:00
+fcf8905ce3db9b8b6d1fca4e30cf37c30502208e 1671496352 2022-12-20T00:32:32+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 252e574268dd..718e5db3c9d2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1671477001 Mon 19 Dec 2022 07:10:01 PM UTC
+1671498601 Tue 20 Dec 2022 01:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 459877cde543..5da36c6daff1 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Dec 2022 19:09:52 +0000
+Tue, 20 Dec 2022 01:09:53 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 6cd315e24304..2bc3b4593663 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 18d78def8905..508b773bead5 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,5 @@
 AUX 2.38.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch 914 BLAKE2B 44525071481e9cfc75e972d5da2f516d9ca5b762d0f3ccf9a715232406bc4ed0cca6e9971c9df2c0ed3299d7fe73e70b6ed22773b2ad37c379e39042a5bd90f0 SHA512 cbdcde3fb6abdef8faca0fc7d4aef25155f4268b97128f98ff1e0bb6282941aa00bea06a1686c97086aedf13c5e4819a29b9bc470d8a09c1f1eec9676e32b575
-DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90bdaa6c813aa181d14c9a5636c58140ce55d5b5288a65cfbe9e363cd9d00f62de74665182ab9f856baa4b2ffcec6dba SHA512 e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888
 DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
-EBUILD webkit-gtk-2.36.7.ebuild 7425 BLAKE2B 1f261d15a60f1d07895652c369cdf572cea2bdd19236abd2a2de2b31b1f8994a644d85185368a07a708c7c4e956f4547b12ae14a8befd5b1c33fd02ebfb1b9fa SHA512 459a52070c6c83950dd278c3325bc83d184314ec4e613ccf3f34fc9cd4ce7d45d854a892452e9f620da37937050c470e21614daac03189cf082cfb07f50d92a6
 EBUILD webkit-gtk-2.38.2-r410.ebuild 7808 BLAKE2B 93bc9be0e0e5f703b24958d8a38a18adb472a61395b4e750ad2e1c00d50f038c12b77a4cbab3c510c4ab8323add58ef7f99a73f90f30d44e183466abe0881aba SHA512 4b627085754c475a7662329ac35002fb1cfd3eea979768ab2cdc7dbca17024c3c1836eea7af35fb9b671cfa0744a46cb6c8f4d25c312c163992bf2c7a1577e43
 EBUILD webkit-gtk-2.38.2-r500.ebuild 7767 BLAKE2B 946fd41d884b8769e774aea8f1029488fb275ed9550d6bff34e8b8a142283534db497a40a68409c2f6730e96491ca52ba0cfd9e2d0fe39a68984e19b9fff92ec SHA512 73891d1296e6cf99ba6ab0bbf908c7a87e5ad101659402a7d1c3db193664661ff58f7ac16c6ce683de2ad125ddf2430392b2aeaff082e0a8315e51abe57527ac
 EBUILD webkit-gtk-2.38.2.ebuild 7533 BLAKE2B 968495c780fb92563a3211868899876b264cb7d02ac8a5d14eb367e1e1d4770f46eb515ebe6195ceb0295908a1bd9e4abcb35ddce83cb9532dcab64e3888bd16 SHA512 a452b2fafef0f34a59245c572c9e3cdc66acf465908e8a4e4c38e023715ed646457f68084ad336745fc7e70b4f2e19e073644839565a696a5be0c737e2dcea8e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
deleted file mode 100644
index 6b8011fcb778..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_ANGLE_WEBGL=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 345b6b55d6ba..f091fdb46c96 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 52ab70515835..8e0efd53051b 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -34,14 +34,18 @@ DIST openssh-9.0p1-sctp-1.2.patch.xz 6768 BLAKE2B 8a18aea57b0b3f8f0a641870f0cd15
 DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 SHA512 613ae95317e734868c6a60d9cc5af47a889baa3124bbdd2b31bb51dd6b57b136f4cfcb5604cca78a03bd500baab9b9b45eaf77e038b1ed776c86dce0437449a9
 DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a26656f0430a2511c25bc6b5006f1683d845826a68ff4eed068b30c911e273cb34e5b4880854d55a776415474019 SHA512 7b1445764058435d2fa8a9c7553643983650d4232036c088e46e44beeb538d32cba88f775b1be9da5f21a01d6caea59b3dc4714507781e9cb946546fa54f169f
 DIST openssh-9.1_p1-X509-glue-13.5.patch.xz 1092 BLAKE2B 19da945547472048d01a6ec26f28cba11afe1a0590a115582d1e21a852b6b66589b091ab4440d57952200522318aeffb7d9404e53f9532ae80e47685c24c4097 SHA512 96de9f59bacfd99aa9ef03362d55d88b3eea0acc57a11fb72e5c612bfb0f5e48455b0a0d0add9a8a5524b9d4701f47db1ff7859f1d3c2a12947b27292961cbd5
+DIST openssh-9.1_p1-X509-glue-14.0.1.patch.xz 1096 BLAKE2B cf5568982c9b2b69ee9f99f3e80459aed7b89f1350362e550ae8db3e5eee4a6d2e07879f962262a05c9745d39f34a3ae83792595c61f0ac287226ee9e0ec2a1b SHA512 18c65c97cc8c436fa8e28c0ad9f0a3874f1fb745d75e0bfb76c180bc148ae14a5f6cc5c2b2fa7261d76a8e1234f28fe869bd7f64ed282bf39c88cc3f20932be5
+DIST openssh-9.1_p1-hpn-15.2-X509-14.0.1-glue.patch.xz 5536 BLAKE2B 4629e62287f2bc36fe1eb830e4c47c5482e36650c1e725978e150e4f2a233d58b5bd1286024bdbef4d05586bb3e5d13c51fbd191dfe7429fdb06a278c564a777 SHA512 03467605b57ab3fb7ef2a9be175cf3708fa92234f3f0abfa74ea371c9ee90f2c01a3311022e282823c7bb67249d65aabf89f1574b917dc798c51847e57b0e33f
 DIST openssh-9.1_p1-hpn-15.2-X509-glue.patch.xz 5504 BLAKE2B 776b467ddde16e268536c5632b028a32db22b26d7bc11e2a9fa6c8e29528be3eb781066d6b30fb2f561a73a24c34a29963fcd7c872aa92dc19d715d8ffbf2cbe SHA512 aa753da5f75d90165f5922ead1dd495a15a4c581360d5862ec6f802caea54055da8e308c1919efa8e78b31a7ea082f8693dda0ab84ccee414c562ec062c50fb1
 DIST openssh-9.1_p1-hpn-15.2-glue.patch.xz 3840 BLAKE2B 06fb14d8c6f52f1c6fae7971fc4da810c814d7b52063f8cc7e83356baa7ed70c84476c1d1cc896eba6d0d51813dc994e3c82278e66c04998431c8123a09fe7df SHA512 99c88c08fb384336a9680629bc04a89121780d64ee8b03ac164c4e446cc30b865004292e98516b6f857bd75e1b4393291427c046ffcabc1578629e6075636cbf
 DIST openssh-9.1p1+x509-13.5.diff.gz 1213948 BLAKE2B 5663a1c865c80f590642bb855f7d7a17e71e0db099deb4cea5750cfe734bd506b70a1b266fccc2a58174ae2b1b96a7f1ced56382d5d7e741b07e46422b03f7e6 SHA512 70a1f12e98b8fa8170c208803ee482aea2fcf6b9e41ecada5fabaa0288ed5a32574f42a7b50718bb484978f3c65f50e55966c9f555a9de100dc8d695b9aec531
+DIST openssh-9.1p1+x509-14.0.1.diff.gz 1236304 BLAKE2B 389e652a7cca4d7322d784e516a9454b0c6cb540a64aa47c0b14ac80bd9ad5aa7aa72a00dbc9024aa7c1186b19f2c62f179b8a6463085dd1bdde15fd44e451e5 SHA512 da754497f3f7d173b273f710dab2e7dbc5bf5257c95e661687ff4dd6b5e1c696ac031785850d9a9eb5669f728cbe4fe26d256a7cbd6f137ecadaf38f153770d1
 DIST openssh-9.1p1-sctp-1.2.patch.xz 6772 BLAKE2B 8393c1ca5f0df7e4d490cef5c38d50d45da83a9c3f650e9af15d95825f9e682a6aaf6a0e85fc1704d41d6567aec8f0b34e43b20652e0141008ccdbe91426dfac SHA512 6750394d0fb7b7f93a0e4f94204e53277cc341c5b2427130559e443557dbb95f2e85a71cfe8d40cfa17dd015b0f3880f79a1f868374e60e94e8385c9b45acec5
 DIST openssh-9.1p1.tar.gz 1838747 BLAKE2B 287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5 SHA512 a1f02c407f6b621b1d0817d1a0c9a6839b67e416c84f3b76c63003b119035b24c19a1564b22691d1152e1d2d55f4dc7eb1af2d2318751e431a99c4efa77edc70
 DIST openssh-9.1p1.tar.gz.asc 833 BLAKE2B 83efe3c705f6a02c25a9fc9bac2a4efd77470598d9e0fcb86dff2d265c58cffec1afecad3621769b2bd78ac25884f0ee20ae9b311e895db93e3bb552dffd6e74 SHA512 47dc7295f9694250bcbb86d7ca0830a47da4f3df7795bb05ebaf1590284ccce5317022c536bea1b09bd2fa4d8013295cc0de287ebe3f9dc605582077e9f11ddd
 EBUILD openssh-8.9_p1-r2.ebuild 17076 BLAKE2B 6f236af760da98ff31643f2bf22560c65d7fc0b00a00502b84657739039663e230b78db2a0cc3cc02eea6fc3f030157bc22053955501ecaa055698eea5a70bca SHA512 4d2d05fc3a15318687d769c99b779bdc41998a5456650b7d174828e4d557711036d2def92f7f8465c9c4e38180e614f12462e58ca7e0653d7be7e242e4408bb5
 EBUILD openssh-9.0_p1-r2.ebuild 16929 BLAKE2B a218c0faba8bb8218841f2c621584bd7b381629a12620e27f54cb5c563fcd1d56a21b2f10be20b77c7492eb2d89be31c209fc250252be86cb88d427642123ebe SHA512 d7a865cbf8bd64fd4518966b43a4af8f3156cd125cb6b91a4d9a63ba1c02625155bd641f082056d753c5f84172c2965e3fc5e5376a6d68b72edf651c8f7b5d55
 EBUILD openssh-9.0_p1-r6.ebuild 17502 BLAKE2B bfdb6f817ee3042e7a7f407b3fcef7d398f96899e1a9090e197afd625ebab39e83f4ec76fe7582fbed41cbfa2e84350f7edd648e03bc83f3c560751379d9d44e SHA512 260f6c0d2f46517debec42cec0993b4cfefb0adc480b3e0d3cdf8e80c3f5ba89da1013994c7db2c61143a43af4374536a21d1e62f8af742fd394933eead529db
+EBUILD openssh-9.1_p1-r1.ebuild 17832 BLAKE2B b29a9cae52c16dd29382dc57454879e26bae5f1bd18edf87541c7cee8de3fa907eb1d27770235124267c73e9adafbe85c61c16b7eb3be047e3c3ba0da2e447f1 SHA512 2aacdffce384c2c50bb946d202cb1397c36eff5dbaafe741e5f412321828a057fb876a7ded8db8d88ad99c603c35da219ff59ecd7c84b2a7f20c2216fc290658
 EBUILD openssh-9.1_p1.ebuild 17810 BLAKE2B 302fca36aa0f354186744a3220f430e61c3f2ca1f3dda7de7c98f47e6a476715aee1a023451f27cfb1bb07ee50ec1bbc28a05e8f70c2937d391519b9a8423725 SHA512 871fc233d0532c5b84a171a46e3a9ccd5888833145413547e5d8c7bfc0a761280446c61440103dd132e2bd2f73cb6f35c0f90ae41a4975e3d9c2fd506ba0de29
 MISC metadata.xml 2047 BLAKE2B 87356343744e121075383ad94ba6b821d2db5c3f5af16745130078f939e53b6a83281c19b89f272d20509753bc734bfdd3aab024d72651c7d5c69df27b36841a SHA512 a5b69ff7fa94b00062e78eba36b6d321fd923d27e953fc24ae81d8e25040bebde9ccb8b1555912726eff2b39ee0256aee0da52359e326fb4b1edd394e4f1e406
diff --git a/net-misc/openssh/openssh-9.1_p1-r1.ebuild b/net-misc/openssh/openssh-9.1_p1-r1.ebuild
new file mode 100644
index 000000000000..2eae29e04ea9
--- /dev/null
+++ b/net-misc/openssh/openssh-9.1_p1-r1.ebuild
@@ -0,0 +1,514 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+# PV to USE for HPN patches
+#HPN_PV="${PV^^}"
+HPN_PV="8.5_P1"
+
+HPN_VER="15.2"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+HPN_GLUE_PATCH="${PN}-9.1_p1-hpn-${HPN_VER}-glue.patch"
+
+SCTP_VER="1.2"
+SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+
+X509_VER="14.0.1"
+X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_GLUE_PATCH="${P}-X509-glue-${X509_VER}.patch"
+X509_HPN_GLUE_PATCH="${PN}-9.1_p1-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? (
+		$(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}")
+		https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz
+	)}
+	${X509_PATCH:+X509? (
+		https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH}
+		https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_GLUE_PATCH}.xz
+		${HPN_VER:+hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_HPN_GLUE_PATCH}.xz )}
+	)}
+	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	hpn? ( ssl )
+	ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp ssl !xmss )
+	xmss? ( ssl  )
+	test? ( ssl )
+"
+
+# tests currently fail with XMSS
+REQUIRED_USE+="test? ( !xmss )"
+
+# Blocker on older gcc-config for bug #872416
+LIB_DEPEND="
+	!<sys-devel/gcc-config-2.6
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		net-libs/ldns[ecdsa(+),ssl(+)]
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
+	virtual/libcrypt:=[static-libs(+)]
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
+	static? ( ${LIB_DEPEND} )
+"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	!prefix? ( sys-apps/shadow )
+	X? ( x11-apps/xauth )
+"
+# Weird dep construct for newer gcc-config for bug #872416
+BDEPEND="
+	sys-devel/autoconf
+	virtual/pkgconfig
+	|| (
+		>=sys-devel/gcc-config-2.6
+		>=sys-devel/clang-toolchain-symlinks-14-r1:14
+		>=sys-devel/clang-toolchain-symlinks-15-r1:15
+		>=sys-devel/clang-toolchain-symlinks-16-r1:*
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssh )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.9_p1-include-stdlib.patch"
+	"${FILESDIR}/${PN}-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex
+	"${FILESDIR}/${PN}-6.7_p1-openssl-ignore-status.patch"
+	"${FILESDIR}/${PN}-7.5_p1-disable-conch-interop-tests.patch"
+	"${FILESDIR}/${PN}-8.0_p1-fix-putty-tests.patch"
+	"${FILESDIR}/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
+	"${FILESDIR}/${PN}-8.9_p1-allow-ppoll_time64.patch" #834019
+	"${FILESDIR}/${PN}-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044
+	"${FILESDIR}/${PN}-9.1_p1-build-tests.patch"
+)
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	local missing=()
+	check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); }
+	check_feature hpn HPN_VER
+	check_feature sctp SCTP_PATCH
+	check_feature X509 X509_PATCH
+	if [[ ${#missing[@]} -ne 0 ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested: ${missing[*]}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "Missing requested third party patch."
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_unpack() {
+	default
+
+	# We don't have signatures for HPN, X509, so we have to write this ourselves
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc}
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${PATCHES[@]}"
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" &>/dev/null || die
+		eapply "${WORKDIR}/${X509_GLUE_PATCH}"
+		popd &>/dev/null || die
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch"
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}" || die
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
+		pushd "${hpn_patchdir}" &>/dev/null || die
+		eapply "${WORKDIR}/${HPN_GLUE_PATCH}"
+		use X509 && eapply "${WORKDIR}/${X509_HPN_GLUE_PATCH}"
+		use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
+		popd &>/dev/null || die
+
+		eapply "${hpn_patchdir}"
+
+		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply_user #473004
+
+	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
+	sed -e '/\t\tpercent \\/ d' \
+		-i regress/Makefile || die
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+	use xmss && append-cflags -DWITH_XMSS
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
+		# doesn't check for this, so force the replacement to be put in
+		# place
+		append-cppflags -DBROKEN_GLOB
+	fi
+
+	# use replacement, RPF_ECHO_ON doesn't exist here
+	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(usex X509 '' "$(use_with security-key security-key-builtin)")
+		$(use_with ssl openssl)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	if use elibc_musl; then
+		# musl defines bogus values for UTMP_FILE and WTMP_FILE
+		# https://bugs.gentoo.org/753230
+		myconf+=( --disable-utmp --disable-wtmp )
+	fi
+
+	# Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all
+	# bug #869839 (https://github.com/llvm/llvm-project/issues/57692)
+	tc-is-clang && myconf+=( --without-hardening )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local tests=( compat-tests )
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		ewarn "user, so we will run a subset only."
+		tests+=( interop-tests )
+	else
+		tests+=( tests )
+	fi
+
+	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
+	mkdir -p "${HOME}"/.ssh || die
+	emake -j1 "${tests[@]}" </dev/null
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd-r1.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	if use pam; then
+		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	fi
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+	rmdir "${ED}"/var/empty || die
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
+		show_ssl_warning=1
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${old_ver}" -lt "5.8_p1"; then
+			elog "Starting with openssh-5.8p1, the server will default to a newer key"
+			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+		fi
+		if ver_test "${old_ver}" -lt "7.0_p1"; then
+			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+			elog "Make sure to update any configs that you might have.  Note that xinetd might"
+			elog "be an alternative for you as it supports USE=tcpd."
+		fi
+		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
+			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+			elog "adding to your sshd_config or ~/.ssh/config files:"
+			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+			elog "You should however generate new keys using rsa or ed25519."
+
+			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+			elog "out of the box.  If you need this, please update your sshd_config explicitly."
+		fi
+		if ver_test "${old_ver}" -lt "7.6_p1"; then
+			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+		fi
+		if ver_test "${old_ver}" -lt "7.7_p1"; then
+			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+			elog "if you need to authenticate against LDAP."
+			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+		fi
+		if ver_test "${old_ver}" -lt "8.2_p1"; then
+			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
+			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
+			ewarn "connection is generally safe."
+		fi
+	done
+
+	if [[ -n ${show_ssl_warning} ]]; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index e1ce9ca0612c..941d09c5f446 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index df0c4ba820a1..f09de0ab42a8 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -4,6 +4,6 @@ AUX gnuradio-3.10.4.0-fix-blockinterleaving.patch 797 BLAKE2B 9a32f372f6a2600dda
 DIST gnuradio-3.10.4.0.tar.gz 4392284 BLAKE2B 2a5766708534966bcea1e1ab57ae703b0b453278da5042c65ddcf5bda39dee084ee8f77d414e2c8ab3eae2397680f7591c456404a6cefc08b28a7d1f5d25534d SHA512 a8690016513df3928cb2f63eef190c7306bc3cc452dfeafab2e47b43aa1dd3f61515df49832e99530535f94deabfb614388a27212b09e1c816782f3fdd4915eb
 DIST gnuradio-3.10.5.0.tar.gz 4368231 BLAKE2B c21e310d4cc50112e7d2085be5a82f4eb633305936004cc60cabbac340a0cbd0016bb5f24229380c36281c4e52e6763c5152ceb6ad0f2efc43bd28b2b55c4df8 SHA512 82f3028cbcb0175f9f354b19613ee59b052881b894c6d668d04235acda2e3be0ca2713642141a917264e70039f23795c647c47364af9ffad63f108da517d77c5
 EBUILD gnuradio-3.10.4.0.ebuild 6719 BLAKE2B 0fe7b10ad8617c199c19029a06d3da149c733fb3fd545a49c78a0b66e844bd5e519066a9555c1f07ad23afb1bf159006c8d85787b2b24b3564225f3f9eb65586 SHA512 3fd291326ae296b63158bb1da18e6b8abc7911173135364586d8acd950be0c6d68c538997cadfe8bd420bcd210b7394628dbd10e1ec2605cdd178d59c77c8877
-EBUILD gnuradio-3.10.5.0.ebuild 6661 BLAKE2B e80c64d8af2909a6a14014872bb0f47f058808695e3e1754217d567178ecb4f96c8b3047ed8c5584c2436b0e6796a41bcf4bce70ec2010b272b40e8d6748f07d SHA512 c61baea6f83ea9c377b73114d34e12b05cccd6d223f20efacfc730740477230c38133834e55eb3c4907a7c0786a77d0c52605c7e0d2b327f814e0ac14eba062c
-EBUILD gnuradio-9999.ebuild 6593 BLAKE2B 16ec1945240c660ae70861cf7c048f9cd0e861d2ac33089ead1e355531afb9e0a9959b81d2a1186f5a03725658d8d15ac69bb5f74f85278da1b2af3bc77b5441 SHA512 51e5c1510ce8a7bcceb52dfd58e0ef9951f8ff8b8be9c913e8420bcc03339dd69e90f4dbdae233f2a29a8bf076dd0bff6f04833dbbac15d74629b3359d77f278
+EBUILD gnuradio-3.10.5.0-r1.ebuild 6674 BLAKE2B f35e188f7aef7c59cfa710dc293366677fa778b205e02fbaa15762eea1894b0a514f4adf0fdb8ace3aab2a0dbaffb6a5abfb3a11d726a09444d84b2de6210493 SHA512 ee8afeb0cd0f8b7054720f724fe2372aeede334848300367567cc8d518d4bca5576e5aadc09b8683d173d6adc12dbf3d46f33f03c0723b703b5b054999030651
+EBUILD gnuradio-9999.ebuild 6606 BLAKE2B ab107929581843f6858fc929af478035d725fc4c609bf368b4f914de1ed6120071b8e8b7962cdb280e2a3d26ad046fd629ae57a6883a387f22750cfabf199ff3 SHA512 43450c8b8c0efeb52498b4d7d33a60680ff1264e30f77564fccae87942da5f0439dd3bebec6a6a7da69c938d8879cbada9347936b6fae36289f7d39ecd0f7227
 MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0
diff --git a/net-wireless/gnuradio/gnuradio-3.10.5.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.5.0-r1.ebuild
index 373ea59a99f5..6ce643b5ead6 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.5.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.5.0-r1.ebuild
@@ -119,13 +119,13 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.2
 	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
-	$(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]')
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
 		dev-libs/mathjax
 	)
 	grc? ( x11-misc/xdg-utils )
+	modtool? ( $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') )
 	oss? ( virtual/os-headers )
 	test? ( >=dev-util/cppunit-1.9.14 )
 	zeromq? ( net-libs/cppzmq )
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 9ebe5272423a..0315fd080aed 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -119,13 +119,13 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.2
 	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
-	$(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]')
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
 		dev-libs/mathjax
 	)
 	grc? ( x11-misc/xdg-utils )
+	modtool? ( $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') )
 	oss? ( virtual/os-headers )
 	test? ( >=dev-util/cppunit-1.9.14 )
 	zeromq? ( net-libs/cppzmq )
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 64a4ec0aa48a..a72c39c57cfd 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/default/linux/arm64/23.0/big-endian/eapi b/profiles/default/linux/arm64/23.0/big-endian/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/big-endian/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/big-endian/parent b/profiles/default/linux/arm64/23.0/big-endian/parent
new file mode 100644
index 000000000000..a7cd964146bc
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/big-endian/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/arm64/big-endian
diff --git a/profiles/default/linux/arm64/23.0/desktop/eapi b/profiles/default/linux/arm64/23.0/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/desktop/gnome/eapi b/profiles/default/linux/arm64/23.0/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/desktop/gnome/parent b/profiles/default/linux/arm64/23.0/desktop/gnome/parent
new file mode 100644
index 000000000000..6589a0e01478
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/eapi b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/parent b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..f5c1ae438de4
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/arm64/23.0/desktop/parent b/profiles/default/linux/arm64/23.0/desktop/parent
new file mode 100644
index 000000000000..ad6c5e126fbb
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/profiles/default/linux/arm64/23.0/desktop/plasma/eapi b/profiles/default/linux/arm64/23.0/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/desktop/plasma/parent b/profiles/default/linux/arm64/23.0/desktop/plasma/parent
new file mode 100644
index 000000000000..ff3a7b1ec814
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/eapi b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/parent b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/arm64/23.0/desktop/systemd/eapi b/profiles/default/linux/arm64/23.0/desktop/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/desktop/systemd/parent b/profiles/default/linux/arm64/23.0/desktop/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/desktop/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/arm64/23.0/eapi b/profiles/default/linux/arm64/23.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/hardened/eapi b/profiles/default/linux/arm64/23.0/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/hardened/parent b/profiles/default/linux/arm64/23.0/hardened/parent
new file mode 100644
index 000000000000..6303d33abd2d
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/hardened/arm64
diff --git a/profiles/default/linux/arm64/23.0/hardened/selinux/eapi b/profiles/default/linux/arm64/23.0/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/hardened/selinux/parent b/profiles/default/linux/arm64/23.0/hardened/selinux/parent
new file mode 100644
index 000000000000..2190e9797eaa
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/profiles/default/linux/arm64/23.0/llvm/eapi b/profiles/default/linux/arm64/23.0/llvm/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/llvm/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/llvm/packages.build b/profiles/default/linux/arm64/23.0/llvm/packages.build
new file mode 100644
index 000000000000..9ffb08757bd7
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/llvm/packages.build
@@ -0,0 +1,9 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# we use glibc here, so we still need these in stage1
+# later stages should pull them in as BDEPEND anyway
+sys-devel/gcc
+sys-devel/gcc-config
+sys-devel/binutils
+sys-devel/binutils-config
diff --git a/profiles/default/linux/arm64/23.0/llvm/parent b/profiles/default/linux/arm64/23.0/llvm/parent
new file mode 100644
index 000000000000..929f409fcc3f
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/llvm/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/llvm
diff --git a/profiles/default/linux/arm64/23.0/llvm/systemd/eapi b/profiles/default/linux/arm64/23.0/llvm/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/llvm/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/llvm/systemd/parent b/profiles/default/linux/arm64/23.0/llvm/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/llvm/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/arm64/23.0/musl/eapi b/profiles/default/linux/arm64/23.0/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/musl/hardened/eapi b/profiles/default/linux/arm64/23.0/musl/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/musl/hardened/parent b/profiles/default/linux/arm64/23.0/musl/hardened/parent
new file mode 100644
index 000000000000..488bf0d8c2c3
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/arm64
diff --git a/profiles/default/linux/arm64/23.0/musl/hardened/selinux/eapi b/profiles/default/linux/arm64/23.0/musl/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/musl/hardened/selinux/parent b/profiles/default/linux/arm64/23.0/musl/hardened/selinux/parent
new file mode 100644
index 000000000000..23c64bb44399
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/default/linux/arm64/23.0/musl/llvm/eapi b/profiles/default/linux/arm64/23.0/musl/llvm/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/llvm/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/musl/llvm/package.use.mask b/profiles/default/linux/arm64/23.0/musl/llvm/package.use.mask
new file mode 100644
index 000000000000..3435fc7a7d5c
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/llvm/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-10-15)
+# Undo the general musl mask
+www-client/firefox -clang
diff --git a/profiles/default/linux/arm64/23.0/musl/llvm/parent b/profiles/default/linux/arm64/23.0/musl/llvm/parent
new file mode 100644
index 000000000000..845cedb73fde
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/llvm/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/llvm
diff --git a/profiles/default/linux/arm64/23.0/musl/make.defaults b/profiles/default/linux/arm64/23.0/musl/make.defaults
new file mode 100644
index 000000000000..70146a12835c
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/make.defaults
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="arm64"
+ACCEPT_KEYWORDS="${ARCH}"
+
+CHOST="aarch64-gentoo-linux-musl"
+CFLAGS="-O2"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# Anthony G. Basile <blueness@gentoo.org> (2015-10-25)
+# Multilib-related setup, bug #515130
+ABI="arm64"
+DEFAULT_ABI="arm64"
+MULTILIB_ABIS="arm64"
+CHOST_arm64="${CHOST}"
+LIBDIR_arm64="lib"
+
+# Michał Górny <mgorny@gentoo.org> (2017-03-14)
+# Unhide the ARM-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/default/linux/arm64/23.0/musl/package.mask b/profiles/default/linux/arm64/23.0/musl/package.mask
new file mode 100644
index 000000000000..10e1ef15562d
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/package.mask
@@ -0,0 +1,6 @@
+# Copyright 2020 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License v2
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-04-27)
+# rust-bin is awailable on arm64 musl
+-dev-lang/rust-bin
diff --git a/profiles/default/linux/arm64/23.0/musl/package.use.force b/profiles/default/linux/arm64/23.0/musl/package.use.force
new file mode 100644
index 000000000000..21cef28896ca
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/package.use.force
@@ -0,0 +1,7 @@
+# Copyright 2022 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License v2
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-01-21)
+# Bootstrapping is possible using our build snapshot, so don't force
+# system bootstrap
+dev-java/openjdk:17 -system-bootstrap
diff --git a/profiles/default/linux/arm64/23.0/musl/parent b/profiles/default/linux/arm64/23.0/musl/parent
new file mode 100644
index 000000000000..58651906cb67
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/musl
diff --git a/profiles/default/linux/arm64/23.0/musl/use.mask b/profiles/default/linux/arm64/23.0/musl/use.mask
new file mode 100644
index 000000000000..a6ffd344214b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/musl/use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mask multilib, since we cannot use it.
+multilib
diff --git a/profiles/default/linux/arm64/23.0/parent b/profiles/default/linux/arm64/23.0/parent
new file mode 100644
index 000000000000..50be433109ef
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../releases/23.0
diff --git a/profiles/default/linux/arm64/23.0/prefix/eapi b/profiles/default/linux/arm64/23.0/prefix/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/prefix/kernel-3.2+/eapi b/profiles/default/linux/arm64/23.0/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/prefix/kernel-3.2+/parent b/profiles/default/linux/arm64/23.0/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..b8a505e58f6c
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/arm64/23.0/prefix/parent b/profiles/default/linux/arm64/23.0/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/arm64/23.0/split-usr/big-endian/eapi b/profiles/default/linux/arm64/23.0/split-usr/big-endian/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/big-endian/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/big-endian/parent b/profiles/default/linux/arm64/23.0/split-usr/big-endian/parent
new file mode 100644
index 000000000000..c65266a460d9
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/big-endian/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/arm64/big-endian
diff --git a/profiles/default/linux/arm64/23.0/split-usr/desktop/eapi b/profiles/default/linux/arm64/23.0/split-usr/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/desktop/gnome/eapi b/profiles/default/linux/arm64/23.0/split-usr/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/desktop/gnome/parent b/profiles/default/linux/arm64/23.0/split-usr/desktop/gnome/parent
new file mode 100644
index 000000000000..9e06c4505a75
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm64/23.0/split-usr/desktop/parent b/profiles/default/linux/arm64/23.0/split-usr/desktop/parent
new file mode 100644
index 000000000000..db8ce088c69a
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm64/23.0/split-usr/desktop/plasma/eapi b/profiles/default/linux/arm64/23.0/split-usr/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/desktop/plasma/parent b/profiles/default/linux/arm64/23.0/split-usr/desktop/plasma/parent
new file mode 100644
index 000000000000..00b252f479ce
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/arm64/23.0/split-usr/eapi b/profiles/default/linux/arm64/23.0/split-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/hardened/eapi b/profiles/default/linux/arm64/23.0/split-usr/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/hardened/parent b/profiles/default/linux/arm64/23.0/split-usr/hardened/parent
new file mode 100644
index 000000000000..488bf0d8c2c3
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/arm64
diff --git a/profiles/default/linux/arm64/23.0/split-usr/hardened/selinux/eapi b/profiles/default/linux/arm64/23.0/split-usr/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/hardened/selinux/parent b/profiles/default/linux/arm64/23.0/split-usr/hardened/selinux/parent
new file mode 100644
index 000000000000..23c64bb44399
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/default/linux/arm64/23.0/split-usr/llvm/eapi b/profiles/default/linux/arm64/23.0/split-usr/llvm/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/llvm/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/llvm/packages.build b/profiles/default/linux/arm64/23.0/split-usr/llvm/packages.build
new file mode 100644
index 000000000000..9ffb08757bd7
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/llvm/packages.build
@@ -0,0 +1,9 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# we use glibc here, so we still need these in stage1
+# later stages should pull them in as BDEPEND anyway
+sys-devel/gcc
+sys-devel/gcc-config
+sys-devel/binutils
+sys-devel/binutils-config
diff --git a/profiles/default/linux/arm64/23.0/split-usr/llvm/parent b/profiles/default/linux/arm64/23.0/split-usr/llvm/parent
new file mode 100644
index 000000000000..845cedb73fde
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/llvm/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/llvm
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/eapi b/profiles/default/linux/arm64/23.0/split-usr/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/eapi b/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/parent b/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/parent
new file mode 100644
index 000000000000..10981d8e2de8
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened/arm64
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/selinux/eapi b/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/selinux/parent b/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/selinux/parent
new file mode 100644
index 000000000000..23c5fe07a248
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/llvm/eapi b/profiles/default/linux/arm64/23.0/split-usr/musl/llvm/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/llvm/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/llvm/package.use.mask b/profiles/default/linux/arm64/23.0/split-usr/musl/llvm/package.use.mask
new file mode 100644
index 000000000000..3435fc7a7d5c
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/llvm/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-10-15)
+# Undo the general musl mask
+www-client/firefox -clang
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/llvm/parent b/profiles/default/linux/arm64/23.0/split-usr/musl/llvm/parent
new file mode 100644
index 000000000000..63a4f9547e6f
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/llvm/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/llvm
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/make.defaults b/profiles/default/linux/arm64/23.0/split-usr/musl/make.defaults
new file mode 100644
index 000000000000..70146a12835c
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/make.defaults
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="arm64"
+ACCEPT_KEYWORDS="${ARCH}"
+
+CHOST="aarch64-gentoo-linux-musl"
+CFLAGS="-O2"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# Anthony G. Basile <blueness@gentoo.org> (2015-10-25)
+# Multilib-related setup, bug #515130
+ABI="arm64"
+DEFAULT_ABI="arm64"
+MULTILIB_ABIS="arm64"
+CHOST_arm64="${CHOST}"
+LIBDIR_arm64="lib"
+
+# Michał Górny <mgorny@gentoo.org> (2017-03-14)
+# Unhide the ARM-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/package.mask b/profiles/default/linux/arm64/23.0/split-usr/musl/package.mask
new file mode 100644
index 000000000000..10e1ef15562d
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/package.mask
@@ -0,0 +1,6 @@
+# Copyright 2020 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License v2
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-04-27)
+# rust-bin is awailable on arm64 musl
+-dev-lang/rust-bin
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/package.use.force b/profiles/default/linux/arm64/23.0/split-usr/musl/package.use.force
new file mode 100644
index 000000000000..21cef28896ca
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/package.use.force
@@ -0,0 +1,7 @@
+# Copyright 2022 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License v2
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-01-21)
+# Bootstrapping is possible using our build snapshot, so don't force
+# system bootstrap
+dev-java/openjdk:17 -system-bootstrap
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/parent b/profiles/default/linux/arm64/23.0/split-usr/musl/parent
new file mode 100644
index 000000000000..5bbe8700f1a6
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/musl
diff --git a/profiles/default/linux/arm64/23.0/split-usr/musl/use.mask b/profiles/default/linux/arm64/23.0/split-usr/musl/use.mask
new file mode 100644
index 000000000000..a6ffd344214b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/musl/use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mask multilib, since we cannot use it.
+multilib
diff --git a/profiles/default/linux/arm64/23.0/split-usr/parent b/profiles/default/linux/arm64/23.0/split-usr/parent
new file mode 100644
index 000000000000..598ca888c8c2
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/split-usr
diff --git a/profiles/default/linux/arm64/23.0/split-usr/prefix/eapi b/profiles/default/linux/arm64/23.0/split-usr/prefix/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/prefix/kernel-3.2+/eapi b/profiles/default/linux/arm64/23.0/split-usr/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/split-usr/prefix/kernel-3.2+/parent b/profiles/default/linux/arm64/23.0/split-usr/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..b3da232ba558
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/arm64/23.0/split-usr/prefix/parent b/profiles/default/linux/arm64/23.0/split-usr/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/split-usr/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/arm64/23.0/systemd/eapi b/profiles/default/linux/arm64/23.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/23.0/systemd/parent b/profiles/default/linux/arm64/23.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/arm64/23.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/default/linux/hppa/23.0/desktop/eapi b/profiles/default/linux/hppa/23.0/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/hppa/23.0/desktop/parent b/profiles/default/linux/hppa/23.0/desktop/parent
new file mode 100644
index 000000000000..ad6c5e126fbb
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/profiles/default/linux/hppa/23.0/desktop/systemd/eapi b/profiles/default/linux/hppa/23.0/desktop/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/desktop/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/hppa/23.0/desktop/systemd/parent b/profiles/default/linux/hppa/23.0/desktop/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/desktop/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/hppa/23.0/eapi b/profiles/default/linux/hppa/23.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/hppa/23.0/parent b/profiles/default/linux/hppa/23.0/parent
new file mode 100644
index 000000000000..50be433109ef
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../releases/23.0
diff --git a/profiles/default/linux/hppa/23.0/split-usr/desktop/eapi b/profiles/default/linux/hppa/23.0/split-usr/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/split-usr/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/hppa/23.0/split-usr/desktop/parent b/profiles/default/linux/hppa/23.0/split-usr/desktop/parent
new file mode 100644
index 000000000000..db8ce088c69a
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/split-usr/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/profiles/default/linux/hppa/23.0/split-usr/eapi b/profiles/default/linux/hppa/23.0/split-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/hppa/23.0/split-usr/parent b/profiles/default/linux/hppa/23.0/split-usr/parent
new file mode 100644
index 000000000000..598ca888c8c2
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/split-usr
diff --git a/profiles/default/linux/hppa/23.0/systemd/eapi b/profiles/default/linux/hppa/23.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/hppa/23.0/systemd/parent b/profiles/default/linux/hppa/23.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/hppa/23.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/default/linux/ia64/23.0/desktop/eapi b/profiles/default/linux/ia64/23.0/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/23.0/desktop/gnome/eapi b/profiles/default/linux/ia64/23.0/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/23.0/desktop/gnome/parent b/profiles/default/linux/ia64/23.0/desktop/gnome/parent
new file mode 100644
index 000000000000..6589a0e01478
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/eapi b/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/parent b/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..f5c1ae438de4
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/ia64/23.0/desktop/parent b/profiles/default/linux/ia64/23.0/desktop/parent
new file mode 100644
index 000000000000..ad6c5e126fbb
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/profiles/default/linux/ia64/23.0/eapi b/profiles/default/linux/ia64/23.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/23.0/parent b/profiles/default/linux/ia64/23.0/parent
new file mode 100644
index 000000000000..50be433109ef
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../releases/23.0
diff --git a/profiles/default/linux/ia64/23.0/split-usr/desktop/eapi b/profiles/default/linux/ia64/23.0/split-usr/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/split-usr/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/eapi b/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/parent b/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/parent
new file mode 100644
index 000000000000..9e06c4505a75
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/split-usr/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/ia64/23.0/split-usr/desktop/parent b/profiles/default/linux/ia64/23.0/split-usr/desktop/parent
new file mode 100644
index 000000000000..db8ce088c69a
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/split-usr/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/profiles/default/linux/ia64/23.0/split-usr/eapi b/profiles/default/linux/ia64/23.0/split-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/23.0/split-usr/parent b/profiles/default/linux/ia64/23.0/split-usr/parent
new file mode 100644
index 000000000000..598ca888c8c2
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/split-usr
diff --git a/profiles/default/linux/ia64/23.0/systemd/eapi b/profiles/default/linux/ia64/23.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/23.0/systemd/parent b/profiles/default/linux/ia64/23.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/ia64/23.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/default/linux/loong/23.0/la64v100/eapi b/profiles/default/linux/loong/23.0/la64v100/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/eapi b/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/parent b/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/parent
new file mode 100644
index 000000000000..fae96e8d36b2
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/systemd/eapi b/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/systemd/parent b/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/lp64d/desktop/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/loong/23.0/la64v100/lp64d/eapi b/profiles/default/linux/loong/23.0/la64v100/lp64d/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/lp64d/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/loong/23.0/la64v100/lp64d/parent b/profiles/default/linux/loong/23.0/la64v100/lp64d/parent
new file mode 100644
index 000000000000..b4e81a288683
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/lp64d/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/loong/la64v100/lp64d
diff --git a/profiles/default/linux/loong/23.0/la64v100/lp64d/systemd/eapi b/profiles/default/linux/loong/23.0/la64v100/lp64d/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/lp64d/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/loong/23.0/la64v100/lp64d/systemd/parent b/profiles/default/linux/loong/23.0/la64v100/lp64d/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/lp64d/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/loong/23.0/la64v100/parent b/profiles/default/linux/loong/23.0/la64v100/parent
new file mode 100644
index 000000000000..2995716f47b8
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../releases/23.0
diff --git a/profiles/default/linux/loong/23.0/la64v100/split-usr/eapi b/profiles/default/linux/loong/23.0/la64v100/split-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop/eapi b/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop/parent b/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop/parent
new file mode 100644
index 000000000000..b2a33c35daf9
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop
diff --git a/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/eapi b/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/parent b/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/parent
new file mode 100644
index 000000000000..0ad98da41372
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/split-usr/lp64d/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/loong/la64v100/lp64d
diff --git a/profiles/default/linux/loong/23.0/la64v100/split-usr/parent b/profiles/default/linux/loong/23.0/la64v100/split-usr/parent
new file mode 100644
index 000000000000..252810268290
--- /dev/null
+++ b/profiles/default/linux/loong/23.0/la64v100/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/split-usr
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 7fd4bce995e7..f50c9a917955 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/libpoly/Manifest b/sci-mathematics/libpoly/Manifest
index 9ad5a5691b87..76d1fdeec31b 100644
--- a/sci-mathematics/libpoly/Manifest
+++ b/sci-mathematics/libpoly/Manifest
@@ -1,3 +1,3 @@
 DIST libpoly-0.1.11.tar.gz 614216 BLAKE2B 42a2510a6a9f94e7170b5df97ec8f2b7b29cb9c95bd13c8c7abebc9e7db7fedcbeb7a928f22d173e154180acc199e081323d2f1cb23264bf31ac1bfc88494dc8 SHA512 df08a6bab33e27023316972e2496801cea4959faf403b5df8314fa45b4541cd1352583a44084bea130c1e3ca4ed86de032f7f96eeb915599f178e80976a68f7a
-EBUILD libpoly-0.1.11.ebuild 1240 BLAKE2B eb73ef53ad5ba372b2d03d6bfb8e8b98821444ada7f479d743f69c2d65bf0b039dc7615bea6a65a53a74421d590020954b1b3cf52113eb8cb9487c1660ff30ed SHA512 5a3dd9137eba45c30f803216d9fe3c5b7ef760ba1d9a00ac3326e0fa19a1fe1191213516c4244f33fd5cb4ac20d831a26a9acf6182b3edbcf3b2e3fefc09ae75
+EBUILD libpoly-0.1.11.ebuild 1421 BLAKE2B 56fa4866c26affeb27a3b4f913377b41358d4bfa4f75fca8069423da9497a3c4f70fb53fe4f79fb82ec19420b6fc006bab5932dac5b9e419a54f5b11124829d0 SHA512 309118568aca55b3f2b55c1c7342333e3b589a429f00150e973739bf704d6ac8d21352a01618300b0eb7d27a5c54152d43ed35b27551f53e2971c74aaf36bb8a
 MISC metadata.xml 757 BLAKE2B baf8c7cb139dff0a4fd382eee7583f5f921209ffcddcac77a85086bb5214bc24bc875343f4f4f363e3e72e8077361e2864419c05c28338df4e9dd80b5dc4ce97 SHA512 0d9b28c2900d806f2b4df86eb69e9a3c1491a564559d80fdf78fa77673634a1735a391beb89599caea26f3af1a22880cb91e0611297e9fa811e85495eb12ff02
diff --git a/sci-mathematics/libpoly/libpoly-0.1.11.ebuild b/sci-mathematics/libpoly/libpoly-0.1.11.ebuild
index e3b8fb247367..09b57d07fe96 100644
--- a/sci-mathematics/libpoly/libpoly-0.1.11.ebuild
+++ b/sci-mathematics/libpoly/libpoly-0.1.11.ebuild
@@ -34,6 +34,14 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	sed -i "s| -Werror||g"                          \
+		"${S}"/src/CMakeLists.txt                   \
+		"${S}"/test/polyxx/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DLIBPOLY_BUILD_PYTHON_API=$(usex python)
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 54320c75531f..dce68103a068 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index e4b510828115..add44998f2be 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,4 +1,3 @@
-DIST linux-firmware-20211216.tar.xz 198929516 BLAKE2B 01391e29d742b7e618563bdf011fd6541a20e51bc700c8f55550f2c50bf61b2c2cf105da7b655927be9fc0c7b38b7f03ebe968900b1716096074af037fb89eb2 SHA512 dfcecf4fa5471d590c6444853efb4923957c11e5cd16ba9c7612aa367af699184595e33a023c4821b6feb9d84dd5eb4c5cb1808fd3e524b859ecb84b95ba4fa6
 DIST linux-firmware-20220209.tar.xz 227688608 BLAKE2B 56ff71b7184f6b2fbbac4b14be37f62f8543114939de9f474fe22b4e472d1e1e0c3d3aa3089a2b8c31ff54679799a84cbc44a8378ca87666836ba07dc6d09c40 SHA512 518bf082b26c18e67ef0fb0e16fad757b6faf04742ce6c8423bc894c28ce6b06099f3f88bc36da7092e708460b1c8ec89543ae04d3cc817b2e813ffc6af0bf8e
 DIST linux-firmware-20220310.tar.xz 237571732 BLAKE2B 9246d4fcdca0a9514606eb7b4ea7e18ea072b8d4302f62fd7aea4d85014c9f7da3eadc650e7c678bfe867c6f5ae9278b68b9a27c6074472ec9574ac922df23a5 SHA512 bafd5795d27c871c199e37f1e39f316e3577186283880da3b86cbc690749313342f8297342bf3ddfc6b3da7903ab2d5d24465240dfff1b0be51aa47f90872758
 DIST linux-firmware-20220411.tar.xz 237957584 BLAKE2B 441699abac0a7554c96324e40676218401febe9ea2a11ff9ab9f9ea4945b4c590c10c9a353aa8c5c66325b408ab9ebcb57fa77b520066f1d9995cb5989bc5b75 SHA512 5470701872ed4670962d3ccb4fd046c1f00145d69e942d76b21ccce08077ca4db867bbb31b87668e6298e130f28fc522a6ff4d66927fbfcee44042e1d908f71d
@@ -10,7 +9,6 @@ DIST linux-firmware-20220913.tar.xz 257803764 BLAKE2B 05248f897f653df73adcaefab7
 DIST linux-firmware-20221012.tar.xz 258375804 BLAKE2B c6aba807fec1da7101af8301690b6cd7bc8192c72ddb8e05e1339f1d689d05ade143aec73052d8288ebfbf43be24360b0f826818f56d5efee9bd019367ae8ce8 SHA512 016d13c5df7b9877351634082f6e22530ebdcd8655e078cd3eeac3e5cd099f59eaf246f9bd2d0b7312ec9f62b236b9cf0ededeb998f4c6880d938502bcd80b13
 DIST linux-firmware-20221109.tar.xz 296376440 BLAKE2B af06fdee5b3a7ded60ee233e82b451f12508d2060581b50067c577fed100d30822459590fe1168b174c146bc1985cb058e8a3d3cfbbb9f24995e6108955ef33c SHA512 99a3d488bd5c4b8c1f2ea3f2eb40658d0de390baaf7584d487fefe1bef4c5e0b981ba7e2e8abf76795a5af3e00008e29f00931be66f3d14d10fe92c7a02a6161
 DIST linux-firmware-20221214.tar.xz 297402416 BLAKE2B 6fec70e2aeb2a53fa72e883d8f0bd7168b35024aeb36c989dfa03f904cccffed4aa9927bbdfdaf4074e78117600a8f3b31d90a4f2325de0fc3d01d3c2592c0ac SHA512 99a2e3abef90b0165b753ef2710253e4e97547eb7af5cdd1ad3fbd1a56ecb50ff2dcb9a9c45569fbef92e2bb10d2dc1970376167f99e934adcfc230c8ca2b098
-EBUILD linux-firmware-20211216.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a89d99eb43b15de168be364d57c236725f3822488165bbb51405770f6f5f95122f9bd4e778328e050424d138888d12d5f50a SHA512 14bc8259f12fd506375fa5d1f2faf40be90430bcf23f30982c183535a07a899e86ff7a14381d643974babf36c7f8f224435edee9698cb31960b1af9ae2dedf51
 EBUILD linux-firmware-20220209.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a89d99eb43b15de168be364d57c236725f3822488165bbb51405770f6f5f95122f9bd4e778328e050424d138888d12d5f50a SHA512 14bc8259f12fd506375fa5d1f2faf40be90430bcf23f30982c183535a07a899e86ff7a14381d643974babf36c7f8f224435edee9698cb31960b1af9ae2dedf51
 EBUILD linux-firmware-20220310.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a89d99eb43b15de168be364d57c236725f3822488165bbb51405770f6f5f95122f9bd4e778328e050424d138888d12d5f50a SHA512 14bc8259f12fd506375fa5d1f2faf40be90430bcf23f30982c183535a07a899e86ff7a14381d643974babf36c7f8f224435edee9698cb31960b1af9ae2dedf51
 EBUILD linux-firmware-20220411.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a89d99eb43b15de168be364d57c236725f3822488165bbb51405770f6f5f95122f9bd4e778328e050424d138888d12d5f50a SHA512 14bc8259f12fd506375fa5d1f2faf40be90430bcf23f30982c183535a07a899e86ff7a14381d643974babf36c7f8f224435edee9698cb31960b1af9ae2dedf51
diff --git a/sys-kernel/linux-firmware/linux-firmware-20211216.ebuild b/sys-kernel/linux-firmware/linux-firmware-20211216.ebuild
deleted file mode 100644
index 38cb90b53b9b..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20211216.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-# In case this is a real snapshot, fill in commit below.
-# For normal, tagged releases, leave blank
-MY_COMMIT=""
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	if [[ -n "${MY_COMMIT}" ]]; then
-		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${MY_COMMIT}"
-	else
-		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
-	fi
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? (
-		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-REQUIRED_USE="initramfs? ( redistributable )"
-
-RESTRICT="binchecks strip test
-	unknown-license? ( bindist )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!sys-block/qla-fc-firmware
-			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl6005-ucode
-			!sys-firmware/iwl6030-ucode
-			!sys-firmware/iwl3160-ucode
-			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/raspberrypi-wifi-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)"
-
-QA_PREBUILT="*"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
-			mv ${PN}-*/ ${P} || die
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	find . -type f -not -perm 0644 -print0 \
-		| xargs --null --no-run-if-empty chmod 0644 \
-		|| die
-
-	chmod +x copy-firmware.sh || die
-
-	if use initramfs; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			local UCODETMP="${T}/ucode_tmp"
-			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-			mkdir -p "${UCODEDIR}" || die
-			echo 1 > "${UCODETMP}/early_cpio"
-
-			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
-			if [[ ! -s "${amd_ucode_file}" ]]; then
-				die "Sanity check failed: '${amd_ucode_file}' is empty!"
-			fi
-
-			pushd "${UCODETMP}" &>/dev/null || die
-			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
-			popd &>/dev/null || die
-			if [[ ! -s "${S}/amd-uc.img" ]]; then
-				die "Failed to create '${S}/amd-uc.img'!"
-			fi
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	# whitelist of misc files
-	local misc_files=(
-		copy-firmware.sh
-		WHENCE
-		README
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		atmsar11.fw
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		tr_smctr.bin
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		intelliport2.bin
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		3com/3C359.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	if use !unknown-license; then
-		einfo "Removing files with unknown license ..."
-		rm -v "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		einfo "Removing non-redistributable files ..."
-		local OLDIFS="${IFS}"
-		local IFS=$'\n'
-		set -o pipefail
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' --no-run-if-empty rm -v
-
-		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
-
-		IFS="${OLDIFS}"
-	fi
-
-	restore_config ${PN}.conf
-}
-
-src_install() {
-	./copy-firmware.sh -v "${ED}/lib/firmware" || die
-
-	pushd "${ED}/lib/firmware" &>/dev/null || die
-
-	# especially use !redistributable will cause some broken symlinks
-	einfo "Removing broken symlinks ..."
-	find * -xtype l -print -delete || die
-
-	if use savedconfig; then
-		if [[ -s "${S}/${PN}.conf" ]]; then
-			local files_to_keep="${T}/files_to_keep.lst"
-			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
-			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
-
-			einfo "Applying USE=savedconfig; Removing all files not listed in config ..."
-			find ! -type d -printf "%P\n" \
-				| grep -Fvx -f "${files_to_keep}" \
-				| xargs -d '\n' --no-run-if-empty rm -v
-
-			if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
-				die "Find failed to print installed files"
-			elif [[ ${PIPESTATUS[1]} -eq 2 ]]; then
-				# grep returns exit status 1 if no lines were selected
-				# which is the case when we want to keep all files
-				die "Grep failed to select files to keep"
-			elif [[ ${PIPESTATUS[2]} -ne 0 ]]; then
-				die "Failed to remove files not listed in config"
-			fi
-		fi
-	fi
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-
-	# sanity check
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	# create config file
-	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
-	find * ! -type d >> "${S}"/${PN}.conf || die
-	save_config "${S}"/${PN}.conf
-
-	popd &>/dev/null || die
-
-	if use initramfs ; then
-		insinto /boot
-		doins "${S}"/amd-uc.img
-	fi
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 4e9fb5cb1548..332ab1d7beb5 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 504b8541d0d2..6236c5012531 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,8 +4,10 @@ AUX xorg-server-21.1.4-BadIDChoice.patch 1950 BLAKE2B eb3ef49d68c526b1484b580ac0
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f
 DIST xorg-server-21.1.5.tar.xz 4929120 BLAKE2B 40f31250101293fa048c3c32278caaf0350fcf0b153a295d7574a6698893fa3c2d14078714a3c6ee7755b66c1f0ccf80b8faacb27aa5d7c279bc09fa6285ffd5 SHA512 a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953
+DIST xorg-server-21.1.6.tar.xz 4977496 BLAKE2B 8bcfa0a29f7b84b3ba9357d8ae9b1c7a5dc108159cf059f9c76c2c15f00be0d34964a3240937d146ae5f58a2d94deb091facacab984f8f905848bef5679cf46a SHA512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239
 EBUILD xorg-server-21.1.4-r1.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba
 EBUILD xorg-server-21.1.4.ebuild 4513 BLAKE2B 7a36143b235eeaec435bb21b989d464723ba062fa1d7b223b8f944cd60661662d38cac82973c7f2b1911cb4ba3294357a74677561fe599b636bb6a9896687409 SHA512 7fb72a177b8ef0f61ccb0ca677f118c065846577b9da21317b5343e19ec797b5e7cddf60f47eff50b4b03ee4507bc51c9f92545bd1e52357fe862e9265ced7f0
 EBUILD xorg-server-21.1.5.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba
+EBUILD xorg-server-21.1.6.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba
 EBUILD xorg-server-9999.ebuild 4516 BLAKE2B 232c7211a805dfca04da95c0c17e71847a57bbb22351e8eecd5d5be51b88653ab7ab67874e66022cf70bfdf382e7e3284de54a2d843763468540453fc46e1592 SHA512 ffa779b6a8fc0127422542863eb4ca25876c352662215bd4ec1a29dccb354514bdf7e043a66b5c5d1aa634f386b75d3528b0c39ace7d4bc745a1593477d205ce
 MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90
diff --git a/x11-base/xorg-server/xorg-server-21.1.6.ebuild b/x11-base/xorg-server/xorg-server-21.1.6.ebuild
new file mode 100644
index 000000000000..85f83743b7ff
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-21.1.6.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+XORG_EAUTORECONF="no"
+inherit flag-o-matic xorg-3 meson
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	media-libs/libglvnd[X]
+	dev-libs/libbsd
+	dev-libs/openssl:0=
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	xorg? (
+		>=x11-libs/libxcvt-0.1.0
+	)
+	xnest? (
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libX11-1.1.5
+	)
+	xephyr? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+	!minimal? (
+		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
+		>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	)
+	udev? ( virtual/libudev:= )
+	unwind? ( sys-libs/libunwind:= )
+	selinux? (
+		sys-process/audit
+		sys-libs/libselinux:=
+	)
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)
+	elogind? (
+		sys-apps/dbus
+		sys-auth/elogind[pam]
+		sys-auth/pambase[elogind]
+	)
+	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
+"
+DEPEND="${CDEPEND}
+	>=x11-base/xorg-proto-2021.4.99.2
+	>=x11-libs/xtrans-1.3.5
+	media-fonts/font-util
+	test? ( >=x11-libs/libxcvt-0.1.0 )
+"
+RDEPEND="${CDEPEND}
+	!systemd? ( gui-libs/display-manager-init )
+	selinux? ( sec-policy/selinux-xserver )
+	xorg? ( >=x11-apps/xinit-1.3.3-r1 )
+"
+BDEPEND="
+	sys-devel/flex
+"
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)
+	elogind? ( udev )
+	?? ( elogind systemd )"
+
+UPSTREAMED_PATCHES=(
+	# https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953
+	"${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch
+)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+)
+
+src_configure() {
+	# bug #835653
+	use x86 && replace-flags -Os -O2
+
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	local emesonargs=(
+		--localstatedir "${EPREFIX}/var"
+		--sysconfdir "${EPREFIX}/etc/X11"
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+		$(meson_use !minimal dri1)
+		$(meson_use !minimal dri2)
+		$(meson_use !minimal dri3)
+		$(meson_use !minimal glamor)
+		$(meson_use !minimal glx)
+		$(meson_use udev)
+		$(meson_use udev udev_kms)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		$(meson_use selinux xselinux)
+		$(meson_use xephyr)
+		$(meson_use xnest)
+		$(meson_use xorg)
+		$(meson_use xvfb)
+		-Ddocs=false
+		-Ddrm=true
+		-Ddtrace=false
+		-Dipv6=true
+		-Dhal=false
+		-Dlinux_acpi=false
+		-Dlinux_apm=false
+		-Dsecure-rpc=false
+		-Dsha1=libcrypto
+		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
+	)
+
+	if [[ ${PV} == 9999 ]] ; then
+		# Gone in 21.1.x, but not in master.
+		emesonargs+=( -Dxwayland=false )
+	fi
+
+	if use systemd || use elogind; then
+		emesonargs+=(
+			-Dsystemd_logind=true
+			$(meson_use suid suid_wrapper)
+		)
+	else
+		emesonargs+=(
+			-Dsystemd_logind=false
+			-Dsuid_wrapper=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# The meson build system does not support install-setuid
+	if ! use systemd && ! use elogind; then
+		if use suid; then
+			chmod u+s "${ED}"/usr/bin/Xorg
+		fi
+	fi
+
+	if ! use xorg; then
+		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x || die
+	fi
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}