gentoo auto-resync : 25:10:2022 - 03:53:02

96 files changed, 1960 insertions, 102 deletions

diff --git a/Manifest b/Manifest
index 090806509a83..fad4f23feaed 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29614 BLAKE2B d5d6bf1c239c269c6ff6a0235ea659af48451781d240db9fb9210653bfd481e263868d8bc8ec78063c4070a9d52fc135db54af1dae297ebae952d8fa2b1a5486 SHA512 6f6ad19e40e539653bef5db44522631cd51bf2d8c7fbfe680d1c524a7fdc452390fc95678eab64350133c4ffaece3ff7cacf92674a076d74826c315633339614
-TIMESTAMP 2022-10-24T20:09:44Z
+MANIFEST Manifest.files.gz 29611 BLAKE2B bfffbde2f7bb92280ae9051914017c61ef904b6999969afc0c27ae868e3ae5457047e5fa080e756d9be0eb206d7622b290d570193dc74ee21802155e2a789332 SHA512 73255121fa23ad64d2c57a11786aa83ff3b6e4b31d3eefb79efbc1ee8daec266e5853aef5e12fbe11bf919832e7d596769e6d75f7f384b85c2e8b3971b5a0a36
+TIMESTAMP 2022-10-25T02:09:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNW8QhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNXRWtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDkehAAmE2GnaZHU0dlspflJot44GGXF9C7vu0esbBhqUDnswXfaUWRMUj2k50k
-wHcRrVE5gzV6AdLSB0G4cRPO9C5skNlmS032MrLS/5maV6y+qbQFjojMUHclY53h
-6WTrT8SnugRg31rT8ukiy2zSkn7rUtJi14UGN0CVf85PqLI6ilCxx76MrqqzpTYr
-QMtvFT8l6HJH9q6tpTmnPScvYZzsnD0RIs+SiY5o18ogi0Bd8nbd2B1foCMfsWes
-rFNplyrQC+yCt/dLNy3BLhHk3HhLE94xpNZXeHAX6dwU3FZojyUI74myaWbV4aa4
-hRGgVlrS2zykPXrd067PzmweUVk/uXSYf0HvFGMORY8MIQAP5oniITg9U5Vh1aUT
-i3+jWcUHYL4d+PKhXwKW7lG9qeDo7rEJQT+7yC6r1CXuCtCh0YutVaZb93vf5+2W
-m7OVPFt5bRhZQm6M8A99N9lnB7JoycF9KPQ/cR4IByi0mHOkbyHfRRrpEMUaW/zY
-97+Q577cHCWEhI6qzPK9PSdKu5h6MbOH+kMGb5c+LwnQNyV/9jZExbdo9PQ4oU7i
-eM47qTIi6ClNxuWbIagQzxLyVHn/QRPZFGcfvj3PqgVv4K/Q3nXN9xLwiE8sVz2j
-f7KrSwPsE697HIHlaSa2Bt+jx9aSbmaiDMjeQizJBX2ze6Y0Sv0=
-=5/ip
+klDo+RAAqs99oJ2SW+enqNl3xg8nzz9LoJIUzMf+WCVqkfUcDTSshxOlmprvYbgG
+UL+yJTufzNGnKh36rZ6RqSgHfkn1Lx2xzeQDKlRuo91Na4kGjIutNRmb3+Mwg/iE
+yTvnlN1P0RWEfJeioan8ra0AoxhQJOx7tIVDk/StdzycptG2vt/vqnvuYSzgMTuf
+p3/1i6gAvTVrxBkixVhbVkGvAu1CCYarQxql4IMQBy7j/O86wAxhlZTbU45opOtS
+bWsYht1dfM4DyEy8sJ/eaguSCY/x/gPJYPU0Fa42UZNlw/JKejyRIZHfKa0mEYGN
+zghPKW0n7QA4hTOAY1NzRkzmjZcf/UjPzdimX1SL6e80pXbSctr8QLntCL77WdmP
+fzLUPwqSFOOlkV8ntmSnFEGobgvOMSItY0qofoUAE6bwkBn0/Rl7zbiFniXvUeWg
+LEv8t39TU6E9zX8J/CFx8aHP8v6hrFzTadOoG2zJM41ze1RClGnrDWRiyWiGdLNA
+PkRA1wY9tGyiL/qKW14b265/r+KsvOKjNX0jHKWp1cqP89k9eMF77HyKx29mtkAn
+t21I6ro4raWeTf6kQeM1CBTeTACtnq8Fba865414dkaSHTCb8Qdl5ICz/k14BEE8
+20K3by3+Im/0xh061OrlnXJztfzGO2kO1R7/JXmtRVposRYVDTQ=
+=ZRFU
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 810ecffe3d04..8eec9dbd5be4 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f81fd544c99c..54c71b752710 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip3/Manifest b/app-arch/bzip3/Manifest
index 31c95d8ebc86..7e9e74094cb9 100644
--- a/app-arch/bzip3/Manifest
+++ b/app-arch/bzip3/Manifest
@@ -1,7 +1,7 @@
-DIST bzip3-1.1.4.tar.xz 260404 BLAKE2B ddd087b631c9d5945dea0f4da280dfd74fd303eaed10f7553f770ca18b3b65f00718c073d87e565602a9ed02f4604a0d2dda0ff42cbd38f593bb012f5362cc5c SHA512 86f26b290001d255ad1d2378b5e2d59f9c85e1625ba5d7dca86acd544bb80af95b3379c215a03e0f81f77b7972a852d37746c1028464f404d28a6f9b707383b8
 DIST bzip3-1.1.5.tar.xz 265340 BLAKE2B 0226a97d564f1c9d9d1089b43ae79a9e43d0b77628298ef953c45505ad8d62caaf17bf6fa357857f123cf072b8ccd3003bfe138f25284baa5a5a5cdd8a555f71 SHA512 589c2e8e675a61014c7c4e82d0f2067201e3fb97bf7cfa6b7aa23690dc739824226089ac710509cc085b22eeb671ed5e23c6493967a433d3b284cb638af71be8
 DIST bzip3-1.1.6.tar.xz 265708 BLAKE2B 9429dcb3e9deef8aafdf890215ba95669dbcb135d6d2896f18cc70b482bab321497d3a26f36be59700ad0da879578b7c906f20629c72642aa15fc3b1507a788a SHA512 19120d3a850495a5bcc43b124e4a8eddf41bac55119d0898bf1e7c5b744f4bcc84c41b9018615f577fe3bfdceab8dd2ab6f2722cb9fbf86bf1c0a2da9ca32916
-EBUILD bzip3-1.1.4.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
+DIST bzip3-1.1.7.tar.xz 266436 BLAKE2B 46ca29e0632fbf12fc61c4d9e7c55d2f571a4e882c17f4535e54b7448bb01bd120e0ee518f2c0aa4dc97dd878fe772d5a63562469a77984b2aec5e5c875ccbdc SHA512 3e92a7cb70850fead28df7209185c5c468308acc3d8a75af2906fe85fd81efedc856ad151876f64a01fc3b7f5f9a724838d32c9ef19fc7182e8b3b632901a6ba
 EBUILD bzip3-1.1.5.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
 EBUILD bzip3-1.1.6.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
+EBUILD bzip3-1.1.7.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
 MISC metadata.xml 879 BLAKE2B eacb925ae4939be72ae25f0f333d8c8e1c08b2fd7946e27dfadd214b8fd5f27eef3f141f9ca911cf89151245f2fa11c7a8c5459c63badbfaf71e62aaca6d67f4 SHA512 963eae34b110b883993959f97a84c5fbaae914e009d024379d8b83ad02b335f3d7404ecd9020e291a38e78cb358dd4d0ff1b4b8f3604a2cc719e9d82ebee1e50
diff --git a/app-arch/bzip3/bzip3-1.1.4.ebuild b/app-arch/bzip3/bzip3-1.1.7.ebuild
index 0d9329da48ca..0d9329da48ca 100644
--- a/app-arch/bzip3/bzip3-1.1.4.ebuild
+++ b/app-arch/bzip3/bzip3-1.1.7.ebuild
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 6d35845a6730..bb44e29222e0 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index e222665e951a..bebaabe3dd47 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -3,6 +3,6 @@ DIST borgbackup-1.2.1.tar.gz 4017050 BLAKE2B 2841f3c02b6af76aba61064513ebd903936
 DIST borgbackup-1.2.2.tar.gz 4042984 BLAKE2B c5c7bacd543e97af5bb1a42dd4a37900b9570328addd33e2ee83347ca631eaf172d8349b4a462bcc871da9f3c1b4e6efeb16da20893e8d58bb0655ed73ceea5b SHA512 9ba040dc659b123e09d1814ea158eb06bd802dbb4961e258910a586f88c5e92e8f32a72c1858f7a8d9d79c3e985b12cf0245436f46a474f627cfd70a59a7e29d
 EBUILD borgbackup-1.1.17-r1.ebuild 938 BLAKE2B 9e1165ef693d028e2936f22ba5bf0af42bbd7a83d1df32f667bd79269cea3d39ee90cbfe9b9718d8e650cb0ab33d6de5d909a78274897ca1ebefd918538db2eb SHA512 04fdb94a90a9a0bc36de20029c03d73625bae7f1ae099f96ce225e778cc60a00e60fea2ebe5cb40b35c2fb8af46fd0cade56a359e2a2d9eeef99e5581c560dd0
 EBUILD borgbackup-1.2.1-r2.ebuild 1124 BLAKE2B d49e5eff5669dff8eef72e21659a3a0926d683c65af581233bf53aedf57b3c5cba5972f97976ce806d993859439d916c01562f9229aef60b2e4d6a06daf873da SHA512 72f78973bcc85b372109b3c7fd45eb96d14cbccb083304e8f63b9a20c01557d8e3dee0f2dd5a526878ee399baee8e512e75628a971f2c52229fc220212d422d8
-EBUILD borgbackup-1.2.2.ebuild 1126 BLAKE2B 4762c677facc18c89d9830108dd12c993099dd510000e3fb9466a79ef2c443e47709fe4ea8c3b3c6f6db111fc682df641cdcf260843dd7a7a9052eeea2e836ad SHA512 112347bef1052ebc52b0b26359050d11ccdc6a82f2b674f54429552e08e3d6fb30e0c935835c28f662aa469bb8b82e5823b01ff4b1ba270492a3c1e77543325f
+EBUILD borgbackup-1.2.2-r1.ebuild 1404 BLAKE2B 61e87ed3daf94de28e4f4140552047155c7366aa4c361a81699581df273f22b0601632af92b7c5db15800146b78f266a8db1dacca7b2137f236c584c7ca46058 SHA512 96af4829bdf367cea9c26592a6d023edfaa454bc874c4c436065167e546526d096b06be8db5dac166100814d1c0aeda72f6ff49287d9c92a4da278a8c29c21a7
 EBUILD borgbackup-9999.ebuild 1126 BLAKE2B 4762c677facc18c89d9830108dd12c993099dd510000e3fb9466a79ef2c443e47709fe4ea8c3b3c6f6db111fc682df641cdcf260843dd7a7a9052eeea2e836ad SHA512 112347bef1052ebc52b0b26359050d11ccdc6a82f2b674f54429552e08e3d6fb30e0c935835c28f662aa469bb8b82e5823b01ff4b1ba270492a3c1e77543325f
 MISC metadata.xml 494 BLAKE2B 885fa002bca2ba16e31bc66dde9d21aea8eb5a3ab5522cab3e824a9cde1d87f8819eb028eb21a9382d23622fe0a699a481e7cb7cd50fba897e59490ba0734d39 SHA512 bddc0ca7934315439e4a23b43fbd42d538c1570b43b0401efa9641c2854e5633d727db4bda82a34fe88ad2c1b512df47b6654b50f85a0501f0ef8405d7f8a667
diff --git a/app-backup/borgbackup/borgbackup-1.2.2.ebuild b/app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild
index 9ac4b1a5217a..85d04fd5696f 100644
--- a/app-backup/borgbackup/borgbackup-1.2.2.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 bash-completion-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
@@ -44,4 +45,12 @@ DEPEND="
 src_install() {
 	distutils-r1_src_install
 	doman docs/man/*
+
+	dobashcomp scripts/shell_completions/bash/borg
+
+	insinto /usr/share/zsh/site-functions
+	doins scripts/shell_completions/zsh/_borg
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins scripts/shell_completions/fish/borg.fish
 }
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 17fab14fdb18..62bab7f785c0 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index be021527eb1f..1bd7dae6643f 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00
 DIST snapd-2.57.2.tar.xz 6827264 BLAKE2B f9b1ae934a9c5b777d2e36854e259ddde301067a91b04ecef064accfccecc74693a2a58700e60867f46f028728a271b87cb3d4cdb316ae35df11363990959c3a SHA512 671e7598074894daf76646f7eea09c4163c57e68d0d46ebb77b20f71b898109fd73c78d363cb1253386ce058c1796eb25fab7f2f0345360426d3b9cc11d38804
 DIST snapd-2.57.4.tar.xz 6884432 BLAKE2B 47dcb8857070ab9f5cd02f6b64d6ef263ab1cf958c0eee6654064f7beec10c5b9995dcad9c66ba8237c6e4991e6c82b2fa758e204cdc3fb1134a5d8bb45e855b SHA512 00763d64a17c94ae7a8f4b09f61489f5dc32d923e2a22f223e0fa817693cf69e5d36cb7f9ea7b04d4ea325abdbaf3c1aeb87884318bf16de803bce1fef9666de
+DIST snapd-2.57.5.tar.xz 6900544 BLAKE2B e6579f8ece458ff02eabd92eb3e813cae3fd11eb3ef0a6c5949487ee5505297d3e24f69025969f0d491fb0e2d86657580a1b29e583015686ddee6afdda2724ec SHA512 955a0d61e8d6a2c585d356e67ec27551ee04894d6c4463aed33dcef4c751414ad30b7143733736dbf5d17897731fc3769ba755ab524b4f144e0a469fe3284460
 EBUILD snapd-2.57.2-r1.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
 EBUILD snapd-2.57.4.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
+EBUILD snapd-2.57.5.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
 MISC metadata.xml 457 BLAKE2B 204b67bf36a85bd18f4111b4d8590195908bf15ae0bafedb76b6124b7d19c6570627925e5dfc46dd4dd47732c6d8f1066451831a0cc475518aab8a29403ececc SHA512 07671272b60f1a6793e3f36b096e99153263830314359eb86000aec65266c61ebe9c448af4ec166d6163e3ca2325f36cc74fe5aace95e7ffa7b0293516b18120
diff --git a/app-containers/snapd/snapd-2.57.5.ebuild b/app-containers/snapd/snapd-2.57.5.ebuild
new file mode 100644
index 000000000000..35255adff108
--- /dev/null
+++ b/app-containers/snapd/snapd-2.57.5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~NAMESPACES
+		~SQUASHFS
+		~SQUASHFS_ZLIB
+		~SQUASHFS_LZO
+		~SQUASHFS_XZ
+		~BLK_DEV_LOOP
+		~SECCOMP
+		~SECCOMP_FILTER"
+
+RDEPEND="
+	sys-libs/libseccomp:=
+	apparmor? (
+		sec-policy/apparmor-profiles
+		sys-apps/apparmor:=
+	)
+	dev-libs/glib
+	virtual/libudev
+	systemd? ( sys-apps/systemd )
+	sys-libs/libcap:=
+	sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-lang/go-1.9
+	dev-python/docutils
+	sys-devel/gettext
+	sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+	if use apparmor; then
+		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+	fi
+	linux-info_pkg_setup
+
+	# Seems to have issues building with -O3, switch to -O2
+	replace-flags -O3 -O2
+}
+
+src_prepare() {
+	default
+	# Update apparmor profile to allow libtinfow.so*
+	sed -i 's/libtinfo/libtinfo{,w}/' \
+		"cmd/snap-confine/snap-confine.apparmor.in" || die
+
+	if ! use forced-devmode; then
+		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+			-i "sandbox/forcedevmode.go" || die
+		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+	fi
+
+	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
+
+	./mkversion.sh "${PV}"
+	pushd "cmd" >/dev/null || die
+	eautoreconf
+}
+
+src_configure() {
+	SNAPD_MAKEARGS=(
+		"BINDIR=${EPREFIX}/usr/bin"
+		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+		"LIBEXECDIR=${EPREFIX}/usr/lib"
+		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+	)
+	export CGO_ENABLED="1"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+
+	pushd "${S}/cmd" >/dev/null || die
+	econf --libdir="${EPREFIX}/usr/lib" \
+		--libexecdir="${EPREFIX}/usr/lib/snapd" \
+		$(use_enable apparmor) \
+		--enable-nvidia-biarch \
+		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	export GOBIN="${S}/bin"
+
+	local file
+	for file in "${S}/po/"*.po; do
+		msgfmt "${file}" -o "${file%.po}.mo" || die
+	done
+
+	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
+
+	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+	local cmd
+	for cmd in snap snapd snapd-apparmor snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+	for cmd in snapctl snap-exec snap-update-ns; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+}
+
+src_install() {
+	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+	if use apparmor; then
+		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+		keepdir /var/lib/snapd/apparmor/profiles
+	fi
+	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+	fperms 700 /var/lib/snapd/{cache,cookie}
+
+	dobin "${GOBIN}/"{snap,snapctl}
+	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+	exeinto /usr/lib/snapd
+	doexe "${GOBIN}/"{snapd,snapd-apparmor,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+	dobashcomp "${S}/data/completion/bash/snap"
+
+	insinto /usr/share/zsh/site-functions
+	doins "${S}/data/completion/zsh/_snap"
+
+	insinto "/usr/share/polkit-1/actions"
+	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
+
+	dodoc "${S}/packaging/ubuntu-16.04/changelog"
+	domo "${S}/po/"*.mo
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_desktop_database_update
+
+	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 6fe56a1b1df1..ab9593551cd9 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index a7ea541655bf..eb5d1d523391 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,5 +1,8 @@
 AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
 AUX 1.8.1-respect-ar.patch 634 BLAKE2B a75d716b2f16f9c64e0a99fb91eda15a1009cd29576fbaf70d02b6565a6374647e924a964b607832ef122f003871578eff7dfac8b30deaaf292527cf24506b58 SHA512 4bfa8347a5e6965971320fd7fbbb1b8b8a57ac4aa186bf0ee1264190fefc34fee00bf40cec094763ee1d3adfc2c9d121de7832ce735734f442836941d2bd070c
+AUX 1.9.2-Makefile.patch 4250 BLAKE2B f71ed4b638a21d90249ec7e045ff15fa49f315c8accce4bc42154d7fc9d5c3d45c059e2fc4c9980531726f5392bb2746d1fad184a1a791f002e461c6e2c0fc02 SHA512 cd579b1ce5467ecbe0e9b53d2439d32e14669e846bad5fe0116524e1f7d3d9bff34538f3dc7b35fb21d147c870e739f0d9b783aa5f75c1d8e34b6b764ec200dc
+AUX 1.9.2-clang16.patch 2098 BLAKE2B 1d6c58a5908a498d47244e24eb2518d992a8f1de09da32baad510d7db010a548006b00b8a3c21a7517fc433f5a1a75abbc9ee4831759421a93beff3bfbc25c97 SHA512 c74625f804a5cb892047b2fcb0fdf759224680eafb6e6392a9098d19af786b0b7392eeb6cceee0c57684403cd97c350f8880655eb487dbb8f57841086efb5d01
 DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
+EBUILD efitools-1.9.2-r1.ebuild 1121 BLAKE2B 793763cdefe49a5d122b484bee0171069f3108159a00168a4346a1ace69c3bca9fd3278f2ae1a2e7bc476803cb1884e7cb247e4032af2d24f162a4ab713a0f14 SHA512 5d094bc9f5ca6856bc725a436b1be174469f9dcfeaf88dd8ca75fb459245052398be5953614a7dfe543a04e104ad9325eefb374bc7dc007d0d7df45ff2f2ab97
 EBUILD efitools-1.9.2.ebuild 1371 BLAKE2B 3b6365e47baea942517f9a607ada4b332ad1a305bda1a6e160e2a9a86b04b1f622f060ec34a0f296138c9b312bc984155c6103eb9f953389d0021c0ed742a78e SHA512 b5509e5b8bc324d493d47d62685be8079ed940da0ed27ced73644351a57d4ec17df0b6247dffea03dd675a9c1202f89104c8625f0de8a126fcadae5972faaf23
 MISC metadata.xml 218 BLAKE2B e650ab1b6c50b385efc18a924f5382ef66cd5669e4c138270215328e5b595a45b519dc48925a76e824ba834e159865adbb131c0b7e166c2ffaf91d3c63b76163 SHA512 79219cfff4bf8680335548005e5f1f64270e1dcbabb2700b033e355fa65f0a5aefb0eaec20fbe231fc4525a7511693b84c0d957452fc9aa39e4ab31a1e1e56eb
diff --git a/app-crypt/efitools/efitools-1.9.2-r1.ebuild b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..ae06bba83d82
--- /dev/null
+++ b/app-crypt/efitools/efitools-1.9.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="static"
+
+LIB_DEPEND="dev-libs/openssl:=[static-libs(+)]"
+
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	sys-boot/gnu-efi"
+BDEPEND="
+	app-crypt/sbsigntools
+	dev-perl/File-Slurp
+	sys-apps/help2man
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/1.9.2-clang16.patch
+	"${FILESDIR}"/1.9.2-Makefile.patch
+)
+
+src_prepare() {
+	default
+
+	# Let it build with clang
+	if tc-is-clang; then
+		sed -i -e 's/-fno-toplevel-reorder//g' Make.rules || die
+	fi
+
+	if use static; then
+		append-ldflags -static
+		export STATIC_FLAG=--static
+	fi
+}
+
+src_configure() {
+	tc-export AR CC LD NM OBJCOPY PKG_CONFIG
+}
diff --git a/app-crypt/efitools/files/1.9.2-Makefile.patch b/app-crypt/efitools/files/1.9.2-Makefile.patch
new file mode 100644
index 000000000000..e8e99b1858a5
--- /dev/null
+++ b/app-crypt/efitools/files/1.9.2-Makefile.patch
@@ -0,0 +1,121 @@
+--- a/Makefile
++++ b/Makefile
+@@ -21,6 +21,8 @@
+ KEYBLACKLISTAUTH = $(ALLKEYS:=-blacklist.auth)
+ KEYHASHBLACKLISTAUTH = $(ALLKEYS:=-hash-blacklist.auth)
+ 
++SSL_LIBS = $(shell $(PKG_CONFIG) $(STATIC_FLAG) --libs libcrypto)
++
+ export TOPDIR	:= $(shell pwd)/
+ 
+ include Make.rules
+@@ -88,31 +90,31 @@
+ ShimReplace.so: lib/lib-efi.a
+ 
+ cert-to-efi-sig-list: cert-to-efi-sig-list.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ sig-list-to-certs: sig-list-to-certs.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ sign-efi-sig-list: sign-efi-sig-list.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ hash-to-efi-sig-list: hash-to-efi-sig-list.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a
+ 
+ cert-to-efi-hash-list: cert-to-efi-hash-list.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ efi-keytool: efi-keytool.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a
+ 
+ efi-readvar: efi-readvar.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ efi-updatevar: efi-updatevar.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a -lcrypto
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a $(SSL_LIBS)
+ 
+ flash-var: flash-var.o lib/lib.a
+-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a
++	$(CC) $(LDFLAGS) $(ARCH3264) -o $@ $< lib/lib.a
+ 
+ clean:
+ 	rm -f PK.* KEK.* DB.* $(EFIFILES) $(EFISIGNED) $(BINARIES) *.o *.so
+--- a/Make.rules
++++ b/Make.rules
+@@ -15,8 +15,7 @@
+ endif
+ INCDIR	   = -I$(TOPDIR)include/ -I/usr/include/efi -I/usr/include/efi/$(ARCH) -I/usr/include/efi/protocol
+ CPPFLAGS   = -DCONFIG_$(ARCH)
+-CFLAGS	   = -O2 -g $(ARCH3264) -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector -ffreestanding -fno-stack-check
+-LDFLAGS	   = -nostdlib
++CFLAGS +=  $(ARCH3264) -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector -ffreestanding -fno-stack-check
+ CRTOBJ		= crt0-efi-$(ARCH).o
+ CRTPATHS	= /lib /lib64 /lib/efi /lib64/efi /usr/lib /usr/lib64 /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi
+ CRTPATH		= $(shell for f in $(CRTPATHS); do if [ -e $$f/$(CRTOBJ) ]; then echo $$f; break; fi; done)
+@@ -24,10 +23,9 @@
+ # there's a bug in the gnu tools ... the .reloc section has to be
+ # aligned otherwise the file alignment gets screwed up
+ LDSCRIPT	= elf_$(ARCH)_efi.lds
+-LDFLAGS		+= -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -L /usr/lib -L /usr/lib64 -T $(LDSCRIPT)
++LIBS		+= -nostdlib -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -T $(LDSCRIPT)
+ LOADLIBES	= -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
+ FORMAT		= --target=efi-app-$(ARCH)
+-OBJCOPY		= objcopy
+ MYGUID		= 11111111-2222-3333-4444-123456789abc
+ INSTALL		= install
+ BINDIR		= $(DESTDIR)/usr/bin
+@@ -47,12 +45,12 @@
+ endif
+ 
+ ifeq ($(ARCH),arm)
+-  LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a
++  LIBS += --defsym=EFI_SUBSYSTEM=0x0a
+   FORMAT = -O binary
+ endif
+ 
+ ifeq ($(ARCH),aarch64)
+-  LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a
++  LIBS += --defsym=EFI_SUBSYSTEM=0x0a
+   FORMAT = -O binary
+ endif
+ 
+@@ -61,9 +59,9 @@
+ 		   -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
+ 		   -j .reloc $(FORMAT) $*.so $@
+ %.so: %.o
+-	$(LD) $(LDFLAGS) $^ -o $@ $(LOADLIBES)
++	$(LD) $(LIBS) $^ -o $@ $(LOADLIBES)
+ 	# check we have no undefined symbols
+-	nm -D $@ | grep ' U ' && exit 1 || exit 0
++	$(NM) -D $@ | grep ' U ' && exit 1 || exit 0
+ 
+ %.h: %.auth
+ 	./xxdi.pl $< > $@
+@@ -71,7 +69,7 @@
+ %.hash: %.efi hash-to-efi-sig-list
+ 	./hash-to-efi-sig-list $< $@
+ 
+-%-blacklist.esl: %.crt cert-to-efi-hash-list
++%-blacklist.esl: %.crt cert-to-efi-sig-list
+ 	./cert-to-efi-sig-list $< $@
+ 
+ %-hash-blacklist.esl: %.crt cert-to-efi-hash-list
+@@ -129,7 +127,7 @@
+ #	sbsign --key KEK.key --cert KEK.crt --output $@ $<
+ 
+ %.a:
+-	ar rcv $@ $^
++	$(AR) rcv $@ $^
+ 
+ doc/%.1: doc/%.1.in %
+ 	$(HELP2MAN) --no-info -i $< -o $@ ./$*
diff --git a/app-crypt/efitools/files/1.9.2-clang16.patch b/app-crypt/efitools/files/1.9.2-clang16.patch
new file mode 100644
index 000000000000..944a731bcde8
--- /dev/null
+++ b/app-crypt/efitools/files/1.9.2-clang16.patch
@@ -0,0 +1,108 @@
+--- a/cert-to-efi-sig-list.c
++++ b/cert-to-efi-sig-list.c
+@@ -6,7 +6,6 @@
+ 
+ 
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
+--- a/efi-keytool.c
++++ b/efi-keytool.c
+@@ -15,7 +15,6 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ 
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ 
+ #include <kernel_efivars.h>
+--- a/efi-readvar.c
++++ b/efi-readvar.c
+@@ -17,7 +17,6 @@
+ 
+ #include <openssl/x509.h>
+ 
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ 
+ #include <kernel_efivars.h>
+--- a/efi-updatevar.c
++++ b/efi-updatevar.c
+@@ -20,7 +20,6 @@
+ #include <openssl/err.h>
+ #include <openssl/pem.h>
+ 
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ 
+ #include <kernel_efivars.h>
+--- a/flash-var.c
++++ b/flash-var.c
+@@ -1,3 +1,5 @@
++#define _XOPEN_SOURCE 700
++
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <sys/types.h>
+@@ -10,7 +12,6 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ 
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ 
+ #include <version.h>
+--- a/hash-to-efi-sig-list.c
++++ b/hash-to-efi-sig-list.c
+@@ -4,7 +4,6 @@
+  * see COPYING file
+  */
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
+--- a/include/variableformat.h
++++ b/include/variableformat.h
+@@ -109,7 +109,7 @@
+ 
+ #pragma pack()
+ 
+-inline BOOLEAN
++static inline BOOLEAN
+ IsValidVariableHeader (VARIABLE_HEADER   *vh) {
+ 	if (vh == NULL || vh->StartId != VARIABLE_DATA)
+ 		return FALSE;
+--- a/lib/kernel_efivars.c
++++ b/lib/kernel_efivars.c
+@@ -16,7 +16,6 @@
+ #include <unistd.h>
+ #include <time.h>
+ 
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ 
+ #include <kernel_efivars.h>
+--- a/sig-list-to-certs.c
++++ b/sig-list-to-certs.c
+@@ -4,7 +4,6 @@
+  * see COPYING file
+  */
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
+--- a/sign-efi-sig-list.c
++++ b/sign-efi-sig-list.c
+@@ -4,7 +4,7 @@
+  * see COPYING file
+  */
+ #include <stdint.h>
+-#define __STDC_VERSION__ 199901L
++#define _XOPEN_SOURCE 700
+ #include <efi.h>
+ #ifdef CONFIG_arm
+ /* FIXME:
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 55d411c4830d..99cf14e210df 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/systemd-mode/Manifest b/app-emacs/systemd-mode/Manifest
new file mode 100644
index 000000000000..88ce1b4bed7f
--- /dev/null
+++ b/app-emacs/systemd-mode/Manifest
@@ -0,0 +1,5 @@
+AUX 50systemd-mode-gentoo.el 76 BLAKE2B 1ccdda0e583af91bead6b672c59f163a80e96e624911ca843745c9b9709cbbe1f05e7ee6154136c8b1f3cd99ca94e5fafaf643ab2163d775d6e1d3393bcf4f91 SHA512 3e7e9d8c790dcb4fba7e0c125f1fc08d6e05c1822cb3c5ef686466cd2fdfb1a9cda7910400b0844743f57f1720bc25d50692e714dadac18fc98bf9ea583685e3
+AUX systemd-mode-1.6-directive-txt-files.patch 1136 BLAKE2B b6ee41752eb8e89efd4f7afaedab82c80e06997ab19e46c7e655f8f95c8eedd4138ed114981df6c4aa91f132f6565947c6758609aeea04103cd65bd8cbb4fb8a SHA512 a7e98036a72dae4074ddf4a6f633fc23f59da4166a914d3f04f4f5f25980bda068c19299f41d4ad63df6d9c7404d29a516faeffe1a58aa9cfe95aa4bcb22ea76
+DIST systemd-mode-1.6.tar.gz 21986 BLAKE2B 05278d86a6df9b5e95c75c1d1ebee182653f760e12639d4a260cf757fee3236988d5f8de671fe9a4724bc0338e08d6f10c405a1d42691f5d83c0efdc516da178 SHA512 2461e07287c1dbe5990eaae83484e98f4e8f2e89ece4b2f5f53f3c9174fc20a0cdf2e930c356bfb6a84587595d66ac353f4f85b5a96507c5344a615d4516f646
+EBUILD systemd-mode-1.6.ebuild 758 BLAKE2B 0fd88b05490996b40e8efefd61767ec470f92acd6b20f25bb14ee8810e4206003e3293ff93b508995e03053eabefb38d95ecb0af6a2e91129c2e1807281508c6 SHA512 415141ba36c36437e686220d381e4b61cded29aa845bd475474521c0d6302a4e961cd00af928e984c884a7b1852fbca92649085ab8c16cb57858a8b17473b194
+MISC metadata.xml 433 BLAKE2B b4f99c28f3470ec8e7c0dd9f074a94eddaf30e231ca31fbf23cbde0723bd5384c9fec863af1061a210134010053b74e996ae959a57c6cd16ce825216b2bc41fb SHA512 bd8c6d7fcd7edd34e2d18a7a4c3678ba44444a8789d62a52992b4996c907e65a7da2316fe13d98e2cf98e6271e6af89d5b586f71e3094aeebff46c54ef86f4d5
diff --git a/app-emacs/systemd-mode/files/50systemd-mode-gentoo.el b/app-emacs/systemd-mode/files/50systemd-mode-gentoo.el
new file mode 100644
index 000000000000..01b8ef7e6e34
--- /dev/null
+++ b/app-emacs/systemd-mode/files/50systemd-mode-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "systemd-mode-autoloads" nil t)
diff --git a/app-emacs/systemd-mode/files/systemd-mode-1.6-directive-txt-files.patch b/app-emacs/systemd-mode/files/systemd-mode-1.6-directive-txt-files.patch
new file mode 100644
index 000000000000..c85d78a10200
--- /dev/null
+++ b/app-emacs/systemd-mode/files/systemd-mode-1.6-directive-txt-files.patch
@@ -0,0 +1,29 @@
+--- a/systemd.el
++++ b/systemd.el
+@@ -89,7 +89,7 @@
+       (insert-file-contents
+        (let ((f "unit-directives.txt"))
+          (if (null load-file-name) f
+-           (expand-file-name f (file-name-directory load-file-name)))))
++           (expand-file-name f (file-name-directory "@SITEETC@")))))
+       (split-string (buffer-string))))
+   "Configuration directives for systemd.")
+ 
+@@ -105,7 +105,7 @@
+       (insert-file-contents
+        (let ((f "network-directives.txt"))
+          (if (null load-file-name) f
+-           (expand-file-name f (file-name-directory load-file-name)))))
++           (expand-file-name f (file-name-directory "@SITEETC@")))))
+       (split-string (buffer-string))))
+   "Network configuration directives for systemd.")
+ 
+@@ -119,7 +119,7 @@
+       (insert-file-contents
+        (let ((f "nspawn-directives.txt"))
+          (if (null load-file-name) f
+-           (expand-file-name f (file-name-directory load-file-name)))))
++           (expand-file-name f (file-name-directory "@SITEETC@")))))
+       (split-string (buffer-string))))
+   "Namespace container configuration directives for systemd.")
+ 
diff --git a/app-emacs/systemd-mode/metadata.xml b/app-emacs/systemd-mode/metadata.xml
new file mode 100644
index 000000000000..9c2714e05bce
--- /dev/null
+++ b/app-emacs/systemd-mode/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+  <upstream>
+    <bugs-to>https://github.com/holomorph/systemd-mode/issues/</bugs-to>
+    <remote-id type="github">holomorph/systemd-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/systemd-mode/systemd-mode-1.6.ebuild b/app-emacs/systemd-mode/systemd-mode-1.6.ebuild
new file mode 100644
index 000000000000..801fb5effd59
--- /dev/null
+++ b/app-emacs/systemd-mode/systemd-mode-1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing systemd units in GNU Emacs"
+HOMEPAGE="https://github.com/holomorph/systemd-mode/"
+SRC_URI="https://github.com/holomorph/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-directive-txt-files.patch )
+
+DOCS=( README )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i systemd.el || die
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITEETC}/${PN}"
+	doins "${S}"/*.txt
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 2d50a60d6bab..de1e5bbcadfb 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 9b1a6ed3aaf1..12510f09c331 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,4 +1,6 @@
 DIST iwdevtools-0.11.9.tar.gz 86756 BLAKE2B 8c9e25dd273af9a6e10e4a0a4dff1f82889176dbc730981c3ce84a2b1ef5d7138d45bf86430d77c670fed2e9c7f4345758a5fc572f0522c2087f2daaa1ff80c5 SHA512 c9583fed736e670cc9af820c8ba314b771ae3eafd36323d473cb76de0edf8e57c89a52e16e4c7b2985c78d4e43b8cb5b34aabb0bd1951a15e5aad56eef860fad
+DIST iwdevtools-0.12.0.tar.gz 88411 BLAKE2B 9220d59ee9ec7305925798d8beafec49ef35d8e39a428b62df3b3ed3832da1e42aff5e94ab8c5cfd85272d21cbb13c856408cf665523f8b1de85818ba08aebc4 SHA512 b69face29355df2443e75101b81c477dfdb1f54aad14f0d6275c399bd97cd654c4819f5621177d7ef75ecc4540e923ee5cd42f806240ed346ab469959f6a38d9
 EBUILD iwdevtools-0.11.9.ebuild 1907 BLAKE2B 5cce7273be85fbd5ff5b3aa468086c23612e40e54ff7acf456311e07aa4ab39e597424f23b94c6b56912c9b1252e72cd7c12e8d14f654f91eb636bb63909177a SHA512 698c0530e9dcdac227d14000ebf845f9c1919a0801aee12818ea5588e30276ad57fb8480a920976c91b020cbd80cefcb143ff8446454f18222dfeed46bd5b6f4
+EBUILD iwdevtools-0.12.0.ebuild 1915 BLAKE2B a98ac7ead6f494052f08e6dbd20f34866bfe2481d252c43cc94d31f75fb0b4bf24c6f6f1d73a2b5dcc4c76e2fb1e1b5d14b0b58af4162c1f27183b73ba8daa66 SHA512 6da66aa4d2ea4d6e040636a8b189f8d3fc83662a4a042472a8bbad9202fb8849595cae99a41a55a924c8a094e1bdc0392050d40f294b398a4139fd149c33c5e4
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.12.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.12.0.ebuild
new file mode 100644
index 000000000000..f618116f15e0
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.12.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	|| ( sys-apps/util-linux app-misc/getopt )"
+BDEPEND="
+	sys-apps/help2man
+	|| ( sys-apps/util-linux app-misc/getopt )
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
+		elog
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 05d5ba9f9717..cc2b4feb8376 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index 4d2509e421c1..9f8db361eb7a 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -2,7 +2,9 @@ DIST rqlite-7.7.2-deps.tar.xz 83998504 BLAKE2B df32a7b9a664f79241033d92dd4d0c71c
 DIST rqlite-7.7.2.tar.gz 473521 BLAKE2B fc3d48854ed6e0eca6897504b999a72e8b5503c263195078fea4f0719ca48757b4f2ca52c1d63dffab9d6f6788b1e36ea5bd53e32512862d7cd581bebeed6ba2 SHA512 6f5756005d72f1c97b71866b3f341ec5959f53178cf99c6bb3315bb45cf44e81c4d2807aebd3ccc858e2c6b9e3cc7d1e9a86c3f6c3dd6272ab3f7fb7550a632f
 DIST rqlite-7.8.0.tar.gz 476401 BLAKE2B b87c5996fbb62503add3afd0e3526b1545670ede6ade0bd589e33d97ed489f3f93a027c565102de1737fb9b13a6f6f9cc5be346fe4e9cbca35b045b8982d1c91 SHA512 555bfaf1f95d890d8d0e73e0c52b94f323c4198cd2d61ab6bfbb95b9e908475b75fb409944162ca19709273c069c2263fa6f1d86c8ca73b96eab803bde9d72c6
 DIST rqlite-7.9.0.tar.gz 478284 BLAKE2B bcb60f771397b067e1479a12603458e7823839a8ff174b30479a3a14dda72b7f3f3b717875a0aea8cd03f469f3da3d418ea3334211e3d39adf6b20d1947b68ec SHA512 c898b8b96def0a4d01bd1b98de952dece520d8b8ac7fcf12f4d81affab76095cb4a9898d1c7aeb9bc67462e5069e01012cda37073455f3382228194db6cda3e7
+DIST rqlite-7.9.2.tar.gz 478780 BLAKE2B 4b072e9dab1fcfdb64a38e1a59bef2a1d81cf7543d6964ad75d3d3bd50cd52686d8b6f60a5e2a192b3998b3990efbe6f758a4226b03b8520fbd0569ab5aeca07 SHA512 86b3b89396d60d73e58ced463ae4cf5caf2cc8ba39bab87153b0a5a14e97745b07545bade7fa28dfde095255b547327ff83cefdaa78a399e1976e28d54ec430a
 EBUILD rqlite-7.7.2.ebuild 884 BLAKE2B 10648283b728ca99dff0ec8f63f45eedf7c2f477255101871722b41b5fe79f5dbc76d6832be7400c6517c75b262dcc0a82d4f9b04f75252447e2f6ec5029bb8e SHA512 bfdd17f61c887630598b2f50671679886a9b7a9d8402c69179afeb3f98a2981f33caee25b8315a63e31b640bd93c6cd5cc5005e846d778f155ce791be2b1d7d2
 EBUILD rqlite-7.8.0.ebuild 892 BLAKE2B b0b196ea4262c22d3c9a5553dbf62af0605a543260fe24eccc3d02ce5514c92a1fe7543b4efdef333f42af95c0b95e59c7ef11d38f97c0e5b52090fb6d2d3417 SHA512 52efbfd0bcb6a76430f2fdb015ed9b7191279dd99bb0efdea6a9dcd98f4d9c3ce736179c5062be80123bdf6c8cbe170585b227d11d974333970fe3d6e0be9631
 EBUILD rqlite-7.9.0.ebuild 892 BLAKE2B d05f4b8389e7c216e31946c97eba48c3224b191c923c2bb67f913ddcb57bdb2631179aa63a9fdbab22d2e09b328d9876bd2ca8db1f3bad37ba4a0f61ddb2c5c0 SHA512 6395ccf089b9e4adb0621e1601c2681f217774144a3ab8e2cce036e195c8b61b972c79557d3dc47370624a1a009026aea938cca019ec59068e4200f403eafa7d
+EBUILD rqlite-7.9.2.ebuild 892 BLAKE2B b47d9ce7cee671cfe4d94e64aecc8f19cd25f18df14b3d2bd54b47c51a665ebddc31c785ddcfd197d44593ca0e774d787ca7c031748afd613ae16bee3caf5e10 SHA512 9183b4af31918d1ad4d7916669d6804b5417c1c88c787527e9df9dc4314976a464dd225e5de317bdb376fc26c2ae121c80537839d8e9c6819c9897d876ff8424
 MISC metadata.xml 305 BLAKE2B 43bc299dae9450677761bfaeaa02ac649ac4ecdbb35e3242c8525db13ef0471397a352b2a8aa751ec725ff8e9c86c2a8a19caf71bbe0de206f266d945f287561 SHA512 3dbddc6b5e4e6d8cd82beb722b5b45af6621e8fb84a1d3a1ec5c444026f595fd14babadc92084afe122202c9b940be21b2e1af145d24846de4225582e5e4d5de
diff --git a/dev-db/rqlite/rqlite-7.9.2.ebuild b/dev-db/rqlite/rqlite-7.9.2.ebuild
new file mode 100644
index 000000000000..01355d29e8c0
--- /dev/null
+++ b/dev-db/rqlite/rqlite-7.9.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+EGIT_COMMIT=187098927ba9083a19fff36ed01eab0f8b1b045c
+
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
+HOMEPAGE="https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/"
+SRC_URI="https://github.com/rqlite/rqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/rqlite-7.7.2-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD CC0-1.0 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	GOBIN="${S}/bin" \
+		go install \
+			-ldflags="-X main.version=v${PV}
+				-X main.branch=master
+				-X main.commit=${EGIT_COMMIT}
+				-X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
+			./cmd/... || die
+}
+
+src_test() {
+	GOBIN="${S}/bin" \
+		go test ./... || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r *.md DOC
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6de300d17273..9b1bf780c8bb 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 3048c243ac43..ccc6440bee2d 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -4,6 +4,8 @@ DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381
 DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8
 DIST Python-3.10.8.tar.xz 19619508 BLAKE2B 8bbfbae34fbc517c4a746e5e4c360efc57aca175c50fe46a378aa9d6d023a3d90c7df816149e4cca0c9b64ca0142267d8df552e8f8dc53a04b5251e8848dce74 SHA512 40e3e77d79618c81d6fc57c5d119b99c2959dcf932f40aad6b26f2ec39c5e713e6ff298f7597b4fad2ab94680db3732483b5ca0a45e6ae58c14580b3ea44cb0f
 DIST Python-3.10.8.tar.xz.asc 833 BLAKE2B 1e94822a57d055f5db1a5d2915df24be9d6fd9e6b301d148919a7643285a93ca1c8a16db7d74e0adabe7d2a21678b5126e3df7fffb253b35f8db6f74284a0aba SHA512 0c2ef09d898257ba5e9ec7c5bb224a7e50e5ebca96843b4d9e25be6cdd2f17144772aafc92280af20c21491e3c8cedc697414688ece613c93b28ff7ecddcf93f
+DIST Python-3.11.0.tar.xz 19819768 BLAKE2B 3a9852b8973e0e6ce414742f08f17f2c239d20a4e437e95656a325e151d04f4751f07fce955e55f2818af6810b767f2438b3d14e9f2313fe607bab31c47a2fca SHA512 314eef88ae0d68760f34d7a32f238fd2ecb27c50963baa7357c42ad8159026ec50229a0b31d83c39710a472904a06422afc082f9658a90a1dc83ccb74c08039d
+DIST Python-3.11.0.tar.xz.asc 833 BLAKE2B 7133f390ff8e7d856466c8d310903ef694196f5d945d6b753dcd7bf3e5416d69ef0e2320252ecce419ecce07ac5e2a37ad1657e2ded393d0c38a6521a65cebc2 SHA512 d20fb152c5b16cfef1f59af588f7576eb45c903d9e15fd4ad0e15fd32bef7ffd951b99a062d2944234ecffcf29eb9266544e92d2f6584710cbb20ba38f8ac224
 DIST Python-3.11.0rc2.tar.xz 19828340 BLAKE2B c4e8578d967917fc6f19355c466ba8e5487e83a17b373dd03ae90f2a73f5f6d07c38ec308c03435d23454cdcb06e63b74fc9ceb3900079996ae71b9327a4a5b3 SHA512 8b37bc9df3c966bd35cffdb7d6406a3c1a5ccfbea10bd8dad498880e3b1492f8cdbbe227ab3a30557843eb05d8fb93077c791e25d71b33ed420992d54b6c9473
 DIST Python-3.11.0rc2.tar.xz.asc 833 BLAKE2B 80ea3e8a3565fef6552da2287a5bf07a764002c273842b7d03a417a75adfe616e1b7816c161c42751a495b32ab8d8c11efc6c90ade97c0b31be54f7391ee9c9d SHA512 13e6bfa719db29aa169763399203168923cbfbb01d209e18269399ca84723582f480134edd3bf9f24785cd5ab0486411132d6bbb354fa45ebbba68bf4c70021a
 DIST Python-3.8.15.tar.xz 19038408 BLAKE2B 4ce84171b2f7ca8c9cf1d130adf70f16a0899766cea98965c3e7afcb84b73c482bcb400b59b91736d20e31c57be79edc178f6eeecd775a1f8920a8fbfdd90c24 SHA512 4fb3827b13c2452faa75e5ed18dddf381e80b4fffcfde046e289b4629cff0bb87fba1d09916b9b8a6f8039dc422c952293ebdb381c49f8ca7e7893ae4be6c28d
@@ -12,11 +14,13 @@ DIST Python-3.9.15.tar.xz 19712208 BLAKE2B a8490c998c89ed4e3e87ef48e3b5d622e5d06
 DIST Python-3.9.15.tar.xz.asc 833 BLAKE2B c325fb52fae254153456c24c1039b07c9ccf8734df3665640215d35219ccacb705f99d94c9f8b644d15d4ea4612f5ac0da599814f68f7d3b6fc1fdc175db9002 SHA512 722625091731536757b9db447590c31620665133d45076367a3281f2ee3add23a781b10ce5cea582d65caabb18814583c1a347689d2b396214e36a6771182f38
 DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004dcc55a0d18e9ce25a47683c2df3c4dd62e967dfbbb35be59a2f08cf20f30a19475a8a2344dd95b17400eafa88b5fdbe9270a12ccbf32 SHA512 d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f
 DIST python-gentoo-patches-3.10.8.tar.xz 10104 BLAKE2B a2e5fa956652fda1464c65ba4f648da2d77a545d53bf8d2429bce745c93e82eaea40bf6da3289f4216fe4b029b97ccf6ac0c3cfbdcc179f3c5f9e64e89cd5fe4 SHA512 e506c7fc3f6ebff340f090b462716c745f1acfa95c00a39a58367941efb356b8dcd72a3fa46d6760422733c0d6b65b79f0e8bedc77b93289c51ca4dc2ea0db2a
+DIST python-gentoo-patches-3.11.0.tar.xz 5404 BLAKE2B 7109040bd27e77b4a17e94d24060644ae9b42f618768beb4ae0659c65b33a943e6158ccf8724432ff0f97d7b3a86e2efb99795fbeed801723049a99d2dcc96c3 SHA512 94f3f7f3262f5c064fec4977230bbde09ca8f77e92739aa230f73ef9e1012049a2d9cefc7774a2538f732e0e7ba170214956578d64c19124bd964d4915982bb0
 DIST python-gentoo-patches-3.11.0rc2_p1.tar.xz 6292 BLAKE2B e52e0066ca3f53e2efd2d71c035849cd619d3a8cdeb9767cc28369f4b7f04ffd74419e7c02913d4b10958937dc8960fa4287862e8db627e5f421472a18efeb73 SHA512 a6ae37288e7621275b46ab1a813dfbbbf24ee511d644b4027e396f5cba56fccf94e19cb354468ea4c35cd86db2040b165c87c8e24cc2c9e598e91946a1f80863
 DIST python-gentoo-patches-3.8.15.tar.xz 25700 BLAKE2B 1f13964caed36f70f5d5d2637ce39ac06efd52b744c353463486844dfaa411d38c37e3e50921a97183315bf44aa36557bd071dbfd8b2a69e8f1a05de5f11bba8 SHA512 39326cd1cff1794ca607c769750525a77cb0a4e6435d0fab141cff82cb05d68a6269014f8a30d7143b57b51170b3efcf43bfa6b41a079f588880e5562a63d54f
 DIST python-gentoo-patches-3.9.15.tar.xz 20200 BLAKE2B 4367cdeb0d9c27110f52f5061717e37da6b9d8a167de24417fdf2b88b4cf6d512fba2c81df90a19f02e929baaf755e70ede305b5ebbb0be94bd5ab3dc3f1bdfa SHA512 9c3a20b49a29d83d2c55d7432f606ebdcaf6210c6bf6d891084d0b2161502002c6f6738cee6e05eceb8ffd6b6a40d4c6ea42f6e07634388644aaeb8f87dbdf8e
 EBUILD python-2.7.18_p15-r1.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
 EBUILD python-3.10.8.ebuild 12450 BLAKE2B da8c821133145186da6ce1f443543045b87894dccf57c274a077535fa2609c80a2b60721345c9931b6f419918e92e68d4e922e1df781011c10d45343dc3dfa24 SHA512 97532f4b5a60be9f01d67982ad6d23a85f0fec774897029c962cd96cdf4447d7b38bd1d712c4f0c99fce232fa312dd80b2cea313250d368da33fcd6e7b148094
+EBUILD python-3.11.0.ebuild 13558 BLAKE2B 94f75bc7b5616242a0351d9730923c497e993aad140b9ad9ce2dc03d6f81f034a583feb31e42ff4c2b896bc357f2bd729d7d22f5ed8d32c4ebbd614a149fc2cc SHA512 15ac91a248f85774d9adfd93ddd948acfc80fad8730648a5a1ce94606c30fc674b24a09a22ba716cb4a055367393a8a1326cf9ae0fd6280713be6e7d58df750d
 EBUILD python-3.11.0_rc2_p1.ebuild 13357 BLAKE2B fac65a9fba93a49af0ed0dd91f532e6cd729b815ae71b06dcdc40391dbf5252c56067be5a8085576cee41bf96d011fe9264ec0c390bb22db2265579d8b696092 SHA512 faa9b3067f81e57d8969825fa7851ac74690fdaab8b380f963f8567a09ce69a250592ee23df42f584c25261a49e93bafcecd23ab9d392d90ad4794e2c532d7e7
 EBUILD python-3.8.15.ebuild 11000 BLAKE2B 526b13e531cd159b422b1b422c28f6a1a6ae7a6af13ddc16b4dabfe8b08514299dcc9c6e14ff93dd1b0a4703c4a5146d8a7e9dfecfd82367941ca90d508c2260 SHA512 3fae39fdf1cb630f0d9cc3780b72cfb8403a09b58809f92e10562acf310487db98195951df6beb23b0aafaea93fbcf351851573538b50876de7c0d647b7093a4
 EBUILD python-3.9.15.ebuild 12253 BLAKE2B 25c38fdde54f35f0b9237a9265610108a01d87bb866dfa33f3e99f7be7ff3b1b3e9ef8c0bccc046324c18d7fe4163f86f7907b798cd4b478c021f0ce002a16a2 SHA512 4c04b08e342ee26beb887fcd01a2dd4bb047d5a171cf1ed4034e8334de93ba842b1be5d3cb86bca4144f469402090a83d285049bcfc0e628e363f394875be45b
diff --git a/dev-lang/python/python-3.11.0.ebuild b/dev-lang/python/python-3.11.0.ebuild
new file mode 100644
index 000000000000..9ec51be261e6
--- /dev/null
+++ b/dev-lang/python/python-3.11.0.ebuild
@@ -0,0 +1,491 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened libedit lto
+	+ncurses pgo +readline +sqlite +ssl test tk
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-crypt/libb2
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	!!<sys-apps/sandbox-2.21
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	if tc-is-cross-compiler ; then
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross to satisfy --with-build-python.
+			--without-lto
+			--without-readline
+			--disable-optimizations
+		)
+
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS_STATE=disabled
+			MODULE__DBM_STATE=disabled
+			MODULE__GDBM_STATE=disabled
+			MODULE__DBM_STATE=disabled
+			MODULE__SQLITE3_STATE=disabled
+			MODULE__HASHLIB_STATE=disabled
+			MODULE__SSL_STATE=disabled
+			MODULE__CURSES_STATE=disabled
+			MODULE__CURSES_PANEL_STATE=disabled
+			MODULE_READLINE_STATE=disabled
+			MODULE__TKINTER_STATE=disabled
+			MODULE_PYEXPAT_STATE=disabled
+			MODULE_ZLIB_STATE=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the --with-build-python value
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# force-disable modules we don't want built
+	local disable_modules=( NIS )
+	use gdbm || disable_modules+=( _GDBM _DBM )
+	use sqlite || disable_modules+=( _SQLITE3 )
+	use ssl || disable_modules+=( _HASHLIB _SSL )
+	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
+	use readline || disable_modules+=( READLINE )
+	use tk || disable_modules+=( _TKINTER )
+
+	local mod
+	for mod in "${disable_modules[@]}"; do
+		echo "MODULE_${mod}_STATE=disabled"
+	done >> Makefile || die
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.11/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# this just happens to skip test_support.test_freeze that is broken
+	# without bundled expat
+	# TODO: get a proper skip for it upstream
+	local -x LOGNAME=buildbot
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.11/site-packages
+
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"sqlite3 || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
+			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
+			ewarn "installed previously are no longer valid and will be regenerated"
+			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
+			ewarn "when installing some packages and checksum mismatches when removing"
+			ewarn "old versions.  To actively prevent this, rebuild all packages"
+			ewarn "installing Python 3.11 modules, e.g. using:"
+			ewarn
+			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
+		fi
+	done
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c454acc71fd7..f9a6e0234f78 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 764f42e586e4..037b626ae689 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -2,6 +2,7 @@ DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709
 DIST python-3.10.4-docs-html.tar.bz2 7267784 BLAKE2B 15ee98d9b4cd2b31e796dd53f38c127c54a0e76573bac1a1448fc0cd6774ee22d55480654b8933483e1bdbe0a283265b570aa6d8dc5c29d1559889d30adf5620 SHA512 765664aa3e292e63b8935492ff71ab1bb523e1390fc22d88cdde0be99eabc263bc1d8c1f12c58c448413dc8f5c60d61e6f7ef667e8078245b57149f8061260a3
 DIST python-3.10.7-docs-html.tar.bz2 7347443 BLAKE2B fbd2ddca4469fef92af35add0418c313a1148e5d312cb43995f8856562d4b7faafd9da69f4534aa0f92bcc7c49aaec6b965b838098787c25ba10f98b92c4a360 SHA512 cb976e67866e45ca531428e2969bd707bbcddb5928f9f15b40c9ebdb8b4968019b5d95e4da9eb5409d5d7d3c32a63d93761a8b6fbeda49dc0b980189752542cf
 DIST python-3.10.8-docs-html.tar.bz2 7362386 BLAKE2B 7d6b17f1aab2e39c21a0ce7efdcabf3dd1a561c4d1770f57b21d55bfed10cd0ebc68694ea9c14a33b3faa079c4633e79cd202d19f1860f33628b619eed3febe2 SHA512 20640ddad52fa18704942cef8469d750ef60f830d8380c39943af13705b99fc697629c8ee6a12d827bc8b9758a30773811fb0e37dd960e7a81f118cd3e8d4f02
+DIST python-3.11.0-docs-html.tar.bz2 7663300 BLAKE2B 5a0ba8d6691c96f5878f4f03238aaed09e9cf884a2f0aab65a70d5adec160318e3ff1ed89644ff9a6918d543ea310d88d7304dbca51ccb033d83f05c875a47c1 SHA512 0077e43f792925b8a01411243acd7862e1292e8740b4ae7ed734bd6f5d574120886e9ba37da28c057182a4504e5b4f53022818b80ecaefd2c4dfa7d8e5e446dd
 DIST python-3.8.13-docs-html.tar.bz2 6698035 BLAKE2B 4c26c4bca374a24c33cf67c8bce3b4443e5640be278b46cd9da2eaa8eb44ecb6fe796d1a546ed71412f203c71a43f241c4e9ea1d700758ac59e18ad71a82e8d2 SHA512 244a9236762523f9c9784d00892254c0a8ae824536a649d858a68babac664b6f840bddf3ea41cb55a4f2c00f38180a72060cf5811f01a91f342ef5c41ccbc6b3
 DIST python-3.8.14-docs-html.tar.bz2 6693920 BLAKE2B 985a260298c6352d17f921a0f0be4d432a5e845558cfec4c3798d820f0b354008f21276fca4fc0ad360d44e479e74fd245c2a824cbf6b9789c6d5b2408bb5c07 SHA512 a294dc94aea8776f183db1d2420bbe50cf1d1ae22f776015ad8e7fb1eac0f7d152fec5e5ea883a1607041e2798d99b512c820235c0f124bd5d2c2c25a92008f9
 DIST python-3.8.15-docs-html.tar.bz2 6695025 BLAKE2B 614bd68c7038887e4d8f1758b7396e11683121fa22b8b3335dc9425fb6991e398ee64cf07ed4ca0d7273dc4943e7c9fcefe36cf4dcb51dcaa439219011bbe4e1 SHA512 c05cdf16c59ef213872b08bd54d0ddcef5f11bd80cfa78be21c9e57828bd0c7a63b553f525b6e68c578d6098c427e84f5f609680a74421c6a9baa58186b46c34
@@ -12,6 +13,7 @@ EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c4
 EBUILD python-docs-3.10.4.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.10.7.ebuild 633 BLAKE2B 0e7da774e53563b6caf0d9799cc805374bb698da38b823b83be6cc5ec15991a39ce4ec6d06711ff8d25f997aca924a32d9fbad6b863b51ded72b30e9c24a7624 SHA512 42a621737a2351f2c7b186d1a08056a601e41a4defa2a792f7fe11774b3f1f45fe86a99dae3debcee2ba3cdbd091e0a39bf093c8ce913148ea517d6f1e8dc39b
 EBUILD python-docs-3.10.8.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
+EBUILD python-docs-3.11.0.ebuild 635 BLAKE2B d39c4e43cbdc4c940acc9674bbf4a8fc6401f2798a526303f3259470e5b47a65fb0e397a794b561f1e529d50ac7a6ee790b199f961d16c59338e4800abdad5d5 SHA512 2519f14e72ce7a82bfe977bb01a85a62522fbc6075ac28165e365063b7012dc002a071adac590c2c436f3814af645b73fa195ab90aa188de5bec914f3feb1fa0
 EBUILD python-docs-3.8.13.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.8.14.ebuild 631 BLAKE2B eafda8f7f6ef13d10f2566e8507b0c7699bf61b61d73bd1ea8440e21601bcc8c84652108ac0d6c2c356c6c268e8fcf032a26176dfd8ac83064a0166ae99cbd09 SHA512 ace3e35c8374954638e177ba6ef3064f1c1d4eb34df4fe15f6a9fa73d37ea9f46885f43f8d9e01bca9e0632c34a680be75afa427a16be62face825d23fdfaa7f
 EBUILD python-docs-3.8.15.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
diff --git a/dev-python/python-docs/python-docs-3.11.0.ebuild b/dev-python/python-docs/python-docs-3.11.0.ebuild
new file mode 100644
index 000000000000..db7df46c6ffb
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.11.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index ed18b295022c..6396f8b2e6cd 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/antimicrox/Manifest b/games-util/antimicrox/Manifest
index 3a94f1df913f..8001b6d0b976 100644
--- a/games-util/antimicrox/Manifest
+++ b/games-util/antimicrox/Manifest
@@ -1,4 +1,6 @@
 AUX antimicrox-man_gz.patch 600 BLAKE2B 70f3837a4d3b2e4a5e64dd710eb710c1ea09bfdeea8a4000e976c1d3f0fcd451d0030aba22aa904308cf2aead9d1881757fd3b2fe4f703d8727ad132513bb24b SHA512 d30604d5615b00dd1b4ac03bd063a271c346ea8f13568b37c1af9f0bbdf8ad8ef8df604441b79e467742310433cc121aaee7c773cac7f3ec5e2547013fca16a8
 DIST antimicrox-3.2.5.tar.gz 1801792 BLAKE2B 8e42bef2c04f57a4ca733fa9632bb8b2070e4bfc6f0ac1c01016dd221a6cf24a229d1090c0d8ed2a7562d4c7224668cebdf0fe23265ac4d9208403f9fbe7e85c SHA512 5b9e75fcb1e5d7e12d5880f83451c12f0eb2da1a6e43387fc42bbcba8c24a77398868f69177277840b9a7541736007fdbec58fd852d32d12ca559f6f75178c0b
+DIST antimicrox-3.3.1.tar.gz 1878461 BLAKE2B 4f1d0c9be92bf89c5ebc6cad8a8b106f1888e53d135efc86616c1244738f79df6981fe0ea0e233e8d436ace126f4ac43a5edd63b0684a6af257c055db99f4284 SHA512 15c6b88640e0cd6ebff85574d1911fb92ed27868b2442ab225ef0eaccfbe243b445c3a78435225cb5a54d9dca65517da8998df95ebfa50d92bd1e53338c102d2
 EBUILD antimicrox-3.2.5.ebuild 1476 BLAKE2B 66557ba073b132582cf6e75c2423c31de0405fc54e07182ab824a187ece0408602ea0dd4a564c626b58c87caea98136af378999ccb5fe4d30eb0a690a3b7dd16 SHA512 db3db5f5539aa44978daf95b0f41f85e19c1215cc9711097ffdaaca23ce05567c9637c652e70ba6f8b080b5c15ef5b02e1531c566a607f08585a44a8ebd77a99
+EBUILD antimicrox-3.3.1.ebuild 1476 BLAKE2B 66557ba073b132582cf6e75c2423c31de0405fc54e07182ab824a187ece0408602ea0dd4a564c626b58c87caea98136af378999ccb5fe4d30eb0a690a3b7dd16 SHA512 db3db5f5539aa44978daf95b0f41f85e19c1215cc9711097ffdaaca23ce05567c9637c652e70ba6f8b080b5c15ef5b02e1531c566a607f08585a44a8ebd77a99
 MISC metadata.xml 412 BLAKE2B 9a75236478dfbb26649e3ab3355953ecb2d32739c0338d4fe2e8e0f4eddd0c5aa444fd13c02ff2740ef10077c56a40ab0a48d02670273ec831f24d50fae9cb83 SHA512 bcb066386dcc22038e8a9f2f42b03149dce3421ad545ebb9c7ef8df2f996970442219f40dbc82e232d7cf71ec9b421c6966b01801c46ca7a0322a8717cce4d87
diff --git a/games-util/antimicrox/antimicrox-3.3.1.ebuild b/games-util/antimicrox/antimicrox-3.3.1.ebuild
new file mode 100644
index 000000000000..15e929f6d678
--- /dev/null
+++ b/games-util/antimicrox/antimicrox-3.3.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev xdg cmake
+
+DESCRIPTION="Graphical program used to map keyboard buttons and mouse controls to a gamepad"
+HOMEPAGE="https://github.com/AntiMicroX/antimicrox/"
+SRC_URI="https://github.com/AntiMicroX/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+# Tests fail to build
+# https://github.com/AntiMicroX/antimicrox/issues/530
+RESTRICT="test"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libsdl2[X,joystick]
+	virtual/udev
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXtst
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+	doc? ( app-doc/doxygen[dot] )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-man_gz.patch )
+DOCS=( CHANGELOG.md README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DAPPDATA=OFF
+		-DCHECK_FOR_UPDATES=OFF
+		-DINSTALL_UINPUT_UDEV_RULES=OFF  # Install in src_install
+		-DWITH_TESTS=OFF
+		-DWITH_UINPUT=ON
+		-DWITH_X11=ON
+		-DWITH_XTEST=ON
+		-DBUILD_DOCS=$(usex doc ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+
+	udev_dorules "${S}"/other/60-${PN}-uinput.rules
+
+	use doc && dodoc -r "${S}"/docs/{html,latex}
+}
+
+pkg_postinst() {
+	udev_reload
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b12b976b1a12..0c5a17b39d64 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 0e5045fb6652..f1885f01b1e7 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,9 +1,9 @@
-AUX geeqie-2.0.1-allow_xxdi.patch 774 BLAKE2B 4bba0667ea4030bba821787d22725e0db177ab5034a77124c85467f4c4b34b3148f4b3001f9466ee472425958d6d97fd868539a7c7d04740872255aad6ed6543 SHA512 83788dc0e4e99e9a2ad6e4da20c9c8d61e8bea9678d86b40c82cfc9d925abde2bfbdc5cfa0fbf421056b3625049fdf037dcc18402049dfba8c1c4443106464d8
+AUX geeqie-2.0.1-allow_xxdi.patch 776 BLAKE2B 59f566ef44b581e06b7d066fc6874a552bc08ad4b180ed1a240839661d50a92b860738efd8994c3a5344746bb109cd6da7cac0b68c3b37f730ba842a9382883e SHA512 376ca5efc6ec2f5385c4c4f77e5257d105ecf2ef39d26576a2f50307b8babdb2ae55d8aa38a23709eb1aa7d5dfa62e0213b3a71aebe70c54c7d6a1afc5b7da8a
 AUX geeqie-2.0.1-doc_option.patch 4141 BLAKE2B 59ea49f13d8bd666a01c0905ae95845eb1ecc6acbe71b7ef8553902c0ffca172984ca7dabe39e840d0ca779e13418a8a8043cacc0e3992d691a363f547fa0d58 SHA512 4edb088606d5a4b6f1d83390b40c47c8d2e06a2da2a2ea21dd9049961c63253a9aaa32d0270ef3969b0a273f5f9d2114a740328d9d4d7bbf73b766ecd2aaa8a8
 DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
 DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288
 DIST geeqie-2.0.1.tar.xz 1666600 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5
 EBUILD geeqie-1.7.3.ebuild 2322 BLAKE2B 57e6a0b443abe37232d6d241a017da5d2f3f33173bfd3e801ebac526bcfca240415fcf99d38fac0aabec01678a693cef716c94fb15a011c7734e4c956bd7a5ca SHA512 a11a4e45a52482e189fcca579c45bb9be07e1a8b56ca5f68430472b186ccfb2b3d80670b9ab70294832de8c90f7125b9849d1ba6ae0dbb98754d289c2588383c
-EBUILD geeqie-2.0.1-r1.ebuild 3206 BLAKE2B 6c3f999812883d72561c7a3404fb56ec9e26831293661629df71dc60093d76f82214436724d6f6d7e96e7f54606519f2b86202dc5641e436d2bb6c0363e8d5ee SHA512 8adbe3711c9dc40e039757a03c259da700bf9306399da8ff5d4fe505f465b1aad7ceb415a8b10aeb21b6a448b544069216f29e6481cf3a093fad041ccf1d7eec
-EBUILD geeqie-9999.ebuild 3034 BLAKE2B 0c3f49fa2ec5d21210f405c9892620702e99846b92262c93c5371630c241337fad3a2d89048f69ddd188c3374e29b9030124b6e9ac31d77c4d0167901abc5ea2 SHA512 c4284b1db9733672337618fcc471ebbadca43ff54cfea121111be24f8d4a2ef42829b71beea3b9744ed18b09c09462160124163415b17f600791d7e71b937e65
+EBUILD geeqie-2.0.1-r1.ebuild 3236 BLAKE2B 834efdba26ca755e3bcbda45b850b6035a903be91e2060b9dad7e12e46302a5f243c5d440adddb5480b0cdd8512087dfbc6287c560ede251d9cb6a584128b8bb SHA512 710fd6b9e72a92a5f44f84dacb623987718d17725a7e9cee539ec500dd831c3167059e130b181f5287e229299c44443dd03e3eff995d5653cdda9f66119f074a
+EBUILD geeqie-9999.ebuild 3163 BLAKE2B 03580468af556c3645872e313d8458fd88b0e48ce8842a0bba637bb0b492958b365fbfb8df062ec8cb04fa876c4d012e6159749c80778f7b2eb7e63f50789986 SHA512 736b6d49daef5f6dccefd3c6760f784341ace097ce6ea3337d00482b836b89f22c5ba427b179257459c513513f35576c985092582d31fc514332ea51efef3f90
 MISC metadata.xml 1004 BLAKE2B 8f631bfdc45713df491faf9f78479c2c675c815547e52e848e55d6b87aad94ddb656d1ec9a3159b2bf22b039f5c25840e9a86da78de80bee97478e0c07c3fd4e SHA512 b721895c5afc72f4e09fd7ce512113495364fffdf0aa8e01e92cf0a4f441e72683e7319023baca99f575b2514d815810b7e04eab12482f20798235246c2a06bd
diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
index 440de7189344..bf6a7d77975f 100644
--- a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
+++ b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
@@ -14,4 +14,4 @@ diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1/
  cd "$(dirname "$1")" || return 1
  
 -xxd -i "$(basename "$1")" "$build_dir/$2"
-+${XXD} "$(basename "$1")" "$build_dir/$2"
++${XXD} "$(basename "$1")" > "$build_dir/$2"
diff --git a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
index 8a99ae4480da..7dcf1197b2ae 100644
--- a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild
@@ -14,13 +14,12 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
+IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
 
 RDEPEND="gnome-extra/zenity
 	virtual/libintl
 	x11-libs/gtk+:3
 	djvu? ( app-text/djvu )
-	doc? ( app-text/yelp-tools )
 	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	heif? ( >=media-libs/libheif-1.3.2 )
@@ -28,8 +27,7 @@ RDEPEND="gnome-extra/zenity
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpegxl? ( >=media-libs/libjxl-0.3.7 )
 	lcms? ( media-libs/lcms:2 )
-	lua? ( ${LUA_DEPS}
-		doc? ( app-doc/doxygen ) )
+	lua? ( ${LUA_DEPS} )
 	map? ( media-libs/clutter-gtk
 		media-libs/libchamplain:0.12[gtk] )
 	pdf? ( >=app-text/poppler-0.62[cairo] )
@@ -61,6 +59,9 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# Disable doc build - not useful most of the time per upstream
+	sed -e "/subdir('doc')/d" -i meson.build || die
+
 	# Lua version
 	sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die
 }
@@ -71,7 +72,6 @@ src_configure() {
 		-Dgq_htmldir="share/doc/${PF}/html"
 		$(meson_use debug)
 		$(meson_feature djvu)
-		$(meson_feature doc)
 		$(meson_feature exif exiv2)
 		$(meson_feature ffmpegthumbnailer videothumbnailer)
 		$(meson_feature heif)
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index 2be0f992fee3..9d85f853281b 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -15,13 +15,12 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
+IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
 
 RDEPEND="gnome-extra/zenity
 	virtual/libintl
 	x11-libs/gtk+:3
 	djvu? ( app-text/djvu )
-	doc? ( app-text/yelp-tools )
 	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	heif? ( >=media-libs/libheif-1.3.2 )
@@ -29,8 +28,7 @@ RDEPEND="gnome-extra/zenity
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpegxl? ( >=media-libs/libjxl-0.3.7 )
 	lcms? ( media-libs/lcms:2 )
-	lua? ( ${LUA_DEPS}
-		doc? ( app-doc/doxygen ) )
+	lua? ( ${LUA_DEPS} )
 	map? ( media-libs/clutter-gtk
 		media-libs/libchamplain:0.12[gtk] )
 	pdf? ( >=app-text/poppler-0.62[cairo] )
@@ -57,6 +55,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# Fix xxdi.pl support
+	sed -e 's/"$build_dir/> \0/' scripts/generate-ClayRGB1998-icc-h.sh || die
+
+	# Disable doc build - not useful most of the time per upstream
+	sed -e "/subdir('doc')/d" -i meson.build || die
+
 	# Lua version
 	sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die
 }
@@ -67,7 +71,6 @@ src_configure() {
 		-Dgq_htmldir="share/doc/${PF}/html"
 		$(meson_use debug)
 		$(meson_feature djvu)
-		$(meson_feature doc)
 		$(meson_feature exif exiv2)
 		$(meson_feature ffmpegthumbnailer videothumbnailer)
 		$(meson_feature heif)
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 9bcfe74e754b..8feb89a5ef1e 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,6 +1,8 @@
 AUX graphviz-6.0.1-private-ghostscript-symbols.patch 1207 BLAKE2B ec966713af13fbfbdea0e6217d3da22884019ef39fb968fcb4f0ccdbb21c170087f00561ac613d78c29917468e925466f4d8e70a881876877fa88f2207d25141 SHA512 7f5434235b4627b0204e7b9c374290b02d805edcbebdca23154c18df6795ecb12016bfeb1ed9c6520e41ad216f81f38ad18791a1de1e06f15125805f1829aee6
 DIST graphviz-5.0.1.tar.xz 21493276 BLAKE2B 1eabf7dc175cde4827db682ae7c0cb00f5bec4bee8aa9801bc6ac86b06011588260ce261e25613d6d4a1e708ccb4fd65aba73210df8cf0af84f2e20b7c914167 SHA512 c1c5784558fd6f32cd8ce9b63c2bc5232f47ea1c4abf8fbfc1b8b0175aa30845af452dbc6651642f07f2c5b7a73f5c792934ca99561608a104ae99898eca3bc7
 DIST graphviz-6.0.1.tar.xz 21492876 BLAKE2B 36b8c2e922a73e35cddb2a252138193c9a413df823953faf387c964a31cf41e93b9c502ddc58831542aeea7e06cfd9ec377c390b45b859bdab1e0602c9b9683c SHA512 78f58734c47a6e1531a00b9de881481108500bf0a38b0ee734ecd024b629d838d98dbb32d81d2c2fe3b5ac28cbad140452b4bb5fa808ec667cc6cbe7638156ee
+DIST graphviz-7.0.0.tar.xz 21486172 BLAKE2B f52a75b5938ba3a6fbad3efe9d0ca6413145f9355c3ad1c8dc39253e8db36e9862c70c4dc910afd05e601e5787640b5b4a3dd09c1527cc3bd39a97ef281a7215 SHA512 dfead861d2f6ad1ebc9e3e4bd30684e02005cc7a2b78dab3ad45a11a401e08aeb1b6f7d8ea7ad7655230275ab6c10fd791434489e4ba09ae6905970230a974dc
 EBUILD graphviz-5.0.1-r1.ebuild 6134 BLAKE2B ced1e9eed2d12476044c69c269aa904a07ad8e4437956a01a199f19fee3328db937453969d4521c5f976b76fc4ad7d8824521b505a07326f67c149684d03da3e SHA512 28fb36c8781fb453de8020706583a1373af729c6583db178d78a432e8d08ddedb6c683c31bceb9ad8e8c9c7fa72ea28a1b7d25a9d8fd424af2ea5b55ed6c6ae3
 EBUILD graphviz-6.0.1-r2.ebuild 6217 BLAKE2B da9dc265f433e9cf73767daa122274dc5b4efdf6274b9c6c2a5f682715b6fa83095b273bf4a928a78a107b7c19f6f28bf07e47208e533723d9d604ef615f1d9f SHA512 aa5a915946fc9f1623eaa16a83d4b33b36e26dbcd1b22adbc72b3b1f54349913e24d67a255d6c3e67a5581d5d2ae44333d72c078f22ba641406ae722d9d67d64
+EBUILD graphviz-7.0.0.ebuild 6138 BLAKE2B 7c9d65aebfd0ab15ea72f236c5efac79c579029eff7c01e26056bf2eb11f8494d65aa1034f7d39d49ff18743d9487672976728c49c5ce22636250c55b5791495 SHA512 021445d87fcad2b7d03b9ed33a64dca3b79bd3f3b6d416e437080299c9aae41f7bcf446710e8096616023645ddd311a7dfbeb1c256fc39d1120f370f1a63acd5
 MISC metadata.xml 2324 BLAKE2B 206e5312317fb7bf8f4bba64196a6fa89a8a9e30be3b5e0bf598485cdc2a862e1cc302024b9d170aa6c8ebbbd429ab839d296076bc6f1ac3b154678773cd4d5f SHA512 8eb9a1508823a06fbb180755a7dd173cb2365d7d90e25ad211d56645ee213ee825a991ba56b3f1c8d952c0a7baaa1ea3f8d8d35bdedbffbdce608d66645dd2b0
diff --git a/media-gfx/graphviz/graphviz-7.0.0.ebuild b/media-gfx/graphviz/graphviz-7.0.0.ebuild
new file mode 100644
index 000000000000..af33ee99a65d
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-7.0.0.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-single-r1
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
+# Unfortunately upstream uses an "artifact" store for the pre-generated
+# tarball now, which makes predictable URLs impossible.
+SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
+
+REQUIRED_USE="
+	!cairo? ( !X !gtk2 !postscript !lasi )
+	pdf? ( cairo )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh, tests against installed package, missing files and directory
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2
+	>=dev-libs/glib-2.11.1:2
+	dev-libs/libltdl
+	>=media-libs/fontconfig-2.3.95
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libpng-1.2:=
+	sys-libs/zlib
+	virtual/libiconv
+	cairo? (
+		>=x11-libs/cairo-1.1.10[svg(+)]
+		>=x11-libs/pango-1.12
+	)
+	devil? ( media-libs/devil[png,jpeg] )
+	gtk2? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	gts? ( sci-libs/gts )
+	guile? ( dev-scheme/guile )
+	lasi? ( media-libs/lasi )
+	pdf? ( app-text/poppler )
+	perl? ( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	ruby? ( dev-lang/ruby:* )
+	svg? ( gnome-base/librsvg )
+	tcl? ( >=dev-lang/tcl-8.3:= )
+	webp? ( media-libs/libwebp:= )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? (
+		app-text/ghostscript-gpl
+		sys-apps/groff
+	)
+	guile? (
+		dev-lang/swig
+		dev-scheme/guile
+	)
+	nls? ( >=sys-devel/gettext-0.14.5 )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )"
+
+# Dependency description / Maintainer info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   needs 'pangocairo' enabled in graphviz configuration
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Directly depends on gtk-2 and gdk-pixbuf.
+#   needs 'pangocairo' enabled in graphviz configuration
+# - ming
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - cairo/pango:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support (??? unsure),
+#   needs libXaw for UI
+#   UI also links directly against libX11, libXmu, and libXt
+#   and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - go (disabled)
+# - io (disabled)
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, gvedit, gvpr, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - gvedit (via 'qt5'):
+#   based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+#   currently disabled -- it segfaults a lot
+#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
+#   with flags enabled at configure time
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myconf=(
+		# Speeds up the libltdl configure
+		--cache-file="${S}"/config.cache
+		--enable-ltdl
+		$(use_enable doc man-pdfs)
+		$(use_with cairo pangocairo)
+		$(use_with examples demos '$(docdir)/examples')
+		$(use_with devil)
+		$(use_with gtk2 gdk)
+		$(use_with gtk2 gdk-pixbuf)
+		$(use_with gtk2)
+		$(use_with gts)
+		$(use_with qt5 qt)
+		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
+		$(use_with svg rsvg)
+		$(use_with webp)
+		$(use_with X x)
+		--with-digcola
+		--with-fontconfig
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		--without-ming
+		# New/experimental features, to be tested, disable for now
+		--without-ipsepcola
+		--without-smyrna
+		--without-visio
+		# Bindings
+		$(use_enable guile)
+		$(use_enable perl)
+		$(use_enable python python3)
+		$(use_enable ruby)
+		$(use_enable tcl)
+		--disable-go
+		--disable-io
+		--disable-lua
+		--disable-java
+		--disable-ocaml
+		--disable-php
+		--disable-python
+		--disable-r
+		--disable-sharp
+		# libtool file collision, bug #276609
+		--without-included-ltdl
+		--disable-ltdl-install
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	use python && python_optimize \
+		"${D}"$(python_get_sitedir) \
+		"${ED}"/usr/$(get_libdir)/graphviz/python3
+}
+
+pkg_postinst() {
+	# We need to register all plugins before they become usable
+	dot -c || die
+}
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 462e0478a4d7..69617078738b 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fd9dfcff6690..7c5eebbbc5d2 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 20:09:40 +0000
+Tue, 25 Oct 2022 02:09:43 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index ac868a12d63f..65ea8e8dc774 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-24T20:09:43Z
+TIMESTAMP 2022-10-25T02:09:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNW8QdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNXRWtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCp8xAApKdFpF1DJyGwqAd4dUWZciwc1+76EPvrinQ3J/hUE+uXh9WZEZDBTm2q
-BbjQn8y5IHCVauQD2gCPkorj/HGmQF7q9GZGLvGanJ12+D8N1mmiA19ReypMyJJK
-1RaIomy70CY9+2l3URgZwW+6kOQ9xpF3BQXs132w3HC6vivjp66hoeKbUxAn46uj
-bDhYIXp6lM+JsTgSSUaEk1lxCo94EDCDcHTK9KcyhzgqwtZKD3zlRagnumSu2pSq
-6FlPvb/dP8Kt0S2Mcd1flUbMZsoI0jCCANfhRXsjfGc81uUYhuINSa85JiGMURvp
-yDlIrEzys7qM46GAqMVa7ND1k1iH6uzBoBI1IM7RNyZw575pj6dL3TTJ/QyUZ7mT
-O4xoE8HKRcEVKdZv0ln0roLwDt5/I6RF9knggYNZbCwnj04kQEAU/Tshkv5F+YWf
-vO8lvCR49iHMe9aG7gxznpNGKi9RpKpLnkraIzDypL6FI2uPzaW0Pn0weykWQrMZ
-rcNiEfNxNUgGfbMZ+luocsZ4dFTOSkrKRvrnc5nBv5TH9QET6gpC6pI4PqLoMGQo
-kNzBbM1jLnBNobSvTzNoIlGrjs/VfylFjhIzPD7ZoX0jeIkV1l0hxtYkP4xAdL5d
-PXsiqk2BPD0gBGxn6IclbdjZywjrWfUjacT4Ge0WZ1QgbhQb4aM=
-=BNSO
+klCyvQ//fhVQjMjPeQKa263Ho8Sm1F/2Y/t63u8x1XydVMXZ8zUN+KpjE1ENIGj/
+vSv5S4e/AfHBjvsJnzDAhZU0FuceV3AWsOoxjTHB8DMzp/vQofyBeqWhc2t1aSxa
+0W4tOvg+rF+/nKYFn8u5SvZu4JyHO4/xWk6HQS/OxQMqWmLAKzLgxnctp14iqyHy
+CIrThrgG/mSNJv5iNNlBqC/qszwHBxv1HkvfTYFt9zF8S6zhTGK+zxrmjQluzEg4
+bLDy9ru6Y4ieon40CTBwbUMuJi1P4EI+B6siH93TQFDtGMxXlMbbAl6BLAdu/d0n
+/sWuKXcrq2k6a99KmTiQED7GIEdjoMRgWp+QC8BPh5HbWHmtMuZGhqtxUrpM41wd
+57uaevkw7RoXccPQofXz6OQ8ES16LTmzhrEF+uVaVUK1avMzuGLH/7hGElpaMvMn
+Ox3uzW+Vf/8Q0pr6jI6W3NKrXi9WViwfCOImwJd4n1uGpOnOYRDuGeSpaQqbExqi
+TRIHkc1TzyZ2xcp6JovNLZavsfmzxn31qK29HSSLGNkrvUFjOTkkjZY4ar1J3ogD
+ZpxHcnkjJPEMGtBgt2+O6DGZo4S3fnDpqHpWNVcC3vENKAhhMyDuFOm6oRCKQYkM
+1QxJs8oCOHkiu3Xgsh3yU6WSQ5WI+JNsJe7d7xcpvJOFiV8Mq5k=
+=aFEa
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fd9dfcff6690..cc1b9917b005 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 20:09:40 +0000
+Tue, 25 Oct 2022 02:09:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b4269f608202..156ec2968bf7 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 66f86e16635a..f8c9d739f263 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/bzip3-1.1.4 b/metadata/md5-cache/app-arch/bzip3-1.1.7
index 198668773048..56bb32025f3b 100644
--- a/metadata/md5-cache/app-arch/bzip3-1.1.4
+++ b/metadata/md5-cache/app-arch/bzip3-1.1.7
@@ -6,6 +6,6 @@ INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm64 ~loong ~x86
 LICENSE=LGPL-3+
 SLOT=0
-SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.4/bzip3-1.1.4.tar.xz
+SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.7/bzip3-1.1.7.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=49e77d16744f08d232de972e545a4559
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 57f951cef886..13cc26889acf 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/borgbackup-1.2.2 b/metadata/md5-cache/app-backup/borgbackup-1.2.2
deleted file mode 100644
index 0ea5a9d906f5..000000000000
--- a/metadata/md5-cache/app-backup/borgbackup-1.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-0.29.29[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pkgconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0=
-DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
-EAPI=8
-HOMEPAGE=https://borgbackup.readthedocs.io/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.2.2.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=800ee050b654c26e0bf61e4e815949e4
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.2.2-r1 b/metadata/md5-cache/app-backup/borgbackup-1.2.2-r1
new file mode 100644
index 000000000000..26a8d910a061
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgbackup-1.2.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cython-0.29.29[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pkgconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/openssl:0=
+DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
+EAPI=8
+HOMEPAGE=https://borgbackup.readthedocs.io/
+INHERIT=distutils-r1 bash-completion-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/openssl:0= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.2.2.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=158db26550e62a42fe25199adfd6f143
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 2bdb782c4bf2..4c6ae40b41b3 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/snapd-2.57.5 b/metadata/md5-cache/app-containers/snapd-2.57.5
new file mode 100644
index 000000000000..06f0bd4c3ab3
--- /dev/null
+++ b/metadata/md5-cache/app-containers/snapd-2.57.5
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-lang/go-1.9 dev-python/docutils sys-devel/gettext sys-fs/xfsprogs sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
+DESCRIPTION=Service and tools for management of snap packages
+EAPI=7
+HOMEPAGE=http://snapcraft.io/
+INHERIT=autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
+IUSE=apparmor +forced-devmode gtk kde systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT
+PDEPEND=sys-auth/polkit[gtk?,kde?]
+RDEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
+REQUIRED_USE=!forced-devmode? ( apparmor ) systemd
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/snapcore/snapd/releases/download/2.57.5/snapd_2.57.5.vendor.tar.xz -> snapd-2.57.5.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	go-module	15312495dc4fd84f8c37bbe228ea2abd	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4890ef91805a8a226b2aab1d3054ea58
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index bab453608cbf..5a752699d0e5 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/efitools-1.9.2-r1 b/metadata/md5-cache/app-crypt/efitools-1.9.2-r1
new file mode 100644
index 000000000000..9d7cfbb30c3c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/efitools-1.9.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-crypt/sbsigntools dev-perl/File-Slurp sys-apps/help2man virtual/pkgconfig
+DEFINED_PHASES=configure prepare
+DEPEND=!static? ( dev-libs/openssl:= ) sys-apps/util-linux static? ( dev-libs/openssl:=[static-libs(+)] ) sys-boot/gnu-efi
+DESCRIPTION=Tools for manipulating UEFI secure boot platforms
+EAPI=8
+HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=static
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=!static? ( dev-libs/openssl:= ) sys-apps/util-linux
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-1.9.2.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=fe593a1d7ff1be560be1f5f8255fc0a2
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index ad5c10b73796..ee2468f4b438 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/systemd-mode-1.6 b/metadata/md5-cache/app-emacs/systemd-mode-1.6
new file mode 100644
index 000000000000..fcbb4b2882d1
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/systemd-mode-1.6
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.4:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Major mode for editing systemd units in GNU Emacs
+EAPI=8
+HOMEPAGE=https://github.com/holomorph/systemd-mode/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-24.4:*
+SLOT=0
+SRC_URI=https://github.com/holomorph/systemd-mode/archive/v1.6.tar.gz -> systemd-mode-1.6.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=0dd61e3920d919774d8c29e970cdd5d6
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index afac7a3a445c..81964c3dca24 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.12.0 b/metadata/md5-cache/app-portage/iwdevtools-0.12.0
new file mode 100644
index 000000000000..46cdaff678f0
--- /dev/null
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.12.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man || ( sys-apps/util-linux app-misc/getopt ) test? ( app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
+EAPI=8
+HOMEPAGE=https://github.com/ionenwks/iwdevtools
+INHERIT=meson optfeature
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.12.0.tar.gz -> iwdevtools-0.12.0.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=38dbace2cc50b20d9339350875faf52f
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index d5e09d67d6b5..bceb02df7ed4 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/rqlite-7.9.2 b/metadata/md5-cache/dev-db/rqlite-7.9.2
new file mode 100644
index 000000000000..6b5974a88628
--- /dev/null
+++ b/metadata/md5-cache/dev-db/rqlite-7.9.2
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Replicated SQLite using the Raft consensus protocol
+EAPI=7
+HOMEPAGE=https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/
+INHERIT=go-module
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT Apache-2.0 BSD CC0-1.0 MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/rqlite/rqlite/archive/v7.9.2.tar.gz -> rqlite-7.9.2.tar.gz https://dev.gentoo.org/~zmedico/dist/rqlite-7.7.2-deps.tar.xz
+_eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd
+_md5_=92292bb5bd3c7c66838244770cd1522a
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 3a7840332d4a..d661f9a44383 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0 b/metadata/md5-cache/dev-lang/python-3.11.0
new file mode 100644
index 000000000000..11a68676ff29
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.11.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
+RESTRICT=!test? ( test )
+SLOT=3.11
+SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=23b242706ae6cf3746784efe4546dbc7
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 33e2e5f4545f..445aa48bc300 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/python-docs-3.11.0 b/metadata/md5-cache/dev-python/python-docs-3.11.0
new file mode 100644
index 000000000000..405bcc08c779
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-docs-3.11.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=HTML documentation for Python
+EAPI=7
+HOMEPAGE=https://www.python.org/doc/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=PSF-2
+SLOT=3.11
+SRC_URI=https://www.python.org/ftp/python/doc/3.11.0/python-3.11.0-docs-html.tar.bz2
+_md5_=a40c5990b9325f6cb13b3809ae89dcb9
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 4d747959aba2..3b1291f1cd6f 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/antimicrox-3.3.1 b/metadata/md5-cache/games-util/antimicrox-3.3.1
new file mode 100644
index 000000000000..1a0da61e419a
--- /dev/null
+++ b/metadata/md5-cache/games-util/antimicrox-3.3.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules doc? ( app-doc/doxygen[dot] ) 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=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[X,joystick] virtual/udev x11-libs/libX11 x11-libs/libXi x11-libs/libXtst
+DESCRIPTION=Graphical program used to map keyboard buttons and mouse controls to a gamepad
+EAPI=8
+HOMEPAGE=https://github.com/AntiMicroX/antimicrox/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=udev xdg cmake
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsdl2[X,joystick] virtual/udev x11-libs/libX11 x11-libs/libXi x11-libs/libXtst
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/AntiMicroX/antimicrox/archive/3.3.1.tar.gz -> antimicrox-3.3.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2fa8e4a9fbf84b5a7ef0b9cc6c4e6863
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 5fe2ed5c440d..da6c3ab5340c 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/geeqie-2.0.1-r1 b/metadata/md5-cache/media-gfx/geeqie-2.0.1-r1
index 426442c6bbd8..097921804d6a 100644
--- a/metadata/md5-cache/media-gfx/geeqie-2.0.1-r1
+++ b/metadata/md5-cache/media-gfx/geeqie-2.0.1-r1
@@ -1,17 +1,17 @@
 BDEPEND=|| ( dev-util/xxdi app-editors/vim-core ) dev-util/glib-utils dev-util/intltool sys-devel/gettext 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 preinst prepare setup test
-DEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+DEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
 DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=8
 HOMEPAGE=http://www.geeqie.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=lua-single meson optfeature xdg
-IUSE=debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 SRC_URI=https://github.com/BestImageViewer/geeqie/releases/download/v2.0.1/geeqie-2.0.1.tar.xz https://dev.gentoo.org/~voyageur/distfiles/geeqie-2.0.1-ChangeLog.tar.gz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e422380aca3cf0e81f894e898e409af3
+_md5_=29857efe2fab8eff13e55908e101ec34
diff --git a/metadata/md5-cache/media-gfx/geeqie-9999 b/metadata/md5-cache/media-gfx/geeqie-9999
index 4e9a240aeeef..e9c7a23adee4 100644
--- a/metadata/md5-cache/media-gfx/geeqie-9999
+++ b/metadata/md5-cache/media-gfx/geeqie-9999
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-util/xxdi app-editors/vim-core ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+DEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
 DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=8
 HOMEPAGE=http://www.geeqie.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=git-r3 lua-single meson optfeature xdg
-IUSE=debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fac78ddd6248a9c260988041e6471345
+_md5_=7b938371daee48670dfd5c323d91f398
diff --git a/metadata/md5-cache/media-gfx/graphviz-7.0.0 b/metadata/md5-cache/media-gfx/graphviz-7.0.0
new file mode 100644
index 000000000000..b4df6f7e2f4b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/graphviz-7.0.0
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/flex sys-devel/libtool virtual/pkgconfig doc? ( app-text/ghostscript-gpl sys-apps/groff ) guile? ( dev-lang/swig dev-scheme/guile ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig )
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] media-libs/libjpeg-turbo:= >=media-libs/libpng-1.2:= sys-libs/zlib virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg(+)] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk2? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=Open Source Graph Visualization Software
+EAPI=8
+HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
+INHERIT=python-single-r1
+IUSE=+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=CPL-1.0
+RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] media-libs/libjpeg-turbo:= >=media-libs/libpng-1.2:= sys-libs/zlib virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg(+)] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk2? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 )
+REQUIRED_USE=!cairo? ( !X !gtk2 !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.0.0/graphviz-7.0.0.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=213afc3bceebf641869fe4b22697327c
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 5e3925314f90..786013c1940b 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.87 b/metadata/md5-cache/net-dns/dnsmasq-2.87
new file mode 100644
index 000000000000..2a9256027121
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.87
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup
+DEPEND=acct-group/dnsmasq acct-user/dnsmasq dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( dev-libs/nettle:=[gmp] static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) ) nettlehash? ( static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) )
+DESCRIPTION=Small forwarding DNS server
+EAPI=8
+HOMEPAGE=https://thekelleys.org.uk/dnsmasq/doc.html
+INHERIT=toolchain-funcs lua-single systemd
+IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2 +loop +inotify ipv6 lua nettlehash nls script selinux static tftp lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=acct-group/dnsmasq acct-user/dnsmasq dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( >=dev-libs/nettle-3.4:=[gmp] ) ) nettlehash? ( !static? ( dev-libs/nettle:=[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
+REQUIRED_USE=dhcp-tools? ( dhcp ) dnssec? ( !nettlehash ) lua? ( script ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) libidn2? ( idn )
+SLOT=0
+SRC_URI=https://thekelleys.org.uk/dnsmasq/dnsmasq-2.87.tar.xz
+_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=df0ae969219d25641a993c52366b7df4
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 1680c50a266b..fbbc5dab18eb 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/systemd-252_rc2 b/metadata/md5-cache/sys-apps/systemd-252_rc3
index c0e065600c73..8740f751faed 100644
--- a/metadata/md5-cache/sys-apps/systemd-252_rc2
+++ b/metadata/md5-cache/sys-apps/systemd-252_rc3
@@ -12,6 +12,6 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v252-rc2/systemd-252-rc2.tar.gz
+SRC_URI=https://github.com/systemd/systemd/archive/v252-rc3/systemd-252-rc3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0e289c36798f3a6c74237c7ae801435f
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index f95892b81ab0..661dbc7b5d0e 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/cgit-1.2.3-r201 b/metadata/md5-cache/www-apps/cgit-1.2.3-r201
index 87f1fc66b78a..b074e461d2eb 100644
--- a/metadata/md5-cache/www-apps/cgit-1.2.3-r201
+++ b/metadata/md5-cache/www-apps/cgit-1.2.3-r201
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://git.zx2c4.com/cgit/about
 INHERIT=lua-single python-single-r1 toolchain-funcs webapp
 IUSE=doc +highlight +lua test lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 vhosts
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~riscv x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) acct-group/cgit acct-user/cgit dev-libs/openssl:0= dev-vcs/git highlight? ( python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygments[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygments[python_targets_python3_11(-)] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-libs/zlib virtual/httpd-cgi app-admin/webapp-config
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.1.tar.xz https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=d5a23e588ef1c1d516b429db78af6442
+_md5_=5ef246bf20bd7916f60477287d1ef23c
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f272d4830bd1..e8d10a31c53a 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-24T20:09:43Z
+TIMESTAMP 2022-10-25T02:09:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNW8QdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNXRWtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBFfhAAtBdbJORTgshuIVXUW/vYUpDzFv/MHKsTkrlxfOE22r++SDr97Hpc2iCN
-YCHUQajWmN7+/Z6bfKbIYO5lgV0rIUclrYZcw1dRevJCQmFSv/0fgfHx4R87/ne8
-cfzlgSsUSHNZjmc0XTyu57cSJWWHXY/uXxzm8OwZg+fTnR2OBeQSXqicLhL13PGw
-6PBTKnwPS3fT6O2rfdAGO4ZfLsAJJ76/856EWAh/AyCy6WXlDSKO5t7zLEAWCttc
-ce1ejlo60zFwwDjdOnD9qa5xyXjGULCvrsc1BXqS+5l7Kj4IOCD4C5ZhtrO1Vn9T
-25iATrtwyWw1wZ7UGd+NEaAxbHmV4JM8zXq6UeWY7AgYzbKiZQfdImC9WDMxDves
-QtaJMhSBCS2g6YZ3ktLbd/XcRchQnXpDGDG8VvXJSjC1wbATv0eg4/KBfXNGE+Gf
-Q6Hhe2/LaGGWsxXKXfxfwaWVI+fM0J4nUR9dFpOw81iau0YI1enjWwCDPPo7OMA5
-6chlV3sLkH7vtT//os7YQ9x1l9UxY9Do+BH/capnfnB6cfaekxUKfNbAVXwAS0Xc
-u5pH56tFjlIHK/J8/muEBVl4hHgKqOMdaC0DDS2D6e4vz/7umQe658dnFfhSRGlM
-h5iRrBXBfs696g8+g41VGE2VOxVrg8oUnTLsgW7Epegr+2JjAV8=
-=07Xb
+klDwVQ//Y7q949oCW1H3XQTQlLEWCZNKxHUkwdvtmWMwLqDOFfpuC7pBgq9NoOzK
+Xg+tw7SIvW54BIehuBZdGMFnzyzrN04Nb1ySfLSArRq90jEtS/HplGaQFmaEPYmM
+OCSbcU1jqCZdItWNOWcqgXW2R0yBpoG8JKW57Azhxaz3oNLwcdh9Gt3YpptlqTyP
+O/W4qCmpnwSCElQbFaNP4m7lGCmOGVFTy4RpBytZL2MQ7sYHHZtjoUGhylMIYnby
+tsLdAuoHu2x4GdJAivjvNezj/9WJ9PLn0hM953vgAJsi+FbYGQGmCPWMWL9ruAwC
+Xl2jbIqVBR/UM2Pe29u+A46CXNSr0BkUzUASatzd8GpbX/vziJqA/FySANqdXwlP
+c7nrf/5k2mPmkzI+9S4chVI07ql0l8+SOVwaY/TzUbSsd6U+kcDOe86UAjIyoULG
+uPiL7KwHPGd/L95yGJrT7oCggcwffjKkWDA2iD9wzKAZJfnL51dwI4wlCc7JuVod
+Z6z6+45E+QY6qSuRup+Ij22FUjSO1/QIVITi6+LEAnlwOzf5MtR03nR7agY0Lk+u
+Ql3BVEYlLI/iegD2jK5fIgIz7+AM5r6FtkhM/ciNtsKerggBAe6aUCFlATAXutVQ
+6EcgLx4q0pz55uvp0NlSBGd5HvtrypTAMm0S+DT0K6SjKP897jk=
+=y2rm
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index fd9dfcff6690..cc1b9917b005 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 20:09:40 +0000
+Tue, 25 Oct 2022 02:09:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index dff3a370c8b5..8af5a2483c75 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Oct 24 08:09:40 PM UTC 2022
+Tue Oct 25 02:09:43 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b7b2159b3f38..feaf1599f9d5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 20:15:01 +0000
+Tue, 25 Oct 2022 02:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 0ad63d43e22c..54dc8d743588 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-19e2b06c9c1dfc0405636ad80630ade354780825 1666641139 2022-10-24T19:52:19+00:00
+8b85c29a41964b220eefb29f07173158787aab8a 1666660071 2022-10-25T01:07:51+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c8acf4caeb89..88684807427d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666642201 Mon 24 Oct 2022 08:10:01 PM UTC
+1666663801 Tue 25 Oct 2022 02:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fd9dfcff6690..cc1b9917b005 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 24 Oct 2022 20:09:40 +0000
+Tue, 25 Oct 2022 02:09:44 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index a65fc717a137..62fc14367a57 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 9c7d1d855689..163fd3365e0a 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -5,6 +5,8 @@ AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f900
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.85.tar.xz 518316 BLAKE2B b7c081132c65d67b65f797bdbc603930c1509717bc1b5209b12f72fa3f01b4bae2f26a5387f95ef20317cd3d60e097c0b8bef5e019a35013f3ed2acce9fe9e89 SHA512 8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09
 DIST dnsmasq-2.86.tar.xz 531404 BLAKE2B 27307c70cc90d6e27dbf8e87589b8c72622e93f402c3a431e06facc58a62af46a478d1fdbfb9808a91ff3d2f5da88a8d12de9755009b558d685903e4d2a34de3 SHA512 487eae0afbc8bb3d5282a729ffb0cb2c9bdc7d8e46e2e8aa114cd7c5d82e0fd66f49926e7fa4028577548d6f57e8a865aca17f33963a589874584d608ab2deaf
+DIST dnsmasq-2.87.tar.xz 540528 BLAKE2B 9d348f1746f819ea5da90ac341bd82254ec83acd8193732f99312d5c56073c8f3f374bf89cecec4fe58632c9e9f84e312a5474c561420dfd8537e221ecf68e2f SHA512 965071ff35aed558a661e7f57ff82de170f4ad7fcdd6a4070ce7915c9f5e41450d8d86b2a0c2c30bf52ddc3aaeb22af18bb6da71a1cccb3c409429ef0ef308f3
 EBUILD dnsmasq-2.85.ebuild 4656 BLAKE2B 8dafe90669b9cd371966234f3d076b4c9c67b2fd0d5130132a0cd7994e883438dcad3685619cb72c7e251c34ab2cbfa31add28c60fc3262a992321432da4f574 SHA512 93b2d5567a602d94d1ed4924bc14b934f3bc18cfa285006ae84815e81c589fd8ff22f1586c5621555b64dca0d6d6361893aa5ac5963aa1e665d7b403b7ebc03d
 EBUILD dnsmasq-2.86-r1.ebuild 4797 BLAKE2B c6bc501df8d1c53ea6097c5aee31fc7eb01323a0351a393457e44df151e6236bae3206982ef9830aa0419939da820c114d5c81bf2eaeef37ea2d0e3bb42a60d0 SHA512 c082f6952dcd8f23f0697c12825fe92472f812b0c4648de309c30a4f8854569346a15765476ac6acdf5c32c878a2aca43eeb5b049d527e5e8694758cc7343a27
+EBUILD dnsmasq-2.87.ebuild 4804 BLAKE2B bf4fa9076366569ed6af2d16c908dc79857993f6bccec41f53273f41d627e94af1cc83c53725bf68d760749e2f858cbf7f410fe92d093c15dedddbbeebe93590 SHA512 d1e4f1bf65fe0937e4b15bbe837e1345e9bf486da46a9c2ec287a89830fb2e3845579098173caf138d12c9e15448cec6611c13d4d662a386a0e6ed9cbf9d6dd8
 MISC metadata.xml 1449 BLAKE2B 532b630e5c03652df74dec95bbb6c1c03b0d8a8fbc78ed1b2d40f47fdfbc20ce21172259f630acb5d14eb32b849d1d5b34482ffe77d4b5eee64051e839f17607 SHA512 e58549ceaf7a252f0b8b4c3a678cbc57bca66bf749bffbf8ec5544e79a380af695e3412c8d59d941bd08ed6cb95ab27bc2a13fbc46a4f5368d9e209e3e33bc99
diff --git a/net-dns/dnsmasq/dnsmasq-2.87.ebuild b/net-dns/dnsmasq/dnsmasq-2.87.ebuild
new file mode 100644
index 000000000000..5aa821ad8ac8
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.87.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit toolchain-funcs lua-single systemd
+
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="https://thekelleys.org.uk/dnsmasq/doc.html"
+SRC_URI="https://thekelleys.org.uk/dnsmasq/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
+IUSE+=" +loop +inotify ipv6 lua nettlehash nls script selinux static tftp"
+
+DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
+
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="
+	acct-group/dnsmasq
+	acct-user/dnsmasq
+	dbus? ( sys-apps/dbus:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= )
+		libidn2? ( >=net-dns/libidn2-2.0:= )
+	)
+	lua? ( ${LUA_DEPS} )
+	conntrack? ( net-libs/libnetfilter_conntrack:= )
+	nls? ( sys-devel/gettext )
+"
+
+DEPEND="${COMMON_DEPEND}
+	dnssec? (
+		dev-libs/nettle:=[gmp]
+		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
+	)
+	nettlehash? (
+		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	dnssec? (
+		!static? ( >=dev-libs/nettle-3.4:=[gmp] )
+	)
+	nettlehash? (
+		!static? ( dev-libs/nettle:=[gmp] )
+	)
+	selinux? ( sec-policy/selinux-dnsmasq )
+"
+
+REQUIRED_USE="
+	dhcp-tools? ( dhcp )
+	dnssec? ( !nettlehash )
+	lua? (
+		script
+		${LUA_REQUIRED_USE}
+	)
+	libidn2? ( idn )
+"
+
+use_have() {
+	local no_only
+	if [[ ${1} == '-n' ]]; then
+		no_only=1
+		shift
+	fi
+	local useflag="${1}"
+	shift
+
+	local uword="${1:-${useflag}}"
+	shift
+
+	while [[ ${uword} ]]; do
+		uword="${uword^^}"
+
+		if ! use "${useflag}"; then
+			printf -- " -DNO_%s" "${uword}"
+		elif [[ -z "${no_only}" ]]; then
+			printf -- " -DHAVE_%s" "${uword}"
+		fi
+		uword="${1}"
+		shift
+	done
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+pkg_pretend() {
+	if use static; then
+		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
+		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \
+			"in this case the static USE flag does nothing."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile || die
+	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \
+		dnsmasq.conf.example || die
+}
+
+src_configure() {
+	COPTS=(
+		$(use_have -n auth-dns auth)
+		$(use_have conntrack)
+		$(use_have dbus)
+		$(use libidn2 || use_have idn)
+		$(use_have libidn2)
+		$(use_have -n inotify)
+		$(use_have -n dhcp dhcp dhcp6)
+		$(use_have -n ipv6 ipv6 dhcp6)
+		$(use_have -n id id)
+		$(use_have -n loop)
+		$(use_have lua luascript)
+		$(use_have -n script)
+		$(use_have -n tftp)
+		$(use_have dnssec)
+		$(use_have nettlehash)
+		$(use_have static dnssec_static)
+		$(use_have -n dumpfile)
+	)
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		COPTS="${COPTS[*]}" \
+		CONFFILE="/etc/${PN}.conf" \
+		all$(use nls && printf -- "-i18n\n")
+
+	use dhcp-tools && emake -C contrib/lease-tools \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		all
+}
+
+src_install() {
+	local lingua puid
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		COPTS="${COPTS[*]}" \
+		DESTDIR="${ED}" \
+		install$(use nls && printf -- "-i18n\n")
+
+	for lingua in "${DM_LINGUAS[@]}"; do
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${ED}"/usr/share/locale/${lingua}
+	done
+	[[ -d "${D}"/usr/share/locale/ ]] && \
+		rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/
+
+	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
+	dodoc -r logo
+
+	docinto html/
+	dodoc *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
+
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	insinto /usr/share/dnsmasq
+	doins trust-anchors.conf
+
+	if use dhcp; then
+		keepdir /var/lib/misc
+		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
+	fi
+	if use dbus; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+
+	if use dhcp-tools; then
+		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
+		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
+		if use ipv6; then
+			dosbin contrib/lease-tools/dhcp_release6
+			doman contrib/lease-tools/dhcp_release6.1
+		fi
+	fi
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+}
+
+pkg_preinst() {
+	[[ -f /var/lib/misc/dnsmasq.leases ]] && \
+		cp /var/lib/misc/dnsmasq.leases "${T}"
+}
+
+pkg_postinst() {
+	[[ -f "${T}"/dnsmasq.leases ]] && \
+		cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b553152cea09..db4276a08f7a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 1801b2547f90..bd9129490a4e 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -5,13 +5,13 @@ AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed6
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-252-rc2.tar.gz 11736313 BLAKE2B 58efe76846b034ec61136fe01f535b40aabc993ffee687d4a22a20d93a3952fd15e4ac46591934a441f4e74cffec29145f441d97a69a5c456e7a3caee92602cc SHA512 f67703dcd03b300cddc2e8bfbeb843ef66ba0b0c548973797a920c1bed9e3a14a740e08936f7d906141da714bccbae0d4fcb47a7ce13e69c8a2f17d7928e218c
+DIST systemd-252-rc3.tar.gz 11754095 BLAKE2B a1eb08336e47c7c68b31b48a69cb71bd4ebb96912af6a05731979dd64ed6eb9eea729fa2d240d5f2abe7b306b0778bee7ab82e0ffd075f04566f983c557b41f2 SHA512 3968f1df6eab12bb3fe9575e1bd9c87f7e1f45d22c404f250a0dc3e0da801cb089a5e4a1ebc9ef0e3b38c47d55db895eca3da419e757bc1e7f825d154e9b5468
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
 DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
 EBUILD systemd-251.4.ebuild 15500 BLAKE2B c8ea106e1dbbf830fba008ed6f70486e36a62947cf390f436b2c45856a8f3fc74d819f67983dde5fa49b854cf91e3c76e4ccb7d99af9c9753cc7a0183d8bb0d3 SHA512 f97e89cbc1fad054b265878f0f55b7bbfccdecc1f907743d4373cb7a9783805ea1e5536ad5fe759da4e3b6954146c9b456ce4147fa86f41c61187b11333ee8ec
 EBUILD systemd-251.5.ebuild 15508 BLAKE2B dd89dde571cfd27fad856e2802c8b837d96b567f07fcae62af911f9dc6ebf6752ef7a287a7f1d695695a8f84cd43638a156101fcd53488fd25bdf43d65cb8560 SHA512 1c4b6a2dd35171dea0363d1331bfa67967fdb9bc8025cf4b3fea7b20af60748373473a3efed0710a8c86762ba53fb3bdcd0df62bb1e70a55a43a1ab722171ecd
 EBUILD systemd-251.6.ebuild 15557 BLAKE2B 124b3527e460ec93d8a1f5a5fea3f435aa8db9a6b25b729ef46480b451a89aa77800d7a6062b7ba94d817152951f6f22c58d68708e2fd0fafbf73841b23bb9a0 SHA512 09f4318b267ef45fcd92d4ce3f25d5c6e665f0d1662cb339796c60e38c48ab780977d93f816f80c8e7512f6cb2c9802e68914375b351a08d14d96d2ff30365e5
-EBUILD systemd-252_rc2.ebuild 15373 BLAKE2B 05086c1624ee74cc5942c0a3d861d8aaca5415ff3e28d9abdf7f405d50499789f8e61aa19308313715b77c55419be5e4735930921e9cd7fe0f3b175affe71213 SHA512 0e7cf6a4a5639554cc3c9d58bb61e03461a44a6e0eedfa36fcf586124b3705ecfb785bde6df136b560e12253963ab05aaae6439a7228284bcbbb64cb5fb5310f
+EBUILD systemd-252_rc3.ebuild 15373 BLAKE2B 05086c1624ee74cc5942c0a3d861d8aaca5415ff3e28d9abdf7f405d50499789f8e61aa19308313715b77c55419be5e4735930921e9cd7fe0f3b175affe71213 SHA512 0e7cf6a4a5639554cc3c9d58bb61e03461a44a6e0eedfa36fcf586124b3705ecfb785bde6df136b560e12253963ab05aaae6439a7228284bcbbb64cb5fb5310f
 EBUILD systemd-9999.ebuild 15372 BLAKE2B f480ab02dd6910b271805ef126bfefd478b9c94487dd4d2134edebd5a15e780ecb9104ae16a0f50dd921f642cb78389ffb486cc9ea76ea3d4db863a0db12d63f SHA512 ee3c87a63e7295e02679364f7337985eaf073026e57672b6352bb65979224791e491222b4309ca66ecc4df6c1b312acb4b706419299800fa8c94e179c235f5c6
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/systemd-252_rc2.ebuild b/sys-apps/systemd/systemd-252_rc3.ebuild
index 2b38fab6fdb7..2b38fab6fdb7 100644
--- a/sys-apps/systemd/systemd-252_rc2.ebuild
+++ b/sys-apps/systemd/systemd-252_rc3.ebuild
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 7d6da201c348..847b946ee028 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index e51ef32d8995..e4240a90abf9 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -3,5 +3,5 @@ AUX postinstall-en.txt 1847 BLAKE2B 20dab86a97dc42b4b6c16db6d72a3bd74a2ad2d0948a
 DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e4d6dc8c737daa565d01ba6840933c0bdc53d4eb683b2f44e2fae885ddd020cfb2de38141a870a6eae2380 SHA512 58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504
 DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344
 EBUILD cgit-1.2.3-r100.ebuild 2383 BLAKE2B 900ad85af0923fb039dd32531370860a52717bb8ba77822e028ac8b664cd0673964425a7d086ad2eba28d873604147e6f0aa143ab729ce36ac5d8ce2de4f7590 SHA512 df5bdbdb0e7c27de5414685f836dab07df25c7723d57e827c874f482ce09ae0b9feb47cbb188eace40afdaaffec52730853df42a00bc3a5753904d63fbfe02da
-EBUILD cgit-1.2.3-r201.ebuild 2788 BLAKE2B 3f5f64b648887db97b3ba436e41c612dcc90ede9c9d33fe3b54ecd9695f2b2c70a7f4c38e673afc7ea62561522307462482fdc073ad7007b18bd930a00a79924 SHA512 895e5af4cf47633ddc878f10c31ffc45ce257d0001aebe2584100f43847f2533d76cde46ad54b3e0ec327a627035758eb071a47b0222cbc8ddcaba941dabf2e0
+EBUILD cgit-1.2.3-r201.ebuild 2795 BLAKE2B c77572ad42dda4b43f71a0e7b842d8307ad876d4bc304389f0a64276abf24ea0fd277f9ae46c11104c69eb0ac2a993f72ef0c1d081ab4714869f0c2f36007502 SHA512 9847f1fc346fae27c7eaca43298dc4aeab7f422120ad4afacf20c17462b91e9771ceaa12f784f56e25f1e5961f6c0e3c2b39822edcc0fa54c25fa323fd3691e5
 MISC metadata.xml 582 BLAKE2B 581c8c3d61029e5857f51951bff4df8b71f0a01964a5bb822c06969d219b852f74bc56ced4f7434356cdf67b4c6dba6cb3ad1732875a7a1e62b36880c83d94c7 SHA512 bbc7e8dbd323908b9b03597a884a20a7d6d820b757fa912951bdc700ef2072880ff2412c5dcb724420e7d288e772e9f88aded81b981c47b72be4e9fa8c23cd9a
diff --git a/www-apps/cgit/cgit-1.2.3-r201.ebuild b/www-apps/cgit/cgit-1.2.3-r201.ebuild
index 579c8c34abcd..e897bc2878e1 100644
--- a/www-apps/cgit/cgit-1.2.3-r201.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r201.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~riscv x86"
 IUSE="doc +highlight +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"