gentoo auto-resync : 26:07:2022 - 02:57:39

146 files changed, 1111 insertions, 927 deletions

diff --git a/Manifest b/Manifest
index 8e282cee8074..d4941a39fefd 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29601 BLAKE2B 2038302905863a9bd33723076df8fed09de855521e140be5cdbe9a2f6f8141613797ae1deafa075294f7d07065518cba645ff3a082fa353cfd6b0a031e92b132 SHA512 06014e58e6772041760770109046fb60d48f990064e34d0dc23fbe1d3cbb7808d54ccc137d9d47f5195c4bb7dc2b2ad3904e47e5f62c8c6964a94c2c46b271d1
-TIMESTAMP 2022-07-25T18:40:01Z
+MANIFEST Manifest.files.gz 29591 BLAKE2B 692b6f4419c1d22d2bea5b6986aea287e544425f85463ca4435c108f10eae23b96a1bae57f65bf50b41725eadc453bb36c441d647fb40f5d24f00cb1e5fc234d SHA512 03fe5a83261ed287b5635b5556e5276469f82d044abd2ef6b24474e31c68a08ac6dd116ac792cbe1d0d1959e248963e3790553211b8436e24cfc8d6499d6a98e
+TIMESTAMP 2022-07-26T00:39:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLe44FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLfN91fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDE3A/7BQ5DgSl44GhMdY6kpJQ9Sq0pujwJa5L2uAz/RRK2F0LXvCiuin+jG9bp
-FqxUgs+yGX5hHiRRtl78nXQebj7LltNFyg7aHBvnn92vDPr5fMHxVHnameVy336k
-01PnuNmX7ilFPf0vWkrJSuLL0y/IHZv4zvpMhXGdnma+nKGymubhKzlyWCOUbXf6
-NCIu8/Igj7vzeymd2OZC3OlTpfImsdRiKY9ZaBhonxm5wIgJeYmiG05DBaUySf+f
-Hx1mx1aRSS77Gr1BX9osub+tp9oQ2cgfOtJ6BQxbfNdpPKRVJAL+mkXnfDb9fNk2
-+KltJDH4HcilJ6dOAxpVyMwPp+fHKdLsXKCb3PjoIcxTWraffpSAEbBzduJFSh0H
-CwlRoTSD5sD0hxo595C1rBWoshwV8mZXwrJ3hwPJxWu8lS1XuriyWEoTHs7GsrGW
-adoPnCOtb6HUWKJ7clWTRp1dr0RuH+DQy948NJvPJDOnU/0H10fNBW7UxsZ/q1yG
-XTpNvObAShyaOM0f58x8deeHkVAt+k1096gxFWIlR/QpA896uZzd7/CwbwudlQFY
-puMKQiTYugMNHb1QWbCDyV+b8Qp9F8VEJibeNhY2UM1Gq8umwPoa75TQTTWAza64
-sNhrsmUihEsrYZkDlPjsraibRNAj1uTS2vs2Dv0hF+bZEzXNnug=
-=iFhr
+klCpXw//YuwaHqBVo8yq/lqbKc653BMdD/jJA+ZS8FvELQW1qt4AkbRRTQtfbIRD
+aEEOppUApMxmtcAr6kf0mDOKiJ2OroIF23If/BetzRCcrbKVRSXmw4FXuDeHEsdh
+2AxXtFSYzJEBFSqblWgs9ZI7/b99yYJrWC/OV7DTxQov8+8ImBjQ1oHUlTiE4Ss2
+vaoiBc4JgSLONcZZAILI6lVMb4nrWQanhX379Vaogx/4Xz5CHC2uV+Gx364FmSpE
+kzE3n350spDW0hZshVVzs8T8cQ3unJ/HKd6P/rMpQBJSN1DdFRm3MMKs8s9b9uC2
+8zMFSTuCRw40motoIMKwsY69Sr9UXtyvK+zGSXoQR4jWLPKVzo5we9U1yWdRCoGA
+iPxCRDn/f1PxHHlA8Y1jOrwvw85Fx1k9MtjqM7at9ftSdtFNysSvG5Qlap+p5wuB
+VUh+RwOCsDFMLEfPByx2XymcfbQUDyjdgYxJyM1jx18FVwUpj53OZxuCOPPtdAq7
+v//wP6mQ7oEfacsME6D3q18GCk9vMkKDWzfbZafNVs1S0EfNJcwAZKfz14TwC58a
+eW5M5KsGQMFX4+s/+EjRYLCuLVlc8gkpj8dmNFwwWBwy0qYmimlRnEEXi8Rp4RTG
+B/T+Z/ud5di4MKKOrscxHSrEQrBAFVm3kxYQCg4mUHAGarB4H7Y=
+=UKGY
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4ae0b24f46c0..079d32e7b389 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 536b06579c4d..f691163b23af 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/_cron-failure/Manifest b/acct-group/_cron-failure/Manifest
new file mode 100644
index 000000000000..a5f6205511e3
--- /dev/null
+++ b/acct-group/_cron-failure/Manifest
@@ -0,0 +1,2 @@
+EBUILD _cron-failure-0.ebuild 221 BLAKE2B 8625398c98447733942e1e014028671a38271077e053679bca23c2fef26245e392c15ac34ff3c6f6f54c4aeff15fd1c13ba6cd29f2687d4068231d03992bacd8 SHA512 9939dbf258d5b5fc94c2a7c0a3311d91cc0461449110453ee9c5bfb97aa83ee11162803adf3f3a952b9bb484f84717457158135725154ae9bb85de2ceb0564b3
+MISC metadata.xml 248 BLAKE2B a5a7d9bcd542fe55d50fed508ef21f6a820aee11993d27e8ffb967f55cf3f8a02846c96499f1112e1b58f4a93b8b6fce596589e653fe161bb94c1b5868bd6dd5 SHA512 a45b735f6fec1b6bbce0a559869d9ac99c13b2dceb0d2b23f6fdd32fb7b6d44a2b199f47d89418784243fafafeea56094e0e0c7a90b67cad5cefcc94bf1423d4
diff --git a/acct-group/_cron-failure/_cron-failure-0.ebuild b/acct-group/_cron-failure/_cron-failure-0.ebuild
new file mode 100644
index 000000000000..499125526ff5
--- /dev/null
+++ b/acct-group/_cron-failure/_cron-failure-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for sys-process/systemd-cron failuire emails"
+
+ACCT_GROUP_ID="520"
diff --git a/acct-group/_cron-failure/metadata.xml b/acct-group/_cron-failure/metadata.xml
new file mode 100644
index 000000000000..f12053059b44
--- /dev/null
+++ b/acct-group/_cron-failure/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rich0@gentoo.org</email>
+		<name>Richard Freeman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 67f01ed1945a..e70e69f221a7 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/_cron-failure/Manifest b/acct-user/_cron-failure/Manifest
new file mode 100644
index 000000000000..2203ae226109
--- /dev/null
+++ b/acct-user/_cron-failure/Manifest
@@ -0,0 +1,2 @@
+EBUILD _cron-failure-0.ebuild 266 BLAKE2B 3f61b95a651927ba4b697d32235a082ee665ef54db582e52f8629896560fa425c3e6c4caeae0f485cba8f117c4aa815027da081d618bbd1f5ec9b98d0d8bd043 SHA512 136bf1ccb93a45957af54d9fe33d57eeddd785821ca3945a4f241cd2a4fad346f4c81a628e8916aab1b9fcbfcb07c7ef92adf65bfae24da8dd5d1f3d786c9248
+MISC metadata.xml 248 BLAKE2B a5a7d9bcd542fe55d50fed508ef21f6a820aee11993d27e8ffb967f55cf3f8a02846c96499f1112e1b58f4a93b8b6fce596589e653fe161bb94c1b5868bd6dd5 SHA512 a45b735f6fec1b6bbce0a559869d9ac99c13b2dceb0d2b23f6fdd32fb7b6d44a2b199f47d89418784243fafafeea56094e0e0c7a90b67cad5cefcc94bf1423d4
diff --git a/acct-user/_cron-failure/_cron-failure-0.ebuild b/acct-user/_cron-failure/_cron-failure-0.ebuild
new file mode 100644
index 000000000000..bf25d6b1fc4d
--- /dev/null
+++ b/acct-user/_cron-failure/_cron-failure-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/systemd-cron failure emails"
+ACCT_USER_ID="520"
+ACCT_USER_GROUPS=( _cron-failure )
+
+acct-user_add_deps
diff --git a/acct-user/_cron-failure/metadata.xml b/acct-user/_cron-failure/metadata.xml
new file mode 100644
index 000000000000..f12053059b44
--- /dev/null
+++ b/acct-user/_cron-failure/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rich0@gentoo.org</email>
+		<name>Richard Freeman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3bfd0053dc6a..8f498ec260b5 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index d333244df399..c46499e403cf 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,11 +1,9 @@
 DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
-DIST ansible-core-2.12.6.tar.gz 7761844 BLAKE2B 37fe58bd04fcd59bb8085c31d8d7b4d4298c7911acb2a5988afa7a3b9d856769f0a737179f8d4828fd94a1a6c5e029385a7514a5f1b5155fffd6b8aa7ae7427f SHA512 55138701f3733b1ea2049783d9d0246beb7cc778090785eada756c9ef540b248bc345e07a261d5542648fc22088bc25e3ab57f7b904bba615264d5556baae456
 DIST ansible-core-2.12.7.tar.gz 7756456 BLAKE2B e9c5b446fbd80524572646667875afa26a28cd6f8a0c138383ef2af7fe2e51ba5dcbb19bdbb00e7e367ba78f9667be0b03320f887367dc5cc3d18cfc33ebf89b SHA512 15b29bc52cbcd690d442e4923bad23c2b4db34b1d9af9a7e3a73fbad6b4d775795a44df80c739ad409206767f6bc9efc3d5abdab593fb2abd6ba991ca8cbee67
 DIST ansible-core-2.13.0.tar.gz 7383065 BLAKE2B 14c9c30a1d04c4235877da9a2d866bae229fa0bb28815dccc2cbc37ca7a767a6a15b2ae1824849cb2c7031b3c3bdcac433b04bf353265228ab2beec7650aa7b9 SHA512 37e17d73477ba88c62af94a6912f9b4b91ebf2ac967c2845875e293fe2ed09307e414644899714e604883973e241eed571d61b7a093a6c212446a1f5b702af6f
 DIST ansible-core-2.13.1.tar.gz 7407801 BLAKE2B 230dd2f1030c6da89d5e2be6ea7d83b78c05b4216bad6d99b51807cdd3114d13cfbc8cc3b5c3583249937f774ce5b15ba1d524f8d68c201d3042ff1350981921 SHA512 f40ec5c8fdcc1e3f2ed78f398561aca5bfd4793a5f4d9240930f7aaf96233f05c7177304c30c06115943b5b9e9944286f01545cedd378e9c3e7f93c3ebce7c78
 DIST ansible-core-2.13.2.tar.gz 13332205 BLAKE2B 446421a6ab86e1edd1087506c48b8d7eceaaa594a0c866fc3639c4b5a3809b4e5a7d39feb94a56be112dda585994291e07194f7e3392d0dbe6e088cf7327b9be SHA512 a57cf0388c0866b30513a84733208b85b5d352755e884021ec5120f32b5b76d751f9f03320336744d925f69f6b35064eb58081029f49f7987b9a877913c3c29b
 EBUILD ansible-base-2.11.7.ebuild 1648 BLAKE2B cfa73eefc856be5b4a7a71b37fd62b3142f09a9d2a89bb94f20d8c362bce8606e00a0efe2db3824e7e15008f346c1dddb217bacd559a410a031a76e5487b95b1 SHA512 0f71b29df5a4acf4d11eb088c567b0d00d8a1f5880e86053281165cdd36a6630339a90d5a122746e4d057b754cb19754a6d790aadc687bd8602697d91decf6f5
-EBUILD ansible-base-2.12.6.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
 EBUILD ansible-base-2.12.7.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
 EBUILD ansible-base-2.13.0.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
 EBUILD ansible-base-2.13.1.ebuild 1649 BLAKE2B 1da2acd0074a8055f58bbc07ef6db49b8901f9261fb6466a6c37c229111a74513bbe1f21c2d22ecc4d2c0a7554fec997845df268b3eb8572830a25775ba493cf SHA512 ff174eea7a471f473a8c8d6ff7ace6bfcc877e0b1903628657909ebbd16477f410bb2a386e30ab1aa3897ebcdf76be1a4ab7f38314ff8c54450cf777ff537786
diff --git a/app-admin/ansible-base/ansible-base-2.12.6.ebuild b/app-admin/ansible-base/ansible-base-2.12.6.ebuild
deleted file mode 100644
index e8c2a3cb1c45..000000000000
--- a/app-admin/ansible-base/ansible-base-2.12.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 19bc71e7d3f0..88b3d08109ac 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,9 +1,4 @@
-DIST keepassxc-2.6.6-src.tar.xz 7640532 BLAKE2B ed55dfe992c02e78354d7aeb9f63853380dbcdec0e834232997cb6f5ecc303ff18ed50dcc48f54497031d6fc8b741c620202e78c3eacbe50d4dcfa7e4d59a92c SHA512 175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
-DIST keepassxc-2.7.0-src.tar.xz 8846780 BLAKE2B 74c4e9c6d06239950f1b8a64c5bce894799fdd73a562ee22d1189c60dedfff3555132c0619488e0682e94de8759e096627520b96d664f472645e4b6375d68ff9 SHA512 0fc436ae5fb8fb82765a0c2df20c9567b1baf6aceff1e08c843a151ddcc0920d4cb2d416aebd89bdd8f1b53efb0a4ad0f579955c6943ee66c20b0becbb978e12
 DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
-EBUILD keepassxc-2.6.6.ebuild 2310 BLAKE2B befacb8a5edf657b7dc182b4c1b5580a30e037342d590df9ba4450d2344c0a208ba09b59047880638cbc8c68f4bdd5653cfba873e6682949f967c40d545952fd SHA512 6f5d85aa92508284a335374c4b4c190104e4e70c4c4c228f7015e0c15efdb28931f2d97748ed30edd7fc09d65a0017cef2cb5bd28731cc3cace80dfc2b01db4f
-EBUILD keepassxc-2.6.9999.ebuild 2421 BLAKE2B 61776556c98951a5637c881e7dc7dbc6110c2fd378aac1ec275ae69896a158ae08b186091d332ccd430aed5ab797d4d94413d4dbf19d928727cf673f48f211d1 SHA512 a90c09435e52bd44d7f46821cbaf2c0ed20d23d9d03a702bc105b760983ee8f3771613b14e745becc26ee0de14cfc54eed91d56fb138140df2405b6facc5b155
-EBUILD keepassxc-2.7.0-r2.ebuild 2373 BLAKE2B 809a51c4a615d96f25022b0d277fc40501566734abf7cd8c73e24a9a573a73d7cb958deff3de8182c0c3b5e224afc4ed1e4d0b77f2e64059c7553fa49ab70110 SHA512 5509b00aa287d9704f82b72e4e5a8734096bbc33b7893134223fac52c6b7e4ea787ab1791bcdf86edf0f061cd8bbe1b75129b3446721dd655464677902c718c2
 EBUILD keepassxc-2.7.1-r1.ebuild 2371 BLAKE2B 9bd8707b862566c9b1c1ddda68ef69e6a17f576ab4eb0a987a177220192a6af12696079fc98a3e840a481f9ea2bd7fc8acc314dd610f518b8abc3eb2b7407878 SHA512 436e42d7de68f4424c1acae462163628d9c7ddc498aa894f86020d6aa7a690651ec858643cfb5e21576ef651db605697c5aaa9c051c9325caf29b6e0fb37fcea
 EBUILD keepassxc-9999.ebuild 2373 BLAKE2B 809a51c4a615d96f25022b0d277fc40501566734abf7cd8c73e24a9a573a73d7cb958deff3de8182c0c3b5e224afc4ed1e4d0b77f2e64059c7553fa49ab70110 SHA512 5509b00aa287d9704f82b72e4e5a8734096bbc33b7893134223fac52c6b7e4ea787ab1791bcdf86edf0f061cd8bbe1b75129b3446721dd655464677902c718c2
-MISC metadata.xml 1107 BLAKE2B 2821f7921a418f0761049591f86c2b827748276fbf671fbda0ed3c73aad3d82b0d612fcdf9434ff5dee66b261c191d041ce130a90f8e70874d504e057129bac1 SHA512 4a9995a6bedfc729b75ab4b7997cd014d565c2ba2ce1e689a950d51fe49fed7a47f657dda381c999b2a9ccaecf3bffb14914473cc5147e305a39c0f606ef4c7d
+MISC metadata.xml 1028 BLAKE2B bc89e683ead8dfcedd9c1794c35df27ca535b69ce0036641d71c7df8a2db70060adc0d34a007c9da69765dea4fbfe5df5349d880197e2cbdb7f6c5347baed78f SHA512 abe1527cdd2c26b8f64d6b7e8651325146ffbbd53dc9cf273599901e9e9ac31bd43f2c85d8aad1067ccf807cbcad3d921d76df3666b8983eafe69589c7bd0647
diff --git a/app-admin/keepassxc/keepassxc-2.6.6.ebuild b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
deleted file mode 100644
index 2c4ae038afba..000000000000
--- a/app-admin/keepassxc/keepassxc-2.6.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
-	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-	fi
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/libgcrypt:=
-	>=dev-libs/libsodium-1.0.12:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-gfx/qrencode:=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	autotype? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXtst
-	)
-	keeshare? ( dev-libs/quazip:0= )
-	yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-"
-BDEPEND="
-	ccache? ( dev-util/ccache )
-	doc? ( dev-ruby/asciidoctor )
-"
-
-src_prepare() {
-	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then
-		printf '%s' "${PV}" > .version || die
-	fi
-
-	 cmake_src_prepare
-}
-
-src_configure() {
-	# https://github.com/keepassxreboot/keepassxc/issues/5801
-	filter-flags -flto*
-
-	local mycmakeargs=(
-		-DWITH_CCACHE="$(usex ccache)"
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_DOCS="$(usex doc)"
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_FDOSECRETS=ON
-		-DWITH_XC_KEESHARE="$(usex keeshare)"
-		-DWITH_XC_KEESHARE_SECURE="$(usex keeshare)"
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_UPDATECHECK=OFF
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-	fi
-	cmake_src_configure
-}
diff --git a/app-admin/keepassxc/keepassxc-2.6.9999.ebuild b/app-admin/keepassxc/keepassxc-2.6.9999.ebuild
deleted file mode 100644
index 606bf9740f31..000000000000
--- a/app-admin/keepassxc/keepassxc-2.6.9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != *9999 ]] ; then
-	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-	fi
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/libgcrypt:=
-	>=dev-libs/libsodium-1.0.12:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-gfx/qrencode:=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	autotype? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXtst
-	)
-	keeshare? ( sys-libs/zlib:=[minizip] )
-	yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-"
-BDEPEND="
-	ccache? ( dev-util/ccache )
-	doc? ( dev-ruby/asciidoctor )
-"
-
-src_prepare() {
-	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
-		printf '%s' "${PV}" > .version || die
-	fi
-
-	 cmake_src_prepare
-}
-
-src_configure() {
-	# https://github.com/keepassxreboot/keepassxc/issues/5801
-	filter-flags -flto*
-
-	local mycmakeargs=(
-		-DWITH_CCACHE="$(usex ccache)"
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_DOCS="$(usex doc)"
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_FDOSECRETS=ON
-		-DWITH_XC_KEESHARE="$(usex keeshare)"
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_UPDATECHECK=OFF
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-	fi
-	if [[ "${PV}" != 9999 ]] ; then
-		mycmakeargs+=( -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" )
-	fi
-	cmake_src_configure
-}
diff --git a/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
deleted file mode 100644
index d148084c50be..000000000000
--- a/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != *9999 ]] ; then
-	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-	fi
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/botan:2=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-gfx/qrencode:=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	autotype? (
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	keeshare? ( sys-libs/zlib:=[minizip] )
-	yubikey? (
-		dev-libs/libusb:1
-		sys-apps/pcsc-lite
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-"
-BDEPEND="
-	doc? ( dev-ruby/asciidoctor )
-"
-
-src_prepare() {
-	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
-		printf '%s' "${PV}" > .version || die
-	fi
-
-	 cmake_src_prepare
-}
-
-src_configure() {
-	# https://github.com/keepassxreboot/keepassxc/issues/5801
-	filter-flags -flto*
-
-	local mycmakeargs=(
-		# Gentoo users enable ccache via e.g. FEATURES=ccache or
-		# other means. We don't want the build system to enable it for us.
-		-DWITH_CCACHE=OFF
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_DOCS="$(usex doc)"
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_FDOSECRETS=ON
-		-DWITH_XC_KEESHARE="$(usex keeshare)"
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_UPDATECHECK=OFF
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-	fi
-	cmake_src_configure
-}
diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
index 38521204bca7..a608739dade1 100644
--- a/app-admin/keepassxc/metadata.xml
+++ b/app-admin/keepassxc/metadata.xml
@@ -12,7 +12,6 @@
 	<use>
 		<flag name="autotype">Add support to autotype the passwords into other applications</flag>
 		<flag name="browser">Enables browser plugin support</flag>
-		<flag name="ccache">Use <pkg>dev-util/ccache</pkg> to build keepassxc</flag>
 		<flag name="keeshare">Enable KeeShare sharing integration</flag>
 		<flag name="network">Enable network support</flag>
 		<flag name="yubikey">Enable database unlocking via YubiKey.</flag>
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 71b598d9b950..fb6b1180619f 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -23,6 +23,7 @@ AUX salt-3004.1-relax-pyzmq-dep.patch 348 BLAKE2B 75a5947cf6f92fd08da25d50b9064d
 AUX salt-3004.1-tests.patch 13025 BLAKE2B fd86808b3d43a25abb88f5d454dd2618d896aa8c8ff843d4f9b46ff32d98d07d245d308599d0a93814d80ff9b1cb120da4296b6f06f64825da4ce603ec37d4fb SHA512 4634fe96479c481fdb9daf8decd3632e9ed8daa9ab62942d71bd6c11e603ae5ac96acfdb68e4e91ec2c829efd33689fa122bc53979b7b5ce02ea63189bebe349
 AUX salt-3004.2-importlib.patch 584 BLAKE2B f9ccf7a6205228dc12847d9c86b7d9e539fdbccc1e27a77fccf05622b53f58504226f2eb4aecb2a5bf95789cf72c43e86ab22cb190d62aca903b0d14373a3df0 SHA512 61b966f010445c8a594a5c618441b33e9f7feb9481972aa4c7246d977003c5605c152459eeebc0922c2d9d7e28436243f891e738856a86a88a82a7489825f52a
 AUX salt-3004.2-jinja-3.patch 589 BLAKE2B 249e81ea2760cbe75ff66bfd86cbfaab58ea673fea240bb9e787896b89645ef523c0d98305214bcce545a7372e8bc545b6ae385ca3311d71cf7bd6fd66f52c7c SHA512 6615f5824c5b53a426395bf7def9c8f54f3c753f28f3e3b23119849900f10686968cec0787d4ffa16bbbd763a19072348617165e1af6a0f87bb81e9fd8be20e6
+AUX salt-3004.2-pyzmq-23.patch 1605 BLAKE2B b0c3e9722f0ff88b586f7e9f863d246a35bc10789568e1f4c3f9728022032dc8686ba0988a35225d2d01d00198c8a00253ec33331e24d6c3a7100d4a10c576ab SHA512 57a5c5a23ec1fd450e1f24740d6cd1d4b29947de5b5d984b7a55c89791e7b7f0eef44390cd9f959210b6c27fdb325650edeb2a53b3302f925ad182ee4ac8ac1c
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@@ -36,7 +37,7 @@ DIST salt-3004.1.tar.gz 17685649 BLAKE2B 64950cdc8420228f935d4a21fc20872da9ecf7c
 DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef
 EBUILD salt-3002.9.ebuild 6672 BLAKE2B 01d02dd2411a676649d24af08a24d32426c98c1a6f8e3f0ebb96244bd55183e57f3a713fe9e65ea96093f0121374ba8dc933653b625be393c9a67620e06e2d55 SHA512 fbf0cfcde4fcb77614784a251d349a6d79e206fba8e673cc62419d23c8b2672d88a6b8adaa0b3840cb5771fbea3700b6f4bb57d8bbbb417d144f7fc5310f8554
 EBUILD salt-3003.4-r1.ebuild 6933 BLAKE2B c99f429003c7992c9b9271413ce4929c2e4a3fb49d3dae818a37a7e9253165cce99625a4c298cd6065781564eb1b838edc5cfca437dbc7103878131bc5de1671 SHA512 52719d14b8bbdd55c4f4aff007733cf5a889339d6187caeb5c57a5a2bd53b999b910dda0213db50fc5224f0e01f9380ada63c1e8f344530ea60d6f6cbb9498d0
-EBUILD salt-3003.5.ebuild 6977 BLAKE2B 351fab851936ea48deeb04f7906a517c17ba8afe01e2e5de577f38f53c6dae2f44b472a8e48762cae87d400b6d2cb1f6f1a0ca5a9c03bb9cd2b54c9f4fd902b4 SHA512 e3369d27258116f6f49d3d182654899f8be044b1210140af73a39d020d2cb3dd4f44245ff70ab0d8d0c303c89ae0a22d5a2efb87a600e13d1fc8895f62e0aefc
+EBUILD salt-3003.5-r1.ebuild 7019 BLAKE2B 950714a06b7eb3f531c2a00cd8c58283db9750567b3f4f5434123b1bdbc57c19f97de507f8c307f200a92c6659167024aa2dae736ef4b061f7252337d3be54c5 SHA512 9ca17e369d90f7e52b9809debfdb36a6ad8d1049ba5ac585ead0d2281903d23d276af75356ffe3fb791e5c7c3a3f1aa6f26c1f6215274aa2c1136175d72725aa
 EBUILD salt-3004.1-r4.ebuild 7044 BLAKE2B fd253f8e588516e95519f0c503993887305952541dcbc3a62577a47909bd8160c6f2f46043843a3c473817f85bb8e2fd4eac6aea50e299a11a12f0ba7eb76084 SHA512 45d34cf7e65102f1f3c70a922b07cd419ad9fea8af9407cd6c2a84308cf9823bb31e7cb39ab0b4bb4b572025bd83a8e2a916353722e16b5bbacdb4d2d225d75a
-EBUILD salt-3004.2.ebuild 7089 BLAKE2B d157190c3455e865038f79c4c2c4058a48df4490858b06c18d799dd7fcdbc74b57e873404065e4c1de90c6196d14932b421d7ef17200f03160eb7b1c26f92166 SHA512 2398b3360f90992027d9dd49c524a315638e6399adfd865b06f78148be4332e1d57cafb3d9a969501fae47d6e64b4a193d34436be00b6e0aba0f5aec69aae3e0
+EBUILD salt-3004.2-r1.ebuild 7131 BLAKE2B 3ec4877f34a0ad3f3a410246cb85392edecd36c4c555f29405d988792f184f966dab438083223daa4a0152f17761b2ba2177efa9c362e05b7a13750143c4542a SHA512 bcd078ccb72cf1aa197f938e13c9be7ef7dbeeab56f6fa82e6652d9d6e2290d0482227a7397af8bd82b91eb738ad3343a287ca16116e6f452160cc8fd6f994bc
 MISC metadata.xml 2362 BLAKE2B 60fd7a02823e610b4d12b1d4c6a066cf16f8ef4094397553381d62bc027715164f02ccad4c86e431a30822d5c4c25e4eebd814f99e43b7a45bc08a3fd885cfee SHA512 4aa7549a76e69233949c68841bfcdba6630eeb78a507f20119469f7835a6532b737f41d117c09b1e4c7574f95dec759deacf5d5482be961755d63a19b9eee9a7
diff --git a/app-admin/salt/files/salt-3004.2-pyzmq-23.patch b/app-admin/salt/files/salt-3004.2-pyzmq-23.patch
new file mode 100644
index 000000000000..d912757ba7b8
--- /dev/null
+++ b/app-admin/salt/files/salt-3004.2-pyzmq-23.patch
@@ -0,0 +1,35 @@
+diff --git a/salt/log/handlers/logstash_mod.py b/salt/log/handlers/logstash_mod.py
+index bc462018f5..7e0d98c5ba 100644
+--- a/salt/log/handlers/logstash_mod.py
++++ b/salt/log/handlers/logstash_mod.py
+@@ -160,6 +160,8 @@ import logging
+ import logging.handlers
+ import os
+ 
++import zmq
++
+ import salt.utils.json
+ import salt.utils.network
+ import salt.utils.stringutils
+@@ -435,7 +437,7 @@ class ZMQLogstashHander(logging.Handler, NewStyleClassMixIn):
+                 # Above the defined high water mark(unsent messages), start
+                 # dropping them
+                 self._publisher.setsockopt(zmq.HWM, self._zmq_hwm)
+-            except AttributeError:
++            except (AttributeError, zmq.error.ZMQError):
+                 # In ZMQ >= 3.0, there are separate send and receive HWM
+                 # settings
+                 self._publisher.setsockopt(zmq.SNDHWM, self._zmq_hwm)
+diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
+index dc024d7eff..4c989095a5 100644
+--- a/salt/transport/zeromq.py
++++ b/salt/transport/zeromq.py
+@@ -902,7 +902,7 @@ class ZeroMQPubServerChannel(salt.transport.server.PubServerChannel):
+         try:
+             pub_sock.setsockopt(zmq.HWM, self.opts.get("pub_hwm", 1000))
+         # in zmq >= 3.0, there are separate send and receive HWM settings
+-        except AttributeError:
++        except (AttributeError, zmq.error.ZMQError):
+             # Set the High Water Marks. For more information on HWM, see:
+             # http://api.zeromq.org/4-1:zmq-setsockopt
+             pub_sock.setsockopt(zmq.SNDHWM, self.opts.get("pub_hwm", 1000))
diff --git a/app-admin/salt/salt-3003.5.ebuild b/app-admin/salt/salt-3003.5-r1.ebuild
index c3ba4ac9a49e..e46b069a8edb 100644
--- a/app-admin/salt/salt-3003.5.ebuild
+++ b/app-admin/salt/salt-3003.5-r1.ebuild
@@ -114,6 +114,7 @@ PATCHES=(
 	"${FILESDIR}/salt-3004.2-jinja-3.patch"
 	"${FILESDIR}/salt-3003.4-tests.patch"
 	"${FILESDIR}/salt-3003.4-relax-pyzmq-dep.patch"
+	"${FILESDIR}/salt-3004.2-pyzmq-23.patch"
 )
 
 python_prepare_all() {
diff --git a/app-admin/salt/salt-3004.2.ebuild b/app-admin/salt/salt-3004.2-r1.ebuild
index dcc6f23bd8b9..373dd7c97624 100644
--- a/app-admin/salt/salt-3004.2.ebuild
+++ b/app-admin/salt/salt-3004.2-r1.ebuild
@@ -113,6 +113,7 @@ PATCHES=(
 	"${FILESDIR}/salt-3004.1-relax-pyzmq-dep.patch"
 	"${FILESDIR}/salt-3004.1-py310.patch"
 	"${FILESDIR}/salt-3004.2-importlib.patch"
+	"${FILESDIR}/salt-3004.2-pyzmq-23.patch"
 )
 
 python_prepare_all() {
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 55dce77ed3f5..6696746017fa 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 6ed01118b600..214b83298d78 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -2,6 +2,8 @@ AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
 DIST borgmatic-1.6.1.tar.gz 300375 BLAKE2B b56c31da62591b8bfd3c0146e77cab7ab28f942c59ca0f6cf7342d80bc31249dfcbd59fae13025a0fe464de326b6758169be983d2b741ecc37062961541fb892 SHA512 c48fb89167ce188feeb9d51ae9caabf985f9c583d09840d3dd4aaf772a4acbd3c22399958740820b9fbf61603769a604dc92b72448e2c7196fae855549f3c6d5
 DIST borgmatic-1.6.5.tar.gz 322857 BLAKE2B 8d342800ad92a9bddae95eb7b0ee8aabdf792f4b36e696ae15c7dd1318f18c983dad4984c7a7a0a0aeab21760533655d97bc199cd3066dbb01f329cc1c7d15d2 SHA512 26438886b9b22760c12565a58e2337a45fad5d54e3fb061119c73b2a2ac36b3decdff656303796649107a74de8a5a09f8edd70b4e1d94533a662a67d2f124b95
+DIST borgmatic-1.6.6.tar.gz 323601 BLAKE2B b40d8f00e3b7bbd343336cf4c6992e34d8289de451c184717827e8e43519b84d4bb9b8cff6a835a7cc502d2e93045f0196d744e4b6ad800de1276e11c3189cec SHA512 f1a6dfa344ebee89e88f1aa6b43d8493c80815c637d8e0f7f6314462fd511b576e62246d957023ab2f9a68875d2818e2b8ef00cbf3339dc35a93d6ebad0bed19
 EBUILD borgmatic-1.6.1.ebuild 1904 BLAKE2B 7b8c6ec7ce028a24d68d7ff2e27bbc5bcacb8df2e73c557b7ddd403205bcdb732e63e2188566af5f7db23e68dbbc073aec584023e8e0406543c95df6bf64093a SHA512 00b517d74bbc68b814b039492e92ac36b7d96f1626ae6f7187cff72b2387b657bec4d4d3c7f6c777d74ad2e07231b5d72c878ac88c7dece7ebdb2c6a61b3efbc
 EBUILD borgmatic-1.6.5.ebuild 1905 BLAKE2B 10224bb4e213836832f4485be1aa572062d4e840c0c74fe45791020f99153315eb1459febeb57e790ad8f73f4f1102cc6f7919147ca967fa5aeb71e725d3f44b SHA512 7c1f1d3a5b05bda5581e1a6fc81af6763a0e1094373bd0476cd19de3537602191b9d60154c9f170207fcff28d89ede7b1ec189c07265718dc469bd928a55c439
+EBUILD borgmatic-1.6.6.ebuild 1905 BLAKE2B 10224bb4e213836832f4485be1aa572062d4e840c0c74fe45791020f99153315eb1459febeb57e790ad8f73f4f1102cc6f7919147ca967fa5aeb71e725d3f44b SHA512 7c1f1d3a5b05bda5581e1a6fc81af6763a0e1094373bd0476cd19de3537602191b9d60154c9f170207fcff28d89ede7b1ec189c07265718dc469bd928a55c439
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.6.6.ebuild b/app-backup/borgmatic/borgmatic-1.6.6.ebuild
new file mode 100644
index 000000000000..502919f25ae7
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.6.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+	$(python_gen_cond_dep '
+		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
+)
+
+# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
+# executable so making it work would require passing --install
+# to distutils_enable_tests. Given that this is the only test requiring
+# this and that all it does is make sure the NEWS file has been updated
+# for the current version, just skip it.
+EPYTEST_DESELECT=(
+	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit sample/systemd/borgmatic.{service,timer}
+	keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    generate-borgmatic-config"
+	fi
+	elog
+	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 02d38a4a5dbd..048dc4bbfb47 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/aspell-da/Manifest b/app-dicts/aspell-da/Manifest
index d1fbb4ea633b..c91594c4235e 100644
--- a/app-dicts/aspell-da/Manifest
+++ b/app-dicts/aspell-da/Manifest
@@ -1,5 +1,3 @@
 DIST aspell-da-4.0.tar.gz 4208911 BLAKE2B 828176450a1d6e5e2e9b07d16c785239a012fc8382d92fcddf6dec812abbf49048b2f1c15de6655e09d74d2f65cd1a43939b3bee8f036ccfdd441f66b5ea259e SHA512 bbc0c4cc0202f989770d84ac9b5ff688b4c8bf0fef7128c36e54c7e4d09e8233eeee986def9a5d75c05d2599eaf96db4be212f6dc758bd23f723f611bf545ba5
-DIST new_aspell-da-1.7.42.tar.bz2 235483 BLAKE2B 0d5ac9c7457b460410734a36e376387d9aaa4444771dcafb85c80b0d2ca4441b906ef485d5016e9d51985147b9759c4677664c01dd9d68c340ba947efac0d932 SHA512 97d3bc95800d5115ce640a3939bf6c94998f1090f1484da3ffb1104318200ca3650d2b32120c36030b87b4b929b95b8f764f6f51dee66ee916700318f6b4e755
-EBUILD aspell-da-1.7.42-r1.ebuild 399 BLAKE2B 77d0f4ebe23e6fbb04322d2afcb43cfe0b1e9e1886041be2dd1f6037733e16c98f349ef05b666c0a962268d4174c04a3cd0b01d38042e75eadfda9d56d31e625 SHA512 b250da94b6ab193c1e83f6d8be8883c963b4524193e1bce67bc3e303784b9120859790fc4125ad63fd33f5003e91cfdf082ecf73413d2497a384da156f2dc329
-EBUILD aspell-da-4.0.ebuild 455 BLAKE2B 22677c6069ea70d722417262460ce82baeaa228ef08baed2449c6aba65cbf108dcb5128ed452657fcab9ddbcbec8c08bdf3c24bfd9a277341e7a10153944ba55 SHA512 79ba6a15b5e6fd6b3afea99b5f69aa03708818acccdc92e51bd59f491c5f0b87a09161730d9523472b96182002ff27569258af60267e1312877b0e7e2635ad62
+EBUILD aspell-da-4.0.ebuild 448 BLAKE2B 122178a52be12fd9b2e9d3c9ed8c4e6f345c35b9dd4629d3483723e5e8a6cb0d2321af04035c7b614d0059e74aa66d97e9ecc8de016d7dc9fc71211ad81a59aa SHA512 e3a832d942be4ac23dde982a2aa59cba6d144ab2d13893f8c144e868c7287b72745465ae7327b3020438e305b16025ac2003ac92d74394903adad28dd9e7aad9
 MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-da/aspell-da-1.7.42-r1.ebuild b/app-dicts/aspell-da/aspell-da-1.7.42-r1.ebuild
deleted file mode 100644
index 7db9d52494c3..000000000000
--- a/app-dicts/aspell-da/aspell-da-1.7.42-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ASPELL_LANG="Danish"
-
-inherit aspell-dict-r1
-
-HOMEPAGE="https://da.speling.org"
-SRC_URI="https://da.speling.org/filer/new_${P}.tar.bz2"
-S="${WORKDIR}/new_${P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
diff --git a/app-dicts/aspell-da/aspell-da-4.0.ebuild b/app-dicts/aspell-da/aspell-da-4.0.ebuild
index 26c8f5f9d04d..bd50dd9f1db9 100644
--- a/app-dicts/aspell-da/aspell-da-4.0.ebuild
+++ b/app-dicts/aspell-da/aspell-da-4.0.ebuild
@@ -12,4 +12,4 @@ SRC_URI="https://github.com/mortenivar/${PN}/archive/refs/tags/${PV}.tar.gz -> $
 S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
diff --git a/app-dicts/aspell-pl/Manifest b/app-dicts/aspell-pl/Manifest
index 33f753241d08..4de1cd3e9046 100644
--- a/app-dicts/aspell-pl/Manifest
+++ b/app-dicts/aspell-pl/Manifest
@@ -1,5 +1,3 @@
-DIST sjp-aspell6-pl-6.0_20210731-0.tar.bz2 639979 BLAKE2B 52a0c1a2f8c7a260dc99acb52371bde4efcd3ac5327dbf668c099cfc071b4e0ced8f747b6136d69e750efa56c4e6ef85f9f8582947afecca68de53d0b8d07597 SHA512 e72bc953e9da7571d167423ad1cf46327f0be46fab7421f57c5d3250bffc506c7e6cc9957bf340bb03884725617b110af5cd4f5219ee42f1f2f8709a4329cc6d
 DIST sjp-aspell6-pl-6.0_20220601-0.tar.bz2 650672 BLAKE2B cf8212d0ecfa482fd60c4a1b39c3a45c9d47c522899bf243bbe5f0d2dbfe51b8e444950c59b25a210fa8c210a03db03374b24e64350dcf10ce63ab8354b8c026 SHA512 9d3eda4ede1f1ab24b4fc3c9be049fd74711e1a6cd8632d8c8d5248d96b63264cf67f7ed783595142cb632904c15f7f13b887f5ae6656744ae9cc97adfc1ac9e
-EBUILD aspell-pl-6.0.20210731.0-r1.ebuild 501 BLAKE2B ec6a7f1513b54ee5a80dd20641ee1f75a82e6fc20fee312ff2d13555a4b83f934a90667c13330f21edaff35fdcba27c700c0d7cea826c53ad0db4f90875342c3 SHA512 6025003626a72d7fe6d1c8e4d3676b2d8a0d1a845da13b5dfe4c9d9fb71b4c725c24a1a5c891235afc8d4d5dbd33b1b4dbcf2d0b99f0c3f944c8107521f2fd75
-EBUILD aspell-pl-6.0.20220601.0.ebuild 508 BLAKE2B 38e6dcbeadd15e6efefa6abbfbb264f03d3692fb92a8df1621bc9ea9835159d76eccfefa789fd4441ec458d1d0ce29e81ce0f0335b5fbd40f6a4161acf805272 SHA512 163e56f674b5a3b0692f1a435525725d7b5ddfc1c58a60874c179b047d868d8cd6ed9df4bdb147da8990b19ba1f414c1f10ab22f26a3e6a2cdf408ad48e7eb1f
+EBUILD aspell-pl-6.0.20220601.0.ebuild 501 BLAKE2B ec6a7f1513b54ee5a80dd20641ee1f75a82e6fc20fee312ff2d13555a4b83f934a90667c13330f21edaff35fdcba27c700c0d7cea826c53ad0db4f90875342c3 SHA512 6025003626a72d7fe6d1c8e4d3676b2d8a0d1a845da13b5dfe4c9d9fb71b4c725c24a1a5c891235afc8d4d5dbd33b1b4dbcf2d0b99f0c3f944c8107521f2fd75
 MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20210731.0-r1.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20210731.0-r1.ebuild
deleted file mode 100644
index 2ecd46b7bf54..000000000000
--- a/app-dicts/aspell-pl/aspell-pl-6.0.20210731.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ASPELL_LANG="Polish"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-HOMEPAGE="https://sjp.pl/slownik/en/"
-
-MY_P="sjp-${PN/aspell/aspell6}-$(ver_rs 2 _ 3 -)"
-SRC_URI="https://sjp.pl/slownik/ort/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P/sjp-/}"
-
-LICENSE="Apache-2.0 CC-BY-4.0 GPL-2 LGPL-2.1 MPL-1.1 "
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20220601.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20220601.0.ebuild
index 3b9d01e9c8bd..2ecd46b7bf54 100644
--- a/app-dicts/aspell-pl/aspell-pl-6.0.20220601.0.ebuild
+++ b/app-dicts/aspell-pl/aspell-pl-6.0.20220601.0.ebuild
@@ -15,4 +15,4 @@ SRC_URI="https://sjp.pl/slownik/ort/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P/sjp-/}"
 
 LICENSE="Apache-2.0 CC-BY-4.0 GPL-2 LGPL-2.1 MPL-1.1 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 54e996d7dbe7..1838e3e94dbe 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/ifuse/Manifest b/app-pda/ifuse/Manifest
index e4993534360e..71b58203b67a 100644
--- a/app-pda/ifuse/Manifest
+++ b/app-pda/ifuse/Manifest
@@ -1,3 +1,5 @@
 DIST ifuse-1.1.3.tar.bz2 90803 BLAKE2B fd47f2e73d11e8f7c26f5684f4287ba51a8c65b0d6e0ff058bdd0290810ab9de671a2a61a089713e7560506f607d47692d882c7e49d8d3d154f9cf7940e5e153 SHA512 bacf0b00ebc7681022f6e85daa005ee19c99f3222e5db5c4ea6630c2c46111dd3ccd7efcfdbcfabf06cc18ceb58b054c1adb2d106d9b3b7d60a12f3b79c64a3c
+DIST ifuse-1.1.4.tar.bz2 94137 BLAKE2B 0abe1a2324820380faf5868f59a45c11aab8991ff8529bd6f64a279b046da88a9cd35b352cd89b4a64d36f35c56b46efab5138f3b72ec8886103ffaaeeff50f1 SHA512 671fabb0828fb6dd5ddba80ef418005305f4ee4676ab1078513a83582e84616f47c8973c25e1fdd8897b08a01a135080898a55d3ad8b31e89c0bb72ee865cdff
 EBUILD ifuse-1.1.3-r1.ebuild 894 BLAKE2B a6633a4d83b6f856940252ff65352d134f68a8f44c6b2a3d4d22b77e74261a9fbae9c9532f68d52310952fde2d7032add3b9004a06d3ce2cc16116a47c0a9285 SHA512 e41469aeaae2509e224c28e47d81a6810398561454834eb9c94c88114d72a9459d5af0c2d5463f80d852fd8504d8f33fed8f20352321b3654d2fbf6ca5e686a8
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD ifuse-1.1.4.ebuild 987 BLAKE2B 16bfafd59b0239dba4db31404a4d16492963e899f8d869390af0d26bb0909bd1d00d8908d761c9693886328c515145b8eac96b733857132edf6c50dfe5f7ce88 SHA512 4c3ac74d3b99872d937fc8968cbea37c061c3d8142ecf26ba3d10842980678162ceb27f8d38e5dd1651dd560c700ab3b94f9043ef6086e5f24953f2c14047bcb
+MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
diff --git a/app-pda/ifuse/ifuse-1.1.4.ebuild b/app-pda/ifuse/ifuse-1.1.4.ebuild
new file mode 100644
index 000000000000..5e92a5c73c47
--- /dev/null
+++ b/app-pda/ifuse/ifuse-1.1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="Mount Apple iPhone/iPod Touch file systems for backup purposes"
+HOMEPAGE="https://www.libimobiledevice.org/ https://github.com/libimobiledevice/ifuse/"
+SRC_URI="https://github.com/libimobiledevice/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=app-pda/libimobiledevice-1.3.0:=
+	>=app-pda/libplist-2.2:=
+	sys-fs/fuse:0
+"
+RDEPEND="
+	${DEPEND}
+	app-pda/usbmuxd
+"
+BDEPEND="virtual/pkgconfig"
+
+DOC_CONTENTS="Only use this filesystem driver to create backups of your data.
+The music database is hashed, and attempting to add files will cause the
+iPod/iPhone to consider your database unauthorised.
+It will respond by wiping all media files, requiring a restore through iTunes."
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-pda/ifuse/metadata.xml b/app-pda/ifuse/metadata.xml
index 85e4ed814fa2..e91ef31902f9 100644
--- a/app-pda/ifuse/metadata.xml
+++ b/app-pda/ifuse/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index f95f23a17d98..66fce32ad18b 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -2,4 +2,4 @@ AUX libimobiledevice-1.3.0-missing_libflags.patch 796 BLAKE2B 2887ea67b4eaaca48d
 AUX libimobiledevice-1.3.0-slibtool.patch 5477 BLAKE2B 963072a0e577c52a2434d011bf684c5955a473154ad9726e77ba6e818071c9955bdc72e510721b6161031e96db49069e84948dff8458fc510526b9f21f8d78e1 SHA512 5064091b7bf858f78df9aec94f39fad98ac4969aa5c8889891840d07b8a404a0ba46949a22688805610cfcf287695c08dc11912494d7fbb9de75e6867d8a1b4f
 DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8
 EBUILD libimobiledevice-1.3.0-r1.ebuild 2553 BLAKE2B 18e110080885b121f8fb3a53a86e034021cc896cd2ea73b4373f60646bd49184870af6efb90480a6084acadc8b066848f9bf89242918283626b690e7f5b8f2f9 SHA512 c62ac3b39e2734d9f766e64a9259953cc0cb623749ee497abdc12e979ac23190de5f8e3208c39b06d349d962d4a764619ebf4fe7c7652eb24f76805067647811
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
diff --git a/app-pda/libimobiledevice/metadata.xml b/app-pda/libimobiledevice/metadata.xml
index 85e4ed814fa2..e91ef31902f9 100644
--- a/app-pda/libimobiledevice/metadata.xml
+++ b/app-pda/libimobiledevice/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index d2fef6a08ac7..245be16f422e 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,5 +1,7 @@
 AUX libplist-2.2.0-fmin.patch 1102 BLAKE2B ce8c76a369ae1ddc54016bbc941efeafa96d093bce14c0cdaf1da17fe7d201673bd0565669dc12209ee1230b66f56750ba64e8431d72f0d118ea5880b0764a0e SHA512 683203116ffdae053c4da35704aaf2b707b804a19316286f890df4bb6a9ae8dd6b6a4ee0f6db6164f124887e8a602db709d985496b0734899826f04e19846d78
 AUX libplist-2.2.0-pkgconfig-lib.patch 305 BLAKE2B 67da57f080454e8b01408872ab76b66703e0339052f64c3738964b02e6a389b03aac65d7d6ca30bfd78b1366c4a7fec843b039b32269db0a4e7e95850638e34d SHA512 1c2c628f178ed64a8f7e1dd84657d7d365e980a2b2d8af9dd6bbe55d245997cf51974d9ed451eafb715299097029886f7ec0a863f199a72bf15f50281c9bfab7
+AUX libplist-2.2.0-strict-aliasing.patch 1128 BLAKE2B d38552a76f0e098c6df6eb8a4d71c7bf0fe4a41aeff87730d691497203c7057ffd84356ec671041dc02ef3762bbe2cd0cfa27d465a5be0a15ebf86e3ca91d789 SHA512 e00ab3cf2f0d0829c16e1d4b1fd4bce1265a740d872aee4d0112fb45c2919413c493ad70753a7186b27fbfe154f9826ac2024e142e9410c51a69d7e1ea782245
 DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
 EBUILD libplist-2.2.0-r3.ebuild 2659 BLAKE2B dc5c90aa4770d424f161cfcb67a2c0e9da7e0956489d0e60ea593891f01494bd8e196ae4c795a40700c17982896eb0db958afe82cef3edd448aa83d775b44eb0 SHA512 e44f5ed00b475d6c1deb94a97b51b6c9944107c1b7fdaab7ed4293a0e28d5d48bf270f42868bea2ae8b67128538988aa60f26497c9b3a9e75f46e536fd94fdc3
-MISC metadata.xml 330 BLAKE2B 23eb7febbdb22588ff674779fde51e4174153723207d80fb49fa3a0954a5335206b9be12e8993e40ae37a1b9136ed516f341153cd055a38307e9c2ceb8b1f3ae SHA512 43786efdbf6de2083880ebb84ebcaa15a5dbf833de6f38a8940400bddb585b827f8c0f115e19495bfe99ffbc6850adac39d92671b24df730a4795f5743bb0a25
+EBUILD libplist-2.2.0-r4.ebuild 2721 BLAKE2B ed9c587960db4d24c9e9c1739b253777a2a85c37e123870adb8d73d06e3659650ebc75c3677a060205bbe057fb0d36ed9c6a6a171e59197227eadb8e6c6a0b19 SHA512 d65cb2abd979ba1d60067ceeda82dab8915f478ff781c798e34fb8e5fba59fb34aeb370ff39aa04c37f73371bd44f90724343934e010f7dd0a11904bf5fd266e
+MISC metadata.xml 411 BLAKE2B 739995675d95e408b7ddd6092af57e2cd39a9aa129271de40119350926a75200962ccc35c463d304cfd3fc396f4a4e04ecdef752a506bbc576365c9b689a8d1b SHA512 82db103987ba57112cd18557114d82be89a1c3cc6da43334b16a1b22023fc5961be3c2abc3213be046ee370d3285717cf9c267ae97309065fe888f39fd75355c
diff --git a/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch b/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch
new file mode 100644
index 000000000000..2771a9f08a69
--- /dev/null
+++ b/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/854837
+https://github.com/libimobiledevice/libplist/pull/212
+--- a/src/bplist.c
++++ b/src/bplist.c
+@@ -998,18 +998,24 @@ static void write_real(bytearray_t * bplist, double val)
+     buff[7] = BPLIST_REAL | Log2(size);
+     if (size == sizeof(float)) {
+         float floatval = (float)val;
+-        *(uint32_t*)(buff+8) = float_bswap32(*(uint32_t*)&floatval);
++        uint32_t intval;
++        memcpy(&intval, &floatval, sizeof(float));
++        *(uint32_t*)(buff+8) = float_bswap32(intval);
+     } else {
+-        *(uint64_t*)(buff+8) = float_bswap64(*(uint64_t*)&val);
++        uint64_t intval;
++        memcpy(&intval, &val, sizeof(double));
++        *(uint64_t*)(buff+8) = float_bswap64(intval);
+     }
+     byte_array_append(bplist, buff+7, size+1);
+ }
+ 
+ static void write_date(bytearray_t * bplist, double val)
+ {
++    uint64_t intval;
++    memcpy(&intval, &val, sizeof(double));
+     uint8_t buff[16];
+     buff[7] = BPLIST_DATE | 3;
+-    *(uint64_t*)(buff+8) = float_bswap64(*(uint64_t*)&val);
++    *(uint64_t*)(buff+8) = float_bswap64(intval);
+     byte_array_append(bplist, buff+7, 9);
+ }
+ 
diff --git a/app-pda/libplist/libplist-2.2.0-r4.ebuild b/app-pda/libplist/libplist-2.2.0-r4.ebuild
new file mode 100644
index 000000000000..23ac7bf3d03d
--- /dev/null
+++ b/app-pda/libplist/libplist-2.2.0-r4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit autotools python-r1 toolchain-funcs
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/2.0-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-fmin.patch
+	"${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
+	"${FILESDIR}"/${PN}-2.2.0-strict-aliasing.patch # bug 854837
+)
+
+BUILD_DIR="${S}_build"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ECONF_SOURCE="${S}"
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf --disable-static "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure_python() {
+		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
+		do_configure "$@"
+	}
+
+	# Don't prefer clang.
+	tc-export CC CXX
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure_python
+}
+
+src_compile() {
+	local native_builddir=${BUILD_DIR}
+	ln -s "${native_builddir}/src/libplist-2.0.la" \
+		"${native_builddir}/src/libplist.la" || die
+
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			plist_la_LIBADD="${native_builddir}/src/libplist-2.0.la"
+	}
+
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	einstalldocs
+
+	if use python ; then
+		insinto /usr/include/plist/cython
+		doins cython/plist.pxd
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# temporary fix for 2.2.0 release:
+	# bug #733082,
+	# https://github.com/libimobiledevice/libplist/issues/163
+	# upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0
+	dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
+	dosym ./libplist++-2.0.so.3.3.0 /usr/$(get_libdir)/libplist++.so
+	dosym ./libplist-2.0.so.3.3.0 /usr/$(get_libdir)/libplist.so
+}
diff --git a/app-pda/libplist/metadata.xml b/app-pda/libplist/metadata.xml
index cf956930c00d..613a0433b959 100644
--- a/app-pda/libplist/metadata.xml
+++ b/app-pda/libplist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/libimobiledevice/libplist/issues</bugs-to>
 		<remote-id type="github">libimobiledevice/libplist</remote-id>
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index 1b3b15cd4a59..72f7ca60a22d 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,3 +1,3 @@
 DIST libusbmuxd-2.0.2.tar.bz2 43162 BLAKE2B e3559583e691a5f87a61ffece0ebf944d4aed48d37f83a504ee4d7a245e05511c6620c4a82d29bea2a10686910a14f7a730afec0f2cfc9435f748499e35df433 SHA512 3086ce1a05026afeabcdb5364ec30f4a6a5c84fe6f09e15ef6ff438bd3dfdb262ebdff94e5e0d0828b6d946bc8bdf01760271ba0d1fbf98d743dce149764a519
 EBUILD libusbmuxd-2.0.2-r1.ebuild 846 BLAKE2B 56cde05b94595aa7aa7e5438c1001a9940ee176769bb97caeec730a1a3c6618607ea4c247c6828194196c492170cb0fcddb3a4b7204c0ce4925a11e2a3bdcd3a SHA512 0c63b227f16b1bb0830a2da759d047f82a8f7048933b8210e3f0be7b891abfd3446baba11f3540e4c3cb33e3579f29551ce963251fea9edeed7f90aaf87d0548
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
diff --git a/app-pda/libusbmuxd/metadata.xml b/app-pda/libusbmuxd/metadata.xml
index 85e4ed814fa2..e91ef31902f9 100644
--- a/app-pda/libusbmuxd/metadata.xml
+++ b/app-pda/libusbmuxd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c8fda01fb2a1..51714d8f10ae 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 2983cf4cb029..63acef27ad9b 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,3 +1,4 @@
 DIST bibletime-3.0.3.tar.xz 1620012 BLAKE2B 5f2f5bb071d7ffb625bd687c99a328ba758f8e842138204aa770714f830594fe49c61a45e51f7de69d865b95b154ad934da7af49f391b22907773a1435e4fbbf SHA512 553549b39bf3341dbf310908b24db246d88ba01524d424de14ece35c12160565185547fc0250fe8bb248a32d8a012b99afbc022d9a513dcc916c3e8089f72090
+EBUILD bibletime-3.0.3-r1.ebuild 1177 BLAKE2B 3cf2706dd1dc048cd60144dda6fe05c38687d72d0aa7c5820692da3aaf1324af387dcf97bd905cfceaa11b8316943d3639e31cf44bf82220cc3192c14330c24b SHA512 900f8ea111778e8fb8020cf2c0a94acb8fa5ca079da1e850160eb4857174df9b1808d0afe11ef899e0add69cc42288946b22dc18bfc77dc04a933d2debba6549
 EBUILD bibletime-3.0.3.ebuild 1168 BLAKE2B 22689d994789740bab58092a0aad50c5e5e4a662900b80cc845e5fef488c899aadeff6dc99e1a9ba8c5b81708ec1ce054b5ec05b3e80e402bad5632cd941d5d6 SHA512 263a0bff2fe4ef3680705e809e9c3ff8e01f8832494c9e24bcbfb20f97e347cc0890c1faf9c767791f51c95ed627d2bfd6e306ce453cbe054b81960bffb3c393
 MISC metadata.xml 657 BLAKE2B d60c79c16a34ae0cbd43eb5de895cd675727712be5cc5b5a7f969a6d7e222e5cf1f1583308a2dbf3fee604f3bebdaa85ec97e94fcb0230ee856a988ad14ee175 SHA512 ce660bf9ad657a9f7409620d823655c4021492f4f9eb7f9621696600590a81a70c2e41a7e4a9ec156b3c7e75e2a427c0fa2cb183732efed5a9032fecb23664db
diff --git a/app-text/bibletime/bibletime-3.0.3-r1.ebuild b/app-text/bibletime/bibletime-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..3cb15a25d576
--- /dev/null
+++ b/app-text/bibletime/bibletime-3.0.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt Bible-study application using the SWORD library"
+HOMEPAGE="https://bibletime.info/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=app-text/sword-1.8.1
+	dev-cpp/clucene
+	dev-libs/icu
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-qt/qttest:5
+	net-misc/curl
+	sys-libs/zlib"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+		-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HANDBOOK_HTML=no
+		-DBUILD_HANDBOOK_PDF=no
+		-DBUILD_HOWTO_HTML=no
+		-DBUILD_HOWTO_PDF=no
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 32b9ff4ef7df..0b5d41505280 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 11a78d35f963..f06fa5ae1ff1 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,3 +1,5 @@
 DIST benchmark-1.6.1.tar.gz 184616 BLAKE2B bcbc69ae4c4f5f21ed8199f34faccf41a9b97d311aaeeba8cecb6acc47780c91d2cb41a1dadfe400accecd46f90f02211a219a0000739c122dc7398ae1fa76a7 SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67
+DIST benchmark-1.7.0.tar.gz 194165 BLAKE2B 2a5ae10fb1fd1d05da60287591a5ba16d9bf8f7c77d1f332a6482cba32841a00b1350bf83238d52e051bcf2f628ed8ffc9e1899c75337b8cd12d9fb1800fd5b0 SHA512 25f81930ce210e298d9cc67c965cc8937f66c53427b18a672338b86424eef32df877ec6b7a7106417464b29c5048b014fcc82cfa773168ed701aa47d01f39f82
 EBUILD benchmark-1.6.1.ebuild 912 BLAKE2B 4fa13b2ec4ce003a8dbc3d30a7e565e64a3397cf04b9a0fc97a306c97e3fe30079519735d50138fafc2fffa700543b72da6971b203626ab9fe060945f993a688 SHA512 5a0cdc46d1e9710a59f8d971bd1549796c7eb3df45c92b270c0719ca3fbb49f43bbb87cbdfd265f2d6e5a3ba34a2c2c5a48eb98ae20c6eaeabfd04023bdd6228
+EBUILD benchmark-1.7.0.ebuild 917 BLAKE2B da88887ddfb23f042f92148c22791bdd540992c1b545e4d91666374a25a8feeb5c236f7e8acec41488681ae3ff27a81ca6beb457b61482bea0f385d5a41dc9ce SHA512 903570dbe93163207afa70b6e06cc9e3f52a2ea9136d38b6136f568234946ac5b7fa08f074eda1dd56d62885989de355cfdaba659bc26e98960caa44156ab8cb
 MISC metadata.xml 563 BLAKE2B 2c825b6895d64a3e5e4ea6b61a707e03e14873bc5fbe9f67a756a56c8edd0dd04dd8f3aa1d1a80bf8b4921f25aad19320222b3607494ab512d3713152b1ce41e SHA512 09856cb99c18336b143b725f8acd7fce84d7cce2aea22f03f80934f6681161fcf667f084af236fd654051acf4a261c7e25026822ce3ab79d6fef0ea3212a601d
diff --git a/dev-cpp/benchmark/benchmark-1.7.0.ebuild b/dev-cpp/benchmark/benchmark-1.7.0.ebuild
new file mode 100644
index 000000000000..fdf73017860e
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A microbenchmark support library"
+HOMEPAGE="https://github.com/google/benchmark"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug doc lto test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.11.0 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
+		-DBENCHMARK_ENABLE_DOXYGEN=$(usex doc)
+		-DBENCHMARK_ENABLE_GTEST_TESTS=$(usex test)
+		-DBENCHMARK_ENABLE_LTO=$(usex lto)
+		-DBENCHMARK_ENABLE_TESTING=$(usex test)
+		-DBENCHMARK_ENABLE_WERROR=OFF
+		-DBENCHMARK_USE_BUNDLED_GTEST=OFF
+	)
+
+	use debug || append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/simpleini/Manifest b/dev-cpp/simpleini/Manifest
new file mode 100644
index 000000000000..fd00a6b3fa64
--- /dev/null
+++ b/dev-cpp/simpleini/Manifest
@@ -0,0 +1,3 @@
+DIST simpleini-4.19.tar.gz 62793 BLAKE2B f32a25743c89f954a0b1cce2cb29584d63083922b9b56d91b39412617067f7316ecb897474a7f3a4d550569a0d007e51780d3532079966a7ba72e2b89ff5a5cc SHA512 3f0f3120aca3350bab66fe1727f4d15536d933a0840a17b49203c2220fab7ace4383d856c1b77a84f4e36c9a5df0c3eb937ad729c977f84e7163d7e2cff400c5
+EBUILD simpleini-4.19.ebuild 1047 BLAKE2B 8b42b57fb12829b371732053a92da37fa3cd3f40b2d57c0117a49816ecb6ccfcd983de5ccf5911a42509aaa9e39276a69fe876d54cb9b13501b53145d9409afa SHA512 7286e10c0ac599f4500ebb37ab4c40c5e933ebc9e734be28ff392fb26d2420065277fb67e9eefdff1245dc280d71d4a6ffc48b990d5c6261cac7215f78078740
+MISC metadata.xml 337 BLAKE2B fa98273f3b1289d766527689796a928b6ac1bb7d325aba1fe5ddd52683004bf083c272491976cf5751116c643926188af906dc3bbcb8e857ba3c12cc8b0567cd SHA512 cf72312d53f82f169c7bd3f78b9d29224e50c760f0bb0afe69d522969eadb8535c1085369daf11c6bfaa23310cba1bc0053ee997c3aa27103e457209a60be0af
diff --git a/dev-cpp/simpleini/metadata.xml b/dev-cpp/simpleini/metadata.xml
new file mode 100644
index 000000000000..3d8641a5fa36
--- /dev/null
+++ b/dev-cpp/simpleini/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">brofield/simpleini</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/simpleini/simpleini-4.19.ebuild b/dev-cpp/simpleini/simpleini-4.19.ebuild
new file mode 100644
index 000000000000..acd530cf090e
--- /dev/null
+++ b/dev-cpp/simpleini/simpleini-4.19.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="C++ library providing a simple API to read and write INI-style files"
+HOMEPAGE="https://github.com/brofield/simpleini/"
+SRC_URI="https://github.com/brofield/simpleini/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+BDEPEND="test? ( virtual/pkgconfig )"
+
+src_compile() {
+	if use test; then
+		append-cppflags $($(tc-getPKG_CONFIG) --cflags gtest_main || die)
+		append-ldflags $(test-flags-CCLD -pthread)
+		append-libs $($(tc-getPKG_CONFIG) --libs gtest_main || die)
+		local emakeargs=(
+			{CC,CXX}="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CPPFLAGS="${CPPFLAGS}"
+			LDFLAGS="${LDFLAGS} ${LIBS}"
+		)
+		emake -C tests "${emakeargs[@]}"
+	fi
+}
+
+src_install() {
+	# note: skipping ConvertUTF, can use -DSI_CONVERT_ICU instead if needed
+	doheader SimpleIni.h
+	einstalldocs
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 044390955064..d73006c5d863 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index e35a631872ee..07a67233e2d5 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -1,3 +1,3 @@
 DIST stapler-1.0.0_p20220330.tar.gz 43659 BLAKE2B 10c24868d51086b37dd2d517aa84e3c3fc0b6becc7a29ebf496646bdd65494eb0c43488f725241d7bd7b3083ce5703538db3e05de9976a2e5029731fc2e645d2 SHA512 acd2dfec0dfab46b2cf6b440cba6c0db5399be2ba2194ca12530c311c6c5a8028614164af45b850061e7d22cbec33458ceff7757f1b104c722228dc2d02cae0a
-EBUILD stapler-1.0.0_p20220330.ebuild 621 BLAKE2B bdce8d4a2d60616f62a258b41256dacdaa7d5ca9b5459b03c71ed86626c743decd9c3f316e3466581ecb71a31d63e11095a683fb9cec7bece7a629dcdb044785 SHA512 458c31e889bebd92f4059a1c004b80c104c81ab84725d4a6d8e9ef54e8594a04c5fb264032ee7798c0ddf05840cec8412e8bd560a0f6858f53fe90347a309085
+EBUILD stapler-1.0.0_p20220330.ebuild 673 BLAKE2B e9d5b49dc5448440aef3e808d65f2798689dad337a109c77162010b743da3d73065c0005a37988bb197bc32783f5aeb28776e620f723b3a36d417c0a8e5740cb SHA512 9fbd50fb7199553c8f307fc1811bf78bb738e16e76b6414777bdf802483de148a4c0ee2b36d9fc0075b1403d3b69ccd649502f1c3e6553c1e498bf6fbfa7c50c
 MISC metadata.xml 398 BLAKE2B 3c566702150e77dd0ba58f667336f57c0347422496edeb4fdd53e0f131cb966d15781a5d5b5e13211b2385e410a1d12c064c3ffe66056395b6eeeccdcca1cc72 SHA512 802c118d28a07f7fba6558aaa8f60aef0ebf137395af566e273ba1d218712d1835c74f82c5160f12d120d8776cbaf4fe7d09827a84c1a5e234fef307e0835a18
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330.ebuild
index 01ff7eac5f7c..bcfda6105f88 100644
--- a/dev-python/stapler/stapler-1.0.0_p20220330.ebuild
+++ b/dev-python/stapler/stapler-1.0.0_p20220330.ebuild
@@ -19,8 +19,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	dev-python/PyPDF2[${PYTHON_USEDEP}]
-"
+DEPEND="test? ( dev-python/PyPDF2[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/PyPDF2[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 25fed4873c84..23eed55667d0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index aed72df9a166..d2095de63dcf 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -9,7 +9,13 @@ DIST gitlab-runner-15.0.0-deps.tar.xz 142912160 BLAKE2B e38db204edb80c76524f58aa
 DIST gitlab-runner-15.0.0.tar.gz 1273838 BLAKE2B ac80f8bdd4a750f86d34e98cefad9d3c4e345d9607669c1205e5fbba28f25a83be27c43850383fd81e8222426ed31c2738a59c22cd5b6b6e60765295e7437f17 SHA512 8ba54e690fc45c1e22d174b649fbe3cf78707fd5a146c738c73cba045e6ac00499ddedd7a5f905c0c7e4e804a533d3fc718f8f7ac3c9ec5581de4dd9b3599c80
 DIST gitlab-runner-15.1.0-deps.tar.xz 140961872 BLAKE2B 711d2d7b75ab287216963a3871bfcd755d4b5478a37bffcbc64dbe32b93b2c08ca94b0048847697ed83031fc160d9e36589734ccda36526e67d5b4ae621a644b SHA512 58d23e8d25a8c033b517c8f21e6a24c3c449eb7365ae074c18bbda6d2030cc053371da8d5899319a767c922c5923a9042629fe191ba714c3553eadaeb2756a2d
 DIST gitlab-runner-15.1.0.tar.gz 1287049 BLAKE2B 76b1c5b535e328941741e55e460de158bcf54d8fa76bc70eba1eed63e7e892f126cdec992cf34ad4c0227f0ee5ba33ec06cea8ba4efd47bf36a540869f71b706 SHA512 7892b4ccfa5973f20deda365e337b8f70e159a9387b6823eada4b39a0cabcd078af08c9bc45e629aa432f49c72f71df6b04fc1cecb72bc2e9c9cd018fc04299b
+DIST gitlab-runner-15.1.1-deps.tar.xz 140961196 BLAKE2B b3818572b2b5c01c78290572219c9788b0c61091eb4fd28978c08b5c9e11c14cf7b988b036598e93f543f9cd02bb22d1e2aa60ff905891948216943db5e28907 SHA512 fedc9bc87deed3a8cbaac8aa641d7a7175b535dca74d0bddc1b59b796a952a794bcfb456055ec19fc561cab060be9c5a09df322cf52daef7cb8152acb89e26b9
+DIST gitlab-runner-15.1.1.tar.gz 1287440 BLAKE2B 0648132a2de277865d3899e460d0f444a26d3d827ee6efdf90abd195b243f31e138f57ca968c702089245e92763ab3cbb7e997fb8dc409a373689ed4e75016bc SHA512 538fc769e0aed90ffe4df9e2afe81b3c89f0c3d9ad9d48e52f12cde5df3b36326f054c1ab88c3d532cf573cdcd7a6e1733d3041cff133a665db5c91c4b8ddd0c
+DIST gitlab-runner-15.2.0-deps.tar.xz 141451528 BLAKE2B a77b8ca5c1570fc80f2d9f2bf3ebd9291997cd7f017eb1eaefb68d7bdba219d9fd14fb86c313a8c4fdc8169d81488244905d971a9b7c8393000f85253fd69ae2 SHA512 0aca328527b8b769015ea8177e22c8e232dd840b6427bf6e7ae7e0acccdc3cc6630ad10c2bc3fc42729107509fd37eaa5441846aa5f1ce934d68786335b960a4
+DIST gitlab-runner-15.2.0.tar.gz 1291980 BLAKE2B 06194f6dfba94a1d071b3f29f3065475b8a9c08669ee0ec43917340a54dcdf79843f43b3f7fbe2e57560184c58166d7c107ed465742cfff05163faaca7ef491f SHA512 74f6a8941909c189bbde534d1cf5e1b8a60f595fa6046ca98dd4fb3a9f7406f988dfb9b2c2a6c777813fb24e4f5c23975f74163f7d5584b553acc4ca28ec8331
 EBUILD gitlab-runner-14.10.1-r1.ebuild 1784 BLAKE2B b636c54c786ebfa4055dcc159c4350ca9cc9de020be99a6b795b56f9f696a611558284b14aa920be4e3fa48d3c7250b815608c4e4d5836b7df4b6e37f94f5a34 SHA512 71a244482be2d8f8d21d874db99a4b38ef9135876eae259a1debd58245fbf0c49afbd087587d686855ec98b7317e4cbbc4ba7ced1375b5949f35ebcfddd2a51b
 EBUILD gitlab-runner-15.0.0-r1.ebuild 1784 BLAKE2B dfd874f9aa65ad955c8091f002e71a4357dc5a262018e53e38726d07e4149400abdf6f4ccdd24bfe04a67a1641e77249f678e7ab28ecca5b365cf9f461ea8a2d SHA512 d9c482c77a7b29028400a30259baafd309cf08586e6044061afbc150eb01747dece3a36eab08f714c96751a5d76bed5ec90416b982afe90247ff123278e07b4f
 EBUILD gitlab-runner-15.1.0.ebuild 1784 BLAKE2B 6133e7a415764be2d232faf807521c8b12cbc5689e3f1983d3c56f9c0c942c096e28862227d2b775bf96d9e4dfa9e079d5877917124aa1be586cfb3ad29cc08b SHA512 d2d2234d103770ba859d9daf1b63f483584c6fdd6340ad76a997a7b23bcfdbcce2c8cdc2895ca6781bc44c50aed2fc0828dc794d87b391397e804341c3e88aae
+EBUILD gitlab-runner-15.1.1.ebuild 1784 BLAKE2B c17c2a1c0f0e1be690b8a431fb7390b924c5867f8f4943a308975bef90f0b9a393062ab4229c39af026e34271d4792c015ec4ae201a4298b0de3e3c844e688e5 SHA512 f9150a22106f18eccff02ccb5681cb08364c93f6dd3988c7ac9a546711a29728db7cdc2cf611a0763cceaa72078adc12bfd42ddeaf383aa9869562f9874afafd
+EBUILD gitlab-runner-15.2.0.ebuild 1784 BLAKE2B d91ad1c66bceda48667acdf56f3e43074d330cc0b1477d88408c6b1313205d220991bbff1c53162ca17d36cee58d51af701d4e53dd88bcd16ce8e909d7210f99 SHA512 eb26a787d3cd9cb72eae7279f109dd1c0ee683369a4c9eea2f273bc05d203f2a91e509bbfb1a60bdc9348a9dd5ff33d72266701b33ce880b1986a036d78e847e
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/gitlab-runner/gitlab-runner-15.1.1.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.1.1.ebuild
new file mode 100644
index 000000000000..39a1d57d7b63
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-15.1.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=bfccfab3
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+	acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+DOCS=( docs CHANGELOG.md README.md config.toml.example )
+
+PATCHES=(
+	# https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3498
+	"${FILESDIR}"/build-for-arm64.patch
+	)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_compile() {
+	emake \
+		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+		GOX="${EPREFIX}/usr/bin/gox" \
+		REVISION=${GIT_COMMIT} \
+		VERSION=${PV} \
+		runner-bin-host
+}
+
+src_test() {
+	CI=0 ego test
+}
+
+src_install() {
+	dobin out/binaries/gitlab-runner
+	einstalldocs
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	keepdir /{etc,var/log}/${PN}
+	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
+	fperms 0700 /{etc,var/log}/gitlab-runner
+}
+
+pkg_postinst() {
+	tmpfiles_process gitlab-runner.conf
+	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+	elog
+	elog "To use the runner, you need to register it with this command:"
+	elog "# gitlab-runner register"
+	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}
diff --git a/dev-util/gitlab-runner/gitlab-runner-15.2.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.2.0.ebuild
new file mode 100644
index 000000000000..c10a0b580009
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-15.2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=7f093137
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+	acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+DOCS=( docs CHANGELOG.md README.md config.toml.example )
+
+PATCHES=(
+	# https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3498
+	"${FILESDIR}"/build-for-arm64.patch
+	)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_compile() {
+	emake \
+		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+		GOX="${EPREFIX}/usr/bin/gox" \
+		REVISION=${GIT_COMMIT} \
+		VERSION=${PV} \
+		runner-bin-host
+}
+
+src_test() {
+	CI=0 ego test
+}
+
+src_install() {
+	dobin out/binaries/gitlab-runner
+	einstalldocs
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	keepdir /{etc,var/log}/${PN}
+	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
+	fperms 0700 /{etc,var/log}/gitlab-runner
+}
+
+pkg_postinst() {
+	tmpfiles_process gitlab-runner.conf
+	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+	elog
+	elog "To use the runner, you need to register it with this command:"
+	elog "# gitlab-runner register"
+	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 683f551ef23b..3bf48a443718 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 8ba77e363030..c9321042c985 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,4 +1,6 @@
 AUX devilutionx-1.4.0-system-sdl_audiolib.patch 737 BLAKE2B c0d36bc098c0ce319a8c9c0622d16310e64925a8a48b16670a63242d853b4345aec7f3006e0bff01e622d0a289605964536213faad9359f74274cd40da706246 SHA512 e29ae8854676b9c148410886bc18bfbb38bbf7afdd95c9200ebc33686c4f50f5a0f2e31525bcf11de85b34890557848ec6639a99eadd1763bd637084809a994f
 DIST devilutionx-1.4.0.tar.xz 19752052 BLAKE2B 3a79e9d88cc2f5623dfd7d4ad2a0a547361cde8d95197be36dc7076e0b56fa1a915c57bf5537f5e4508201c3b5a283ab90d13db93b3836b0f12c6108abf1578a SHA512 9519c0bd52798f35fc986fab867b0005010f089b35200b5d54b7ed94145c2df54270a570cd3b0ff1c260f645d624a145e3581d744b48ae513919eb2258331bcf
+DIST devilutionx-1.4.1.tar.xz 19679968 BLAKE2B 51ae007d5d1dce25a9af20b98017826534d835c2a74bfcd78cb4fb3c8e86b4e2e55a302e0412cbbcff8f931ad33a2baab806199769660351f31cc49fa91814b6 SHA512 9709600395abfd697bc45757bd2cf3e5cf0e07e2c55c86a48a73e9f52003c274724e26306b4fcb36c2eda0776c51dbab96599c0d14744244c8c037fd5dd14263
 EBUILD devilutionx-1.4.0.ebuild 2034 BLAKE2B 11755a6583cf4a2087b19e4227248628c89140f1831513ee4776995f8c1e182f2d161be1a0e3131d549f8c80a95e16d6fa5792f239e3b0fb0ce73ebb6fba8591 SHA512 b632ced8ddd68340c2195a736f33e4bec4a006db064e422c7f819e254d8d84ab575391c8d53eb5244bf4a37ce0990ba3f2633aa88aa36e84282afeadca92b76c
+EBUILD devilutionx-1.4.1.ebuild 1998 BLAKE2B f28cb67d439a85fe1c062abdf38e2e5a449807825b4edbf23f158d693a2058efc6ca15f562499c118fe3780fc42249ed3fe3c3efef85ea779fee38c9a502748f SHA512 3384d4e416b163a5ec29199395ca55655ff5b44481d2857491aeb1cecc1cc15908c842c981da2802553137efce1e8bf946c3efd585f4e68eca0cb988c51794f4
 MISC metadata.xml 542 BLAKE2B 25e292f201570a11d08f4f22922a9dfa1f54d51784be9b38f3b8396a44559ffe6d5f8799e20b8c2fa888ce97e8a45d257894c13924e303a7f93d04c0c046e231 SHA512 acb1603f7e41f47daf7f9fde6128b2f7c51c277cb97be62b87695cceb48fca653f90c2ca3e22238758a78aae4fa34f2de555e07f7e8d896a8ccf5e1c569e8083
diff --git a/games-engines/devilutionx/devilutionx-1.4.1.ebuild b/games-engines/devilutionx/devilutionx-1.4.1.ebuild
new file mode 100644
index 000000000000..e7608abb497b
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.4.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX/"
+SRC_URI="https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}/${PN}-src-${PV}-5ad792133"
+
+LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BSL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +sodium test zerotier"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libfmt:=
+	media-libs/libsdl2[haptic,joystick,opengl,video]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib:=
+	media-libs/sdl_audiolib
+	sodium? ( dev-libs/libsodium:= )"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/asio
+	dev-cpp/simpleini
+	test? ( dev-cpp/gtest )"
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# use system asio
+	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
+
+	# ensure system copies are used
+	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=OFF #813768
+		-DDEBUG=$(usex debug)
+		-DDISABLE_LTO=ON # let CFLAGS control this
+		-DDISABLE_ZERO_TIER=$(usex !zerotier)
+		-DPACKET_ENCRYPTION=$(usex sodium)
+		-DPIE=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( Packaging/nix/README.txt docs/*.md )
+	cmake_src_install
+
+	rm "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "In order to play the game, you will need to copy the following data file"
+		elog "from the original game, and optionally the hellfire expansion files:"
+		elog "	- DIABDAT.MPQ"
+		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
+		elog "to ~/.local/share/diasurgical/devilution/"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
+	fi
+}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 372be53560ed..243a05e4236e 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 848341d72984..f80d15722840 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,9 +1,5 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r4 1944 BLAKE2B 9870b09a447588ed0dbfe49bdeee928d54e8ea788a50dc834ea761ef8dcbf21696214ff3370f43de3218e202a5ad786b972c77a679a7cd0d2d1ef38f43db67de SHA512 3281e15bf7a4b87cd1b53b755c1695d77f2de0b7ea23ebdedf0bea60013c5d79f563fdbab3de421bfa50c3d2f24e93c39f49525d8157ca9e649d206a1cb80dfd
-DIST bedrock-server-1.19.1.01.zip 72201104 BLAKE2B f8d28d8faaf813fc5b56620cc1439e4e3fe360b428cf6e4c535f04f11dd09a1918956e0ceb196a658b31d2c454e70df031faff6d922d3f857cbc295b55eb7a4b SHA512 45be61437e82a2b88881d50e8635ed9eb6a9fe24ba2cf305f1d397220b6139655bdf5b8f6a063cb5443ba3c6b4f15739623f4ea1cba7ba9e30ea10b21b1a508a
 DIST bedrock-server-1.19.10.03.zip 73426046 BLAKE2B 8c8c25d0e811509329d3c1ade0e442804ed221530b5a915c0d41e58f249dd2b7863bb2d87d1d871635d2b1468ee0dc6c42727e70013164c2e65fb7f13fc5988f SHA512 f1afffc34a2c4cf4c1ee16cee3dd067c5544ae3ec4337cb26c5047cecbe1c1b9baf6a98d915b3c20629223c27b222e37c1c5e762fe90bcb9fec2ec7990dcafbe
-DIST bedrock-server-1.19.2.02.zip 72204228 BLAKE2B 77259b006bdb3227ea45a6ba4a210b72e1adb23f8fe7b08b7e3607abb500e3f45175563c7adddf6f7683ad68618be50ee84418e91e14abba73bb7fccc129e143 SHA512 1f6571e4a5f183ed376c42879e4882acd46bc5b3130a4dcf324bd740843eff24d8c3d7d0d5914c8db2acdf41ada0a912b56f1ac600df97d8664fec47ee1be25c
-EBUILD bedrock-server-1.19.1.01.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
-EBUILD bedrock-server-1.19.10.03.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
-EBUILD bedrock-server-1.19.2.02.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
+EBUILD bedrock-server-1.19.10.03.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/games-server/bedrock-server/bedrock-server-1.19.1.01.ebuild b/games-server/bedrock-server/bedrock-server-1.19.1.01.ebuild
deleted file mode 100644
index 520bc15c7abd..000000000000
--- a/games-server/bedrock-server/bedrock-server-1.19.1.01.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-RDEPEND="
-	acct-group/bedrock
-	acct-user/bedrock
-	app-misc/dtach
-	dev-libs/openssl:0/1.1
-	sys-libs/zlib
-"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-DOCS=(
-	"bedrock_server_how_to.html"
-	"release-notes.txt"
-)
-
-QA_PREBUILT="opt/bedrock-server/bedrock_server"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	exeinto /opt/bedrock-server
-	doexe bedrock_server
-
-	insinto /opt/bedrock-server
-	doins {allowlist,permissions}.json server.properties
-	doins -r {behavior,resource}_packs definitions structures
-
-	dodir /opt/bin
-	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
-
-	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
-	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
-
-	einstalldocs
-}
diff --git a/games-server/bedrock-server/bedrock-server-1.19.10.03.ebuild b/games-server/bedrock-server/bedrock-server-1.19.10.03.ebuild
index 16dd14a8e660..520bc15c7abd 100644
--- a/games-server/bedrock-server/bedrock-server-1.19.10.03.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.19.10.03.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 RDEPEND="
 	acct-group/bedrock
diff --git a/games-server/bedrock-server/bedrock-server-1.19.2.02.ebuild b/games-server/bedrock-server/bedrock-server-1.19.2.02.ebuild
deleted file mode 100644
index 16dd14a8e660..000000000000
--- a/games-server/bedrock-server/bedrock-server-1.19.2.02.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	acct-group/bedrock
-	acct-user/bedrock
-	app-misc/dtach
-	dev-libs/openssl:0/1.1
-	sys-libs/zlib
-"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-DOCS=(
-	"bedrock_server_how_to.html"
-	"release-notes.txt"
-)
-
-QA_PREBUILT="opt/bedrock-server/bedrock_server"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	exeinto /opt/bedrock-server
-	doexe bedrock_server
-
-	insinto /opt/bedrock-server
-	doins {allowlist,permissions}.json server.properties
-	doins -r {behavior,resource}_packs definitions structures
-
-	dodir /opt/bin
-	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
-
-	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
-	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
-
-	einstalldocs
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 99ee96e534ca..5cb7f8a052be 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 3ba5eab6ef78..6c53dabc033e 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,13 +1,11 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
-DIST intel-gmmlib-22.1.3.tar.gz 813386 BLAKE2B 6946423e3a58bea36ac6ca7619f68a30997910e0041b60e3b6a34ad3d76308cf0af69c46abc4008d19a5cee88e8f423503560598d2006645771f2eb2b224201c SHA512 cbf0164e7604f6214f6e1d3d9a283d385fac0efbd83afad02a76e3090d680ec000b17a257d5e004c296764330888dbd0a3e5bd46a760ac5c5f3e67436a7c9437
 DIST intel-gmmlib-22.1.4.tar.gz 818133 BLAKE2B c1faae09ad38369b12c8dc9d9ac0d0d652f1eb0876e78cedceddaf94afe27114be905512fb3a71f7eb0ebb77544eb7601e96e19359500eb9149fd6e2e2295c1f SHA512 cd31611a53474c2d457f9ce1ce903a184b320d398dc2eba1600f5586108cfa156cde584501ce283d51a8cb13d1917789370d194b6ee3b6a2b5d823d1323b0ef2
 DIST intel-gmmlib-22.1.5.tar.gz 818259 BLAKE2B 54f8065784f9ee5ca79f4ad7c0a83a83a476a5d2db5b37194eee5234d7b30a0df4b42b2a3279e7ef4884f28d3ed8d27fe1133bc9ab8600050938c67808467432 SHA512 1786d397d3a3d5303faec68a6eecb3426391c906ec16b47bd16462732e911928b3a9e7df2a84b384cf4c1b9dcb293953dcd11ee32a2fb631570db260b15f9c3b
 DIST intel-gmmlib-22.1.6.tar.gz 818312 BLAKE2B acf5fd05e4220df6b828e08e6ee1a6ee9da3d5067c2b99d7a12d01441359761ed4bfa12e2b4bb417a91bfc2fdd0e7d4fd0abf2cafd92549d6ce9910fc37e5bf4 SHA512 4423d9eaf6449aa50e7ecb4e74dbf2510ba67c14aa33efa132d612a05faf5542cdda60c011af36f7875658876ababc3eeeb799637601430c16030d6fae6bc926
 DIST intel-gmmlib-22.1.7.tar.gz 818408 BLAKE2B b7123b571bfdb2f363bb7824264b9c2ad85c5e58f2978c0fa20010c8a890157bf10da7c772b9ad987078784bf37192ec0e8e14b73980af15329609649e817fd6 SHA512 0dbf972ecd61f84b9932eb6735c73e424861f7841bee8a5e76cd4d8d28ebf7641e475f9cdb1015b4f20aca08591f8f52631ebc209efa339753b47b3a121a38fb
-EBUILD gmmlib-22.1.3.ebuild 767 BLAKE2B 76d22a835768e7f4296804a0f99e7939a273ac151b5e4e2fc6ddcc724f85fc8e74462b55a4bb1822095d118d376a0759a56d986e6defa629ea356783545e18b9 SHA512 bc04c984fe8c8823ce45bf50fc3b013932411e069726254d9623e1d509f08c98789415d8905c8d60e917c71920317ab83a551d3e501efcd5f14a06c4acd35902
-EBUILD gmmlib-22.1.4.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
+EBUILD gmmlib-22.1.4.ebuild 795 BLAKE2B 6bcec2581a34ec5a169eaa3508c8d7e6085865b6df1d2746db4c114eeebfd082636a3bb1aad3c6f72bc00a87effc4e32921f8d315ee58db95d71a495be00afcc SHA512 d366ef04a77026dbb3d1cae5d4e4bf74846cb6a4b7842c218f04889d0e0a0450d3ad28016a3492f5ff723dff4ac16bfd00e2d618bfb7e3400a4e841451d6c7f8
 EBUILD gmmlib-22.1.5.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
 EBUILD gmmlib-22.1.6.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
 EBUILD gmmlib-22.1.7.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
diff --git a/media-libs/gmmlib/gmmlib-22.1.3.ebuild b/media-libs/gmmlib/gmmlib-22.1.3.ebuild
deleted file mode 100644
index 7d8a6f81eb26..000000000000
--- a/media-libs/gmmlib/gmmlib-22.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-S="${WORKDIR}/${PN}-intel-${P}"
-
-KEYWORDS="amd64"
-LICENSE="MIT"
-SLOT="0/12.1"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
-	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_TYPE="Release"
-		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-22.1.4.ebuild b/media-libs/gmmlib/gmmlib-22.1.4.ebuild
index 598b7721fb10..74db95043d2b 100644
--- a/media-libs/gmmlib/gmmlib-22.1.4.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.1.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 S="${WORKDIR}/${PN}-intel-${P}"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="MIT"
 SLOT="0/12.1"
 IUSE="+custom-cflags test"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 10642c17c081..3bd9ed350b21 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 1d281b95dda2..f8015d992554 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -5,10 +5,7 @@ AUX ts3db_postgresql.ini.sample 99 BLAKE2B 06931c928de8f46373b6c7102358379260432
 AUX ts3server.ini-r2 721 BLAKE2B 8427ffb88e2856b0807fe3c3ed2411039fe330f65322cca1e4b35d57e68e021b982a3e3c9044994bc21ed7010ebd746adf6fcfa93b3e2e9f5b5a16e3a3779bd5 SHA512 8d5ce0e3bf30bacd88784504dde88c1561d886f2402398d5f84d0acac56159fa21181adec25fec01f42582e0489a576606c9f12e426edcb1e9c2436ada196c4c
 AUX ts3server_mariadb.ini.sample-r2 762 BLAKE2B c70d4c7e375a9ab43ca9c1c4cadea9843009e7004f38734f7f2d8da3e3e86d83a2301d713b6bffee4e14ad04ef08c05bdae5e7daec4a8678ef3b9b5348824d2b SHA512 c2a4468288251e39e4061363016f6146aceae4c7f19c0e962341748ada5127e0b80380c75d217b1a2d1716c6e53c669aed34d75258b22f32c7f0ffb50b759288
 AUX ts3server_postgresql.ini.sample 768 BLAKE2B a8a8e9255012dda70d2096c793c44f22978cab1e2a632f3abbb81f288d9d8716e76727c6edde33146ff4e7dc08da43c7996565c8c05a27ca4f17e1bb02f095d3 SHA512 293917b6310d456e51fc72cf967cb2a0f99ec38b7a62550f2358d1996841d1aa15c0169945884a10799fb72f9831d9d12d4f2a535d1480f8fbaa6b23c9f4cf21
-DIST teamspeak3-server_linux_amd64-3.13.6.tar.bz2 9948972 BLAKE2B 397e96751e6688b5579ff7828e4998e3b26183b0b10980e89748d51207428059e7d8cfa6f2f6fb961b77f735f61e1ba00ac13a077c76b5d22a7b2abb28d67e48 SHA512 dc007cdc924fd284da4a206cf615816b53c2f03ccb2573a29aa2bce6874e09ce5764a3953f8e84de8a3cc02aee306b1505d8c7edf8d48713bbf5f172c3be3422
 DIST teamspeak3-server_linux_amd64-3.13.7.tar.bz2 9968877 BLAKE2B 7c2f200b1e3a3184005aab213acc681326e16a776f529dbdac900f5b9a6ee9d91883d1aabfe4526e52e9a706a4856366291f061efc6eff581216d7450746322d SHA512 cd026e0c51d8269bd6965f9f274ff6478d4e179d23ee1b00f93a887997985b97afcb7eda05e34150d6fe0610f2715a61989a7f3ca05994067e71b9d3171e2962
-DIST teamspeak3-server_linux_x86-3.13.6.tar.bz2 9785491 BLAKE2B f0d196a72e9a4283006c4dfd9a1d86e96a3b435d8bf14dfca178ea0240e94b88bcf3b9e20b6c99638e04019065fa79d28ac2d9ad452e306c4c27966e32464c69 SHA512 ef124964590c106bacd3bc98847a5e8f64fbbf69ccb2a216f9af6548f5f2d200c0bd307d283f48cb08c254fddb92fe03f6cff2c3c87e7ca593edf3023b053bee
 DIST teamspeak3-server_linux_x86-3.13.7.tar.bz2 9820644 BLAKE2B 37789bfe4c544b8eeb28a34d1fae933e2d2a11b23e85a6de66ac4c9772a061860803a3a767227d787efd90f7aa031b3ca77b229acca554aebd69f1f78b28128c SHA512 04278359a03cb9f8bc6db48b54976020da6a44629f17b503378bf0ffe554da838193ba590ab895e97c96e026aa87d96a3e167a009710adc4b9b03193d496201d
-EBUILD teamspeak-server-3.13.6-r1.ebuild 3510 BLAKE2B 1cc38840e47143772fe861213a2600cc1c2d0cf49573f33dd17709a0cac406d495b2ee3b20b21d726d12b16fd1c8e90d43a50f7bf7d716b0a286a15531bc23bd SHA512 923e0a4e1f22b74d4a9f0f7d5abd430b046086c8cb129c7ff1e754781d7b20ace30836a7913b95ffc6890ff5317d4021f0d182edf7494bff8d3ea37a790188b2
-EBUILD teamspeak-server-3.13.7.ebuild 3512 BLAKE2B 3d6f944642de423c000c62f1e6881b35d4d1df2512c0588a78f25d177301bceece967f32dc63ef9a4b0a31bccdcb53d8227b40f5ad4c38f3da12453130faa075 SHA512 2e83ca71bee8e8959f877fac3fc13adba2c8e72524e53946a913e8638b0bbe0fc17c8ed817d301240d5c2015efb9f8471a5968029206729557cfc67fd7ccdd09
+EBUILD teamspeak-server-3.13.7.ebuild 3510 BLAKE2B 1cc38840e47143772fe861213a2600cc1c2d0cf49573f33dd17709a0cac406d495b2ee3b20b21d726d12b16fd1c8e90d43a50f7bf7d716b0a286a15531bc23bd SHA512 923e0a4e1f22b74d4a9f0f7d5abd430b046086c8cb129c7ff1e754781d7b20ace30836a7913b95ffc6890ff5317d4021f0d182edf7494bff8d3ea37a790188b2
 MISC metadata.xml 704 BLAKE2B 68e04b7596542e2549233e228e8db2bf5943c2b859133b55a41800ef7048730e5298ee5cc5d034e8ec2f4187230f1bf470c2195d2c88b451faaf4ae0b6f53128 SHA512 f517abc5ee9903df810da51cd0fa86fd8c4b9bfcae05816d6d2596e645a59a1596007da5634ce33d3cb7efcf252b238dc197da0dc992b06654b17f12a1f5b239
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.6-r1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.6-r1.ebuild
deleted file mode 100644
index 689e764c78d3..000000000000
--- a/media-sound/teamspeak-server/teamspeak-server-3.13.6-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="A server software for hosting quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="
-	amd64? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
-	x86? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="doc mysql postgres tsdns"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/teamspeak
-	acct-user/teamspeak
-	postgres? ( dev-db/postgresql )
-"
-
-QA_PREBUILT="
-	opt/teamspeak3-server/libmariadb.so.2
-	opt/teamspeak3-server/libts3db_mariadb.so
-	opt/teamspeak3-server/libts3db_postgresql.so
-	opt/teamspeak3-server/libts3db_sqlite3.so
-	opt/teamspeak3-server/libts3_ssh.so
-	opt/teamspeak3-server/ts3server
-	opt/teamspeak3-server/tsdnsserver
-"
-
-src_unpack() {
-	default
-
-	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) "${P}" || die
-}
-
-src_install() {
-	diropts -o teamspeak -g teamspeak
-	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
-
-	diropts
-	keepdir /etc/teamspeak3-server
-
-	touch "${ED}"/opt/teamspeak3-server/.ts3server_license_accepted || die
-
-	exeinto /opt/teamspeak3-server
-	doexe ts3server
-
-	dodir /opt/bin
-	dosym ../teamspeak3-server/ts3server /opt/bin/ts3server
-
-	exeinto /opt/teamspeak3-server
-	doexe libts3db_sqlite3.so libts3_ssh.so
-
-	insinto /opt/teamspeak3-server/serverquerydocs
-	doins -r serverquerydocs/.
-
-	insinto /opt/teamspeak3-server/sql
-	doins sql/*.sql
-	doins -r sql/create_sqlite
-
-	insinto /etc/teamspeak3-server
-	newins "${FILESDIR}"/ts3server.ini-r2 ts3server.ini
-
-	dodoc CHANGELOG
-	docinto ts3server
-	dodoc doc/*.{md,txt}
-
-	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
-	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
-
-	newenvd - 99teamspeak3-server <<- EOF
-		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
-	EOF
-
-	if use doc; then
-		docinto html
-		dodoc -r doc/serverquery/.
-	fi
-
-	if use mysql; then
-		insinto /etc/teamspeak3-server
-		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r2 ts3server_mariadb.ini.sample
-		doins "${FILESDIR}"/ts3db_mariadb.ini.sample
-
-		exeinto /opt/teamspeak3-server
-		doexe libts3db_mariadb.so
-		doexe redist/libmariadb.so.2
-
-		insinto /opt/teamspeak3-server/sql
-		doins -r sql/create_mariadb
-		doins -r sql/updates_and_fixes
-	fi
-
-	if use postgres; then
-		insinto /etc/teamspeak3-server
-		doins "${FILESDIR}"/ts3server_postgresql.ini.sample
-		doins "${FILESDIR}"/ts3db_postgresql.ini.sample
-
-		exeinto /opt/teamspeak3-server
-		doexe libts3db_postgresql.so
-
-		insinto /opt/teamspeak3-server/sql
-		doins -r sql/create_postgresql
-		doins -r sql/updates_and_fixes
-	fi
-
-	if use tsdns; then
-		exeinto /opt/teamspeak3-server
-		doexe tsdns/tsdnsserver
-		dodir /opt/bin
-		dosym ../teamspeak3-server/tsdnsserver /opt/bin/tsdnsserver
-
-		insinto /etc/teamspeak3-server
-		doins tsdns/tsdns_settings.ini.sample
-
-		docinto tsdns
-		dodoc tsdns/{README,USAGE}
-	fi
-}
-
-pkg_postinst() {
-	elog "If you have a license,"
-	elog "put it in /opt/teamspeak3-server named as licensekey.dat."
-	elog "Please note, that the license must be writeable by the teamspeak user,"
-	elog "as it will be automatically updated every six months."
-}
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild
index 9ecdd00b61b5..689e764c78d3 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="doc mysql postgres tsdns"
 
 RESTRICT="bindist mirror"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 07115f91fedf..0e6ff635f1c6 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f1a4b359a6f5..72da953e8d8b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Jul 2022 18:39:57 +0000
+Tue, 26 Jul 2022 00:39:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 5bac72a8819b..6720af96572b 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-25T18:40:01Z
+TIMESTAMP 2022-07-26T00:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLe44FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLfN9xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAp1g/+KphEGgr+EdoZlxfwO95oqJwws+FTr+GT4f2XqyBDYE9PXSpgHQadvsId
-O+Dwm7q87XS2cw3tO8Ili7eH1xtNZyc4rzGXC/M1SFvt+UWGiYThHBGj17zoe2fi
-wvDkdvXgdVYFXztPXZMRQ4sXgo+bOym2ZAdv2XlTVhtnrPFofDo3C2aUQ4FyateI
-XJNpAqliszSlpwxSsIWN+nfIUUErOcANk2AAFJ2/VZkV69JDue725ioJ/ZNvGlz6
-SJK87Pp0kGw4/VqI9y4pGcIysCIoUm5o/HbGZgGqHaPPuvT49XqZO4ChTJnkx764
-Wfe10u0zQ4PA+VamS5Gd2H468ydcYNSpMwMfBkCRtROor2Ii3RjEuywpKgACOda+
-RGs/kspbOa5hK23b/a7/ay6vKdtfHTByTqq7pCWrl3Fwhlfr8VrNrGckPlbMsEep
-pAQavmyoO/Q6OC7T0YqtkDYIBFVwzgx4BCiskkTttjmcB+komYErh4ubI7uuQ1zd
-Dc5sCYP87woczbxJekS76QIwAuhgKOy59ibOb3AJ5em6P2WOuQm21Hs2QPXW9RHQ
-5OoPSWpXW1WmyHBXkPrDCfXC2b7ykxu9sMeO+BK+n0Y8cPVm1u0N11BSxV/mjNo6
-BmJ0SVuabuxUx2tAhyP8cY80oV2va8rzBzyopOPsQW0/k5+XPuw=
-=SioX
+klB2tA/8DzYTfvDYUYW88aA7w8ttyueq3tNc+/Bp4BXfc5jXibxGzgxi/rOtAXY8
+LGQ9ZukeMPVmjzH1XoxX4hTRbuODQnsEqK86G2sM3Fap7WoJdp97uupp/n2K0glP
+/ajmKdZ1JEAiqbx4CAdnVH/TAjtf9P+9FUiqwM5woa3QRHzsinffAXMih/F3o7F1
+GxlwdIeWHYtnb+EXb0riUtdjVFAZ3Rvy23YOpOgduX8nZx7h9/gEwKNLbb77v42F
+ZxQ+4+eM/0qwzxyZqbCp6kaUPm3F7JDHHH3pogkx/ZmJJKrLw/iI+gr3SUmHxElK
+9ldRdKKiLojrQ2MLJr7n5cugqOJN+/hKQqvGbzn7pnrW/7zhd6rzhGN5KoqYlb4w
+rLAIxT+8rDtwRyfTzVn/WxIBPPNBVCz2mgCoo+a91q7vzA7bwd0ov64PBLypBAwp
+OQDngn0ArwVVuZpHsYPbUKiwOvK7KWs2GfHEnDmL4GmAy6F0Wecu9y0C6B19cSC5
+fjzGQoy/DbENDzWBnB93NXDBzsXpeQ1JYCZgLT2Lg79m9YPQ12PAlBqaKoDSTdGy
+c98mXbhoJ2ulaD8muS4nWH+DfRT/WpmMYyoUdzQ6BUi6K3kx8srlQ+fsQaUmY+wJ
+n3AW90z33Suc8fHOm7l4iHXP4NXm73nSxgTR/SCECFXri40qwTM=
+=H3Aq
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 312267dc2aca..72da953e8d8b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Jul 2022 18:39:58 +0000
+Tue, 26 Jul 2022 00:39:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e544aa3fa799..a4f215c195de 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index dfbfd5bed756..90c98879e0ff 100644
--- a/metadata/md5-cache/acct-group/Manifest.gz
+++ b/metadata/md5-cache/acct-group/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/_cron-failure-0 b/metadata/md5-cache/acct-group/_cron-failure-0
new file mode 100644
index 000000000000..b53934507a27
--- /dev/null
+++ b/metadata/md5-cache/acct-group/_cron-failure-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for sys-process/systemd-cron failuire emails
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	1ceec99d0a07acc9b25068a83d5abda2	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_md5_=9fdf1ae711825b89a87f87a3bb1d36df
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 1b687018b21c..07d35057e4e6 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/_cron-failure-0 b/metadata/md5-cache/acct-user/_cron-failure-0
new file mode 100644
index 000000000000..90798d8fbf3d
--- /dev/null
+++ b/metadata/md5-cache/acct-user/_cron-failure-0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-process/systemd-cron failure emails
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/_cron-failure
+SLOT=0
+_eclasses_=acct-user	38e6655114f60cacc969baf808da755b	user	1f6dd43c7e925ba0272de52bcd326972	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_md5_=ecc54dd06040ba4d4bf8200809dd19bc
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index a69c6a915553..a588d509425f 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.12.6 b/metadata/md5-cache/app-admin/ansible-base-2.12.6
deleted file mode 100644
index 94e6f51cd774..000000000000
--- a/metadata/md5-cache/app-admin/ansible-base-2.12.6
+++ /dev/null
@@ -1,17 +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-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/sshpass virtual/ssh dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=8
-HOMEPAGE=https://www.ansible.com/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/sshpass virtual/ssh 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.12.6.tar.gz
-_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=29daa9f8c9bf42a04b2d2a27cf6eb389
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.6.6 b/metadata/md5-cache/app-admin/keepassxc-2.6.6
deleted file mode 100644
index 9b373d6ea17b..000000000000
--- a/metadata/md5-cache/app-admin/keepassxc-2.6.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ccache? ( dev-util/ccache ) doc? ( dev-ruby/asciidoctor ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=7
-HOMEPAGE=https://keepassxc.org
-INHERIT=cmake flag-o-matic xdg
-IUSE=autotype browser ccache doc keeshare +network test yubikey
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.6.6/keepassxc-2.6.6-src.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	929e29d009c20f55b45c96866ebf47fe	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6f6b926635905b2973f7d7a510ee6965
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.6.9999 b/metadata/md5-cache/app-admin/keepassxc-2.6.9999
deleted file mode 100644
index d9e3fd42c57e..000000000000
--- a/metadata/md5-cache/app-admin/keepassxc-2.6.9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=ccache? ( dev-util/ccache ) doc? ( dev-ruby/asciidoctor ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=8
-HOMEPAGE=https://keepassxc.org
-INHERIT=cmake flag-o-matic xdg git-r3
-IUSE=autotype browser ccache doc keeshare +network test yubikey
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-PROPERTIES=live
-RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( sys-auth/ykpers )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	929e29d009c20f55b45c96866ebf47fe	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=eb4487f06cb5d3b46a46a0f42b677ca0
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.7.0-r2 b/metadata/md5-cache/app-admin/keepassxc-2.7.0-r2
deleted file mode 100644
index 0c7920676bd2..000000000000
--- a/metadata/md5-cache/app-admin/keepassxc-2.7.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-ruby/asciidoctor ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/argon2:= dev-libs/botan:2= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( x11-libs/libX11 x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite ) dev-qt/linguist-tools:5 dev-qt/qttest:5
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=8
-HOMEPAGE=https://keepassxc.org
-INHERIT=cmake flag-o-matic xdg
-IUSE=autotype browser doc keeshare +network test yubikey
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=app-crypt/argon2:= dev-libs/botan:2= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( x11-libs/libX11 x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.7.0/keepassxc-2.7.0-src.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	929e29d009c20f55b45c96866ebf47fe	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a472a106cc812a2da11f904497b1c9bd
diff --git a/metadata/md5-cache/app-admin/salt-3003.5 b/metadata/md5-cache/app-admin/salt-3003.5-r1
index 359b8c5579ee..5ed4cd1509e0 100644
--- a/metadata/md5-cache/app-admin/salt-3003.5
+++ b/metadata/md5-cache/app-admin/salt-3003.5-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) x86? ( test ) test
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3003.5.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=37bc0f006b2c7274b7a457591be766cf
+_md5_=1fe9496858699dbd30f573e5afe2ac59
diff --git a/metadata/md5-cache/app-admin/salt-3004.2 b/metadata/md5-cache/app-admin/salt-3004.2-r1
index d49de8cc2a8c..29fcf49987a9 100644
--- a/metadata/md5-cache/app-admin/salt-3004.2
+++ b/metadata/md5-cache/app-admin/salt-3004.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3004.2.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c399812ad9e5ef70a1424428be17f63d
+_md5_=7a6089da73f505073ea4a55f3feacb49
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index ea4c4fc6cb5f..bdb1056d92b6 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/borgmatic-1.6.6 b/metadata/md5-cache/app-backup/borgmatic-1.6.6
new file mode 100644
index 000000000000..f4ba4870961c
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgmatic-1.6.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/flexmock-0.10.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/flexmock-0.10.10[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/flexmock-0.10.10[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/flexmock-0.10.10[python_targets_python3_11(-)] ) ) test? ( app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.2[python_targets_python3_11(-)] ) ) 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 ) python_single_target_python3_8? ( >=dev-python/gpep517-6[python_targets_python3_8(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-6[python_targets_python3_9(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-6[python_targets_python3_10(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-6[python_targets_python3_11(-)] >=dev-python/setuptools-62.3.3[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=Automatically create, prune and verify backups with borgbackup
+EAPI=8
+HOMEPAGE=https://torsion.org/borgmatic/
+INHERIT=distutils-r1 systemd
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv
+LICENSE=GPL-3
+RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) 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 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.6.6.tar.gz
+_eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f3efc8221cb1342a4e6219eb628decc0
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 0c9e04ebc53a..d106a62f3625 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/aspell-da-1.7.42-r1 b/metadata/md5-cache/app-dicts/aspell-da-1.7.42-r1
deleted file mode 100644
index b2c65961059e..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-da-1.7.42-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/which
-DEFINED_PHASES=configure install
-DEPEND=app-text/aspell
-DESCRIPTION=Aspell (Danish) language dictionary
-EAPI=8
-HOMEPAGE=https://da.speling.org
-INHERIT=aspell-dict-r1
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=app-text/aspell
-SLOT=0
-SRC_URI=https://da.speling.org/filer/new_aspell-da-1.7.42.tar.bz2
-_eclasses_=aspell-dict-r1	dc35762817047596da90d52917261158
-_md5_=91327f43d3591b39d28b0ca7bf4d3e61
diff --git a/metadata/md5-cache/app-dicts/aspell-da-4.0 b/metadata/md5-cache/app-dicts/aspell-da-4.0
index 2c261e40b85c..3a9ee227ce83 100644
--- a/metadata/md5-cache/app-dicts/aspell-da-4.0
+++ b/metadata/md5-cache/app-dicts/aspell-da-4.0
@@ -5,10 +5,10 @@ DESCRIPTION=Aspell (Danish) language dictionary
 EAPI=8
 HOMEPAGE=https://github.com/mortenivar/aspell-da
 INHERIT=aspell-dict-r1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=https://github.com/mortenivar/aspell-da/archive/refs/tags/4.0.tar.gz -> aspell-da-4.0.tar.gz
 _eclasses_=aspell-dict-r1	dc35762817047596da90d52917261158
-_md5_=57a57dc154090fb7641f4468e943d56d
+_md5_=33f84967e5c720d69a50b47af60c6210
diff --git a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20210731.0-r1 b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20210731.0-r1
deleted file mode 100644
index 4bf6adc957b3..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20210731.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/which
-DEFINED_PHASES=configure install
-DEPEND=app-text/aspell
-DESCRIPTION=Aspell (Polish) language dictionary
-EAPI=8
-HOMEPAGE=https://sjp.pl/slownik/en/
-INHERIT=aspell-dict-r1
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0 CC-BY-4.0 GPL-2 LGPL-2.1 MPL-1.1
-RDEPEND=app-text/aspell
-SLOT=0
-SRC_URI=https://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_20210731-0.tar.bz2
-_eclasses_=aspell-dict-r1	dc35762817047596da90d52917261158
-_md5_=e637b4a13b058560dea07b627a18b7f8
diff --git a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20220601.0 b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20220601.0
index e029473a684b..f52e38eda237 100644
--- a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20220601.0
+++ b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20220601.0
@@ -5,10 +5,10 @@ DESCRIPTION=Aspell (Polish) language dictionary
 EAPI=8
 HOMEPAGE=https://sjp.pl/slownik/en/
 INHERIT=aspell-dict-r1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0 CC-BY-4.0 GPL-2 LGPL-2.1 MPL-1.1
 RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=https://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_20220601-0.tar.bz2
 _eclasses_=aspell-dict-r1	dc35762817047596da90d52917261158
-_md5_=94fc0203ba71b57df31c46492fbaf9d4
+_md5_=e637b4a13b058560dea07b627a18b7f8
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index aa21e26fd86f..f42da6edd293 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/ifuse-1.1.4 b/metadata/md5-cache/app-pda/ifuse-1.1.4
new file mode 100644
index 000000000000..ff02f7d2ebf9
--- /dev/null
+++ b/metadata/md5-cache/app-pda/ifuse-1.1.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst
+DEPEND=>=app-pda/libimobiledevice-1.3.0:= >=app-pda/libplist-2.2:= sys-fs/fuse:0
+DESCRIPTION=Mount Apple iPhone/iPod Touch file systems for backup purposes
+EAPI=8
+HOMEPAGE=https://www.libimobiledevice.org/ https://github.com/libimobiledevice/ifuse/
+INHERIT=readme.gentoo-r1
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=app-pda/libimobiledevice-1.3.0:= >=app-pda/libplist-2.2:= sys-fs/fuse:0 app-pda/usbmuxd
+SLOT=0
+SRC_URI=https://github.com/libimobiledevice/ifuse/releases/download/1.1.4/ifuse-1.1.4.tar.bz2
+_eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=32f256ebdbd2942645f2bc42c50ca103
diff --git a/metadata/md5-cache/app-pda/libplist-2.2.0-r4 b/metadata/md5-cache/app-pda/libplist-2.2.0-r4
new file mode 100644
index 000000000000..1f3f4ebc4324
--- /dev/null
+++ b/metadata/md5-cache/app-pda/libplist-2.2.0-r4
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig python? ( >=dev-python/cython-0.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( 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 ) )
+DESCRIPTION=Support library to deal with Apple Property Lists (Binary & XML)
+EAPI=8
+HOMEPAGE=https://www.libimobiledevice.org/
+INHERIT=autotools python-r1 toolchain-funcs
+IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=python? ( 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? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+SLOT=0/2.0-3
+SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.2.0.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c4bb3176448b462e906b49ebed812c5c
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 14559de334d1..8ea9f3c20862 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/bibletime-3.0.3-r1 b/metadata/md5-cache/app-text/bibletime-3.0.3-r1
new file mode 100644
index 000000000000..66494e900726
--- /dev/null
+++ b/metadata/md5-cache/app-text/bibletime-3.0.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-libs/icu dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/boost dev-qt/qttest:5 net-misc/curl sys-libs/zlib
+DESCRIPTION=Qt Bible-study application using the SWORD library
+EAPI=8
+HOMEPAGE=https://bibletime.info/
+INHERIT=cmake xdg-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-libs/icu dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
+SLOT=0
+SRC_URI=https://github.com/bibletime/bibletime/releases/download/v3.0.3/bibletime-3.0.3.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	929e29d009c20f55b45c96866ebf47fe	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=62a1d3c5377d7fc6b7dce40ef627912b
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index c48d06d888c8..d2cb9d61e7f3 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/benchmark-1.7.0 b/metadata/md5-cache/dev-cpp/benchmark-1.7.0
new file mode 100644
index 000000000000..91f2f8695ca7
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/benchmark-1.7.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen ) test? ( >=dev-cpp/gtest-1.11.0 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A microbenchmark support library
+EAPI=8
+HOMEPAGE=https://github.com/google/benchmark
+INHERIT=cmake flag-o-matic
+IUSE=debug doc lto test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/benchmark/archive/v1.7.0.tar.gz -> benchmark-1.7.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	929e29d009c20f55b45c96866ebf47fe	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=02162b56de3ce58be15eff4adf4c1efa
diff --git a/metadata/md5-cache/dev-cpp/simpleini-4.19 b/metadata/md5-cache/dev-cpp/simpleini-4.19
new file mode 100644
index 000000000000..ab893ae539ea
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/simpleini-4.19
@@ -0,0 +1,15 @@
+BDEPEND=test? ( virtual/pkgconfig )
+DEFINED_PHASES=compile install
+DEPEND=test? ( dev-cpp/gtest )
+DESCRIPTION=C++ library providing a simple API to read and write INI-style files
+EAPI=8
+HOMEPAGE=https://github.com/brofield/simpleini/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/brofield/simpleini/archive/refs/tags/v4.19.tar.gz -> simpleini-4.19.tar.gz
+_eclasses_=flag-o-matic	929e29d009c20f55b45c96866ebf47fe	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=fa3cc989e0d10df253d3921992892392
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 99b46f1b88ce..63fbd844b8b8 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/stapler-1.0.0_p20220330 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330
index c1d5968ec8a1..983b836b6938 100644
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330
+++ b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330
@@ -1,5 +1,6 @@
 BDEPEND=test? ( dev-python/PyPDF2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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-6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/PyPDF2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 DESCRIPTION=Suite of tools for PDF files manipulation written in Python
 EAPI=8
 HOMEPAGE=https://github.com/hellerbarde/stapler
@@ -13,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-1.0.0_p20220330.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=570c5a645169ff6fe3e5325e4b5ded7f
+_md5_=aaab37eb312f12fc1d8ac6cb6daaedea
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 70a87665a414..a4b824e00a10 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/gitlab-runner-15.1.1 b/metadata/md5-cache/dev-util/gitlab-runner-15.1.1
new file mode 100644
index 000000000000..1e5ebcfadf6d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gitlab-runner-15.1.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=acct-group/gitlab-runner acct-user/gitlab-runner
+DESCRIPTION=The official GitLab Runner, written in Go
+EAPI=8
+HOMEPAGE=https://gitlab.com/gitlab-org/gitlab-runner
+INHERIT=go-module systemd tmpfiles
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=acct-group/gitlab-runner acct-user/gitlab-runner virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v15.1.1/gitlab-runner-v15.1.1.tar.gz -> gitlab-runner-15.1.1.tar.gz https://dev.gentoo.org/~williamh/dist/gitlab-runner-15.1.1-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f0581c0b49a9f46bce4fb949fa4ad1fa
diff --git a/metadata/md5-cache/dev-util/gitlab-runner-15.2.0 b/metadata/md5-cache/dev-util/gitlab-runner-15.2.0
new file mode 100644
index 000000000000..e1229e43b40a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gitlab-runner-15.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=acct-group/gitlab-runner acct-user/gitlab-runner
+DESCRIPTION=The official GitLab Runner, written in Go
+EAPI=8
+HOMEPAGE=https://gitlab.com/gitlab-org/gitlab-runner
+INHERIT=go-module systemd tmpfiles
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=acct-group/gitlab-runner acct-user/gitlab-runner virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v15.2.0/gitlab-runner-v15.2.0.tar.gz -> gitlab-runner-15.2.0.tar.gz https://dev.gentoo.org/~williamh/dist/gitlab-runner-15.2.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=36cd374c1a503e65a03498b1acc8f71e
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 69f27f649fb7..3e7bd3589c39 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/devilutionx-1.4.1 b/metadata/md5-cache/games-engines/devilutionx-1.4.1
new file mode 100644
index 000000000000..06b51f3963cf
--- /dev/null
+++ b/metadata/md5-cache/games-engines/devilutionx-1.4.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/bzip2:= dev-libs/libfmt:= media-libs/libsdl2[haptic,joystick,opengl,video] media-libs/sdl2-image[png] sys-libs/zlib:= media-libs/sdl_audiolib sodium? ( dev-libs/libsodium:= ) dev-cpp/asio dev-cpp/simpleini test? ( dev-cpp/gtest )
+DESCRIPTION=Diablo engine for modern operating systems
+EAPI=8
+HOMEPAGE=https://github.com/diasurgical/devilutionX/
+INHERIT=cmake xdg
+IUSE=debug +sodium test zerotier
+KEYWORDS=~amd64 ~x86
+LICENSE=Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BSL-1.1 )
+RDEPEND=app-arch/bzip2:= dev-libs/libfmt:= media-libs/libsdl2[haptic,joystick,opengl,video] media-libs/sdl2-image[png] sys-libs/zlib:= media-libs/sdl_audiolib sodium? ( dev-libs/libsodium:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/diasurgical/devilutionX/releases/download/1.4.1/devilutionx-src.tar.xz -> devilutionx-1.4.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	929e29d009c20f55b45c96866ebf47fe	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=effd750af1e21f5a2cc35345ba2b2bf4
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index abce900bc6e6..74b429f4bd72 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.1.01 b/metadata/md5-cache/games-server/bedrock-server-1.19.1.01
deleted file mode 100644
index 1f9126378697..000000000000
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.1.01
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install
-DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* amd64
-LICENSE=Mojang
-RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.1.01.zip
-_md5_=cd327b7e06186d65483755305b81e813
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.10.03 b/metadata/md5-cache/games-server/bedrock-server-1.19.10.03
index cebe217da1ba..138f6f5a8301 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.10.03
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.10.03
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
 EAPI=8
 HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Mojang
 RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.10.03.zip
-_md5_=aaf5f776bcbb8fa9b6ce8732514ba237
+_md5_=cd327b7e06186d65483755305b81e813
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.2.02 b/metadata/md5-cache/games-server/bedrock-server-1.19.2.02
deleted file mode 100644
index 83f471bdddf8..000000000000
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.2.02
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install
-DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
-LICENSE=Mojang
-RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.2.02.zip
-_md5_=aaf5f776bcbb8fa9b6ce8732514ba237
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index ca61458cd034..b6f3451944e5 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/gmmlib-22.1.3 b/metadata/md5-cache/media-libs/gmmlib-22.1.3
deleted file mode 100644
index 3fc8bf458ff0..000000000000
--- a/metadata/md5-cache/media-libs/gmmlib-22.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Intel Graphics Memory Management Library
-EAPI=8
-HOMEPAGE=https://github.com/intel/gmmlib
-INHERIT=cmake
-IUSE=+custom-cflags test
-KEYWORDS=amd64
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/12.1
-SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.1.3.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	929e29d009c20f55b45c96866ebf47fe	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c0a450badc06372f924c6ad845ca0029
diff --git a/metadata/md5-cache/media-libs/gmmlib-22.1.4 b/metadata/md5-cache/media-libs/gmmlib-22.1.4
index f07e9eeaf4d6..0bbff7188c48 100644
--- a/metadata/md5-cache/media-libs/gmmlib-22.1.4
+++ b/metadata/md5-cache/media-libs/gmmlib-22.1.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/gmmlib
 INHERIT=cmake
 IUSE=+custom-cflags test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/12.1
 SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	929e29d009c20f55b45c96866ebf47fe	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c01bc2ce8a6b9ef2cd5e127eaa9e6717
+_md5_=ad76ba052757e2f7495aecf6e9229f94
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index fff15cc320d6..85e416282433 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/teamspeak-server-3.13.6-r1 b/metadata/md5-cache/media-sound/teamspeak-server-3.13.6-r1
deleted file mode 100644
index 1cbd77e5e744..000000000000
--- a/metadata/md5-cache/media-sound/teamspeak-server-3.13.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=A server software for hosting quality voice communication via the internet
-EAPI=8
-HOMEPAGE=https://www.teamspeak.com/
-INHERIT=systemd
-IUSE=doc mysql postgres tsdns
-KEYWORDS=-* amd64 x86
-LICENSE=Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3
-RDEPEND=acct-group/teamspeak acct-user/teamspeak postgres? ( dev-db/postgresql )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_linux_amd64-3.13.6.tar.bz2 ) x86? ( https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_linux_x86-3.13.6.tar.bz2 )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=283b1ee460f2bbef42d7723dec4d11cc
diff --git a/metadata/md5-cache/media-sound/teamspeak-server-3.13.7 b/metadata/md5-cache/media-sound/teamspeak-server-3.13.7
index 2b75da482a53..d512c1fcdae1 100644
--- a/metadata/md5-cache/media-sound/teamspeak-server-3.13.7
+++ b/metadata/md5-cache/media-sound/teamspeak-server-3.13.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.teamspeak.com/
 INHERIT=systemd
 IUSE=doc mysql postgres tsdns
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3
 RDEPEND=acct-group/teamspeak acct-user/teamspeak postgres? ( dev-db/postgresql )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://files.teamspeak-services.com/releases/server/3.13.7/teamspeak3-server_linux_amd64-3.13.7.tar.bz2 ) x86? ( https://files.teamspeak-services.com/releases/server/3.13.7/teamspeak3-server_linux_x86-3.13.7.tar.bz2 )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4555ecfdd328760cd171612227acdc1c
+_md5_=283b1ee460f2bbef42d7723dec4d11cc
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index fac698a67af6..049e3cda153a 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.56 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.57
index 98692d7143c2..aa7617d9491e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.56
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.57
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.56
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.56.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.57
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.57.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.13 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.14
index fff039e2bc4c..e80c57cf7a3b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.13
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.14
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.18.13
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.13.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
+SLOT=5.18.14
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.14.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 80b848f7240f..8fc93eaf36c4 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.15.19-r1 b/metadata/md5-cache/sys-process/systemd-cron-1.15.19-r1
new file mode 100644
index 000000000000..f8924d543388
--- /dev/null
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.15.19-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=sys-process/cronbase test? ( sys-apps/man-db dev-python/pyflakes )
+DESCRIPTION=systemd units to create timers for cron directories and crontab
+EAPI=8
+HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
+INHERIT=python-single-r1 systemd
+IUSE=cron-boot etc-crontab-systemd minutely +runparts setgid test yearly python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !sys-process/cronie[anacron] !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) 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 ) sys-process/cronbase acct-user/_cron-failure acct-group/_cron-failure
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.15.19.tar.gz -> systemd-cron-1.15.19.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4928980e9aa4e7317373501d2ee3cda3
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 89368aeadb7b..4eca3c24cfc7 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 13864 BLAKE2B 373887a06bb63946485d0b9e08e52b3b3c3fbeda530b58fbe19569ccedfd0a8f7c63f073261fcef68edcbf9331108cf543382117b2f60c464926fff49fff9e18 SHA512 b3adafe44390700af75c3b98d6b21ba11902c1f2033fb07a8064382a68a6b6c023b73b318e0a8159e5911175172732771aae9261f870aee90bb5b6e69de3f24d
-TIMESTAMP 2022-07-25T18:40:01Z
+TIMESTAMP 2022-07-26T00:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLe44FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLfN9xfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBNOBAAkR4/CkGh2O36jCfbJ8VAj4GljZH39Zj3A/22tBC/5ukdM6J1ciJcnDvc
-YYhUdN4g2LqQZSPuCpfpibuUp4wcxKHcpHWXcmhWiIZRlW+aVFCDC6N7xPkbyvpQ
-QkRwNde+LTMkI3ikWm34UwFdSzB5m4ARC+AXxfTWL+80zYv0yup7V8XTEVdzXL/0
-es/mxz4euAhsDaLxnl5NxRIK8qyCLPfyPbz+NbSrmPiV6AGFD69pyXb+fJXuXaSl
-s+IDAp8XZ8VVCvnL9rTSypqPp8gxpy7QGfrhipI6k0VQ6Zfs0hL0IzOab+4avH7Q
-y/K7bFfY+l/FROVJtywCI9ImE1+4D6gkyWnbt5kn5qbVnyK55MA2yNuvKZzChoCo
-BBSYfyLuUV8y+Bs6li30dnCWkWvLITcYHlpFviNTqjtlg+w4hxQVc8yjEAFN1OAv
-FgbkRUxBFt7Mmw02S8/CPDA4gsKbmVn8XsuiS4sUak1Xvl/DMDN1IyxQW/VeAwoF
-1rz8+c7imSUtoYGOXXBvKEZyM/ez2nY3+I4HoJzwvfNRind6emBtDW9khvG16v99
-Vk2ZuRYG9owtPwDZ1tBOvXUeJ2I8+qMciZsciOzX1tbPjrd5fCShvehB736pr/IF
-SOzTzvYk7KSNizgkGsACFXdVsiGxvmT4so0M5ucS4JGoz4ky/o0=
-=Qt0W
+klCzXA//WMB2UgQj5yjOxZZIuiYRS3qQWdNY1jEYJc0aanN3fPWpRtkwfEf4X+in
+atmHGUCESHSLYoJRNhAiq/yIrI0XTOt9wBrAAu5klhgohwhPmywwLmPaf8HP4xMi
+/wJUTyTVF33fMKAul5dlNhKkMqwohDeC1vl9c9oWEzNcaVKUm9FMMYnSul+baLqq
+aT3HWELof4yXC+K3Las+zSpWDIwBwLYH43E1xd08vmkfiC2zm9UGi+qgmPkd7JGV
+D2+xTh0Tp1FqoJ4ComQrIOn3F445L4GXx54NqJl+oY8p+y+tRenPB4GzsHfOReok
+LeiZw8wrHgUDiMAn90OhQsNGD8fEdgoMj+euLGecNwlD7CXmsfoeNqz0KaBtlIev
+xK8emNBOmxOk7FkNM5S78syKQTSHNB7VPde79UgRyBWxTbPhxbviO3LVxTcbPbUF
+/CLcOKrySAhQxacr5d5CJqVaITQzSJU3DNh6JpSmGBLNRmv/dSSCRZIqoS1iVfJW
+6WnRJwVcnjkC/GBhR+jcXPae0kwmPejbefyvnCdxhAJtfQiQA0hM4Rhkr+9PFQ/2
++9raZOTtqx0PLaL6aa/jfYm98qJf05wm0BogHKc5vyPJCQxnEuuQfRm/RHcoFiuW
+4pPDNzbk9g8umTdIsZRmnJAsnX3pXgIoL2X/2oeUOg1bu3S7YZo=
+=L9bV
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 312267dc2aca..72da953e8d8b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Jul 2022 18:39:58 +0000
+Tue, 26 Jul 2022 00:39:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index fe0d2b1c792c..adeb21f2fa4c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jul 25 06:39:57 PM UTC 2022
+Tue Jul 26 12:39:52 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e842197ef68a..db418624dde5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Jul 2022 18:45:01 +0000
+Tue, 26 Jul 2022 00:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ad8817c35479..f976871d90fd 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-db8e8b8a716d4032b5414e2e1530b8525bba7e31 1658773405 2022-07-25T18:23:25+00:00
+0ae9dbf57b11a7d3d19a3737326b4d6807ef2b98 1658791594 2022-07-25T23:26:34+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e0d67bcfb245..f3dc7cb99c10 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1658774401 Mon 25 Jul 2022 06:40:01 PM UTC
+1658796001 Tue 26 Jul 2022 12:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 312267dc2aca..72da953e8d8b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Jul 2022 18:39:58 +0000
+Tue, 26 Jul 2022 00:39:53 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 76e819eedcbf..47248c37bee2 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d10d2026cc69..009e6e0fba64 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -76,7 +76,6 @@ app-admin/hddtemp:network-cron - Monthly cronjob to update hddtemp.db.
 app-admin/keepass:aot - Generate native code at build time, rather than runtime.
 app-admin/keepassxc:autotype - Add support to autotype the passwords into other applications
 app-admin/keepassxc:browser - Enables browser plugin support
-app-admin/keepassxc:ccache - Use dev-util/ccache to build keepassxc
 app-admin/keepassxc:keeshare - Enable KeeShare sharing integration
 app-admin/keepassxc:network - Enable network support
 app-admin/keepassxc:yubikey - Enable database unlocking via YubiKey.
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 8670743555d8..2c47b7e3a275 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 0d03a65da840..aaaea022174a 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,14 +9,14 @@ DIST patch-4.14.289.xz 4832540 BLAKE2B a4618e32f4f96b12d8971950bf96d9b592db8cd11
 DIST patch-4.19.253.xz 4758396 BLAKE2B acc1f07c337070313f5110e68f08bd4826513c00c2fd9fc7dc41c5f0093f6293ef613a5909d0bb60f1d1ac1aff581b914f997527d59c558aa8d5d4eb43beb3df SHA512 42a8569a4d37e78d0977009f01dd84095aad43555d311976d29aeaecdbb9d6bfd39fd106d73ae0bb7c186881d932c60ec43159709b32249acac7e5bdbd4b4ff9
 DIST patch-4.9.324.xz 4423456 BLAKE2B 9ad4a4fac55c0d9b5968f9282bcbaa8476bc5940941db3522ba94b402ef7adad6e3c35a0190097be796f09f2448ae4213b91146818f4204b49d0f5ff84c8c108 SHA512 4f6d5fcc92c557f7c03a5f2da2bebbf8f753e6d09b4b19f9ac5ca3feb25760cd1dd9b6421d50a70c8a6b533f410e5510cabf2df2230667140ad4e7ff1e1e9c6b
 DIST patch-5.10.133.xz 3462456 BLAKE2B e0d778491b5259ccac9bf5de997b4eb7d74b79024bcf0b03e6c81b6e66873dce1e6c014324815ff504e568bc4bfe5cf1d63e5c343197c267b09e35ee560905e1 SHA512 f193eb85ba720d6ec055a7535430b8bab0ca226e699a8c773bff460cbebe1e05001ef45e413b1b1f9f94314f9dcbf2033ace8b579fecc60055af70fb7781c25c
-DIST patch-5.15.56.xz 2243056 BLAKE2B bd82daf7c5caf87aa11b39b52ee9cd977bd96ea383319c65f1079693ebc067808d8c93948221231c4932c7fe9c1b3502f075dee4d67e9c654c6be45005fd7744 SHA512 e6c16c3cc3408495367c28173bcfd6d16b1acb9c016acbd3e1cdc90495442aa11cff061124946bd48fa6e8e081fdeaefb6c5719d8872e1ad5253cc2d94719368
-DIST patch-5.18.13.xz 653260 BLAKE2B 8380d9f5bb5f50b1a02860fdfd91bb965249cc29e5d46a377d44be62100c82b093994a2a81c71706fa8415c02d54309047a83566323de14a964f2dbe6a477b16 SHA512 a929884634a2820f2ab66397497926ab56c39f29694e15b19a461fbe8170c67ede23e0203a18e501346508879846331a9c49fb7b4053ed8a307d9ad2b00826c6
+DIST patch-5.15.57.xz 2273008 BLAKE2B c37438a609759e5d6b7bcdf54081214c76abc6497b3c3768c8af1ed90125360d0afd8f0330f82182d1b887575da1c9d8f0abfd86739b31817f1765b2670014b1 SHA512 4c1c4cc9d912bfc933c72198994abcf2fa0fd72110294f29966f8efc6753437b9d37df3d25e4cc05d47ca7c8893debdd8ba1d3f2fa8a5f64dc2093479078cf6b
+DIST patch-5.18.14.xz 682416 BLAKE2B 6d057b4a007ee308748196f2244a7ea4eb8fdbc3562063a0e565dc4c350d75357e8976e466d8b3f4bed4ba0cfa14bd6d91c11b72d7833ebeca87b27203856806 SHA512 b19f56ebf6bc7641ec565f0cea001dd4a0fc67d3e8bae642b732f1f76fbc43519b8844e2a9178a435c10e6226dce1fd11fcdc9be6cfcd76043bf2b58d2fbb92d
 DIST patch-5.4.207.xz 4110096 BLAKE2B bfe6cf2d363ab8d672f5ecee6a2d57551df52ac5158158b7fc161fced3cd513405723fa869ed39ab0f23d99b082ea68cd535ec235c3adf8186c79998831b5c61 SHA512 6d1f771ac4db79b69d1e8ab281ce21654d25e3ce6082f3d01dfea15a60928f979672b60ee1b028df337ea94b6e53f7cfe91e2a3066d607f12b1c4f85652fe1c5
 EBUILD vanilla-sources-4.14.289.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.19.253.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.9.324.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-5.10.133.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.15.56.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.18.13.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.15.57.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.18.14.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-5.4.207.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.56.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.57.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.56.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.15.57.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.18.13.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.18.14.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.18.13.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.18.14.ebuild
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 14f3cb236369..b2c94838a6af 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest
index 6450b7030f13..9aafce7b31c5 100644
--- a/sys-process/systemd-cron/Manifest
+++ b/sys-process/systemd-cron/Manifest
@@ -1,5 +1,7 @@
+AUX systemd-cron-1.15.19-default-mail-user.patch 853 BLAKE2B a6ba1e178995e92dfe9fbc4dfbfdae3a4f5545c97c4da9a0e66976953049ab789fbad57e8b8ce989bff2b1b64f422923b3078eafe68bab506223288462652798 SHA512 7c72ba576249eee46fa29a464059ce345729ae158a5bf5fe08bc04062b321a8dfaaa1bd383c1295382ceca8122c47283685add5027f19bdadfc82b3e1c1faeb5
 DIST systemd-cron-1.15.19.tar.gz 33234 BLAKE2B d03c7024f9e4e569086e60908b07255e59259bc90182e34897746e1477e1b59da1934f239ef7c673e5df52c1831f07b2e759aeb7c514ba23dbbbeb780cb08a7b SHA512 90ddb3584550714a21e88a89e804511af434432b95398f325f547ee226499f8b73e153b9cdb611a11389baf434d12bc39414244b0e5e1d4565ceaac5db12b012
 DIST systemd-cron-1.5.18.tar.gz 33056 BLAKE2B a400d0169c2dcb68c91358bd2af70dca133749dab801dc87b4cdf05b8ccebe5e250466bfce93938e575aa2d832af9a4977be2f02767d2d808e45b11888277c95 SHA512 7de6a5d05ee1d73c5348ecedf6029b498b26e8cdeecce87b58f206a1719c4a90fba853eb99b860734174469c99c75a4a6fa33c13b4aac45fdc71de7f3231b9e3
+EBUILD systemd-cron-1.15.19-r1.ebuild 2653 BLAKE2B 9c675400130da7f49a7d080fbd6de5aa9ea02b240027abd9e5a33bcacc5f8af5d7e151c2a72ef10c0e748a822127cf16117382ed2baa7e862981f0c4b79d1282 SHA512 2ed37a799ebf6e4419b130c8ea2168a2ece5242fceae8bcbd0e202921fe39ea6f49aec3772b304362913a3e878006141b29deb7ca50475134a30211541d9a776
 EBUILD systemd-cron-1.15.19.ebuild 2442 BLAKE2B f1f024b38571ee186f86643670a8d03c72fe1efa8535164b8659b7ecaa0861bb8d3c82193901ab72bf1b6d4a6de4b51f8cf29b3ea74d938885a7977a7135b174 SHA512 a15e6ba9e15cd17942e78fe2ce973d155558dacd3d074eefe9b6ddfe37663321e47a9549276fcd4fe77babd842a105a28621e4eb83c3eb4b8433e940e5c77772
 EBUILD systemd-cron-1.5.18.ebuild 2485 BLAKE2B c7f6bc444cb081caebc1614739a5d48ce6ede2d3e993d488346f3addd19f13078ed51b1c96814340657c737a9e475294c415acebaf0f51bd6c4188eb9a6c8a92 SHA512 490277cf2f65115957e60c4fdd515b442f70045f6d45bcba4304e8635d38a5fc37a2a6a0e76fe6f52893af1a404850bdb9cca0a8d74d684e7215f32a02b79583
 MISC metadata.xml 801 BLAKE2B 8ac1580d5dae701d11c893bc7d9990b8a0c023c148b9fb7a945ba7f12429dd4a2abc78331f659831fa26b5f5c570919156848c3ebcd4df7ea050fdc50272f43c SHA512 1c7e77f04d294fc51de86b07f63c9163468dcb321d14c8447c61a4a0a7f99efc438d6ae1ffe315cf148377c2ac5e038afcc93f68516b11ca5eb066f8b186bcef
diff --git a/sys-process/systemd-cron/files/systemd-cron-1.15.19-default-mail-user.patch b/sys-process/systemd-cron/files/systemd-cron-1.15.19-default-mail-user.patch
new file mode 100644
index 000000000000..420f68d81091
--- /dev/null
+++ b/sys-process/systemd-cron/files/systemd-cron-1.15.19-default-mail-user.patch
@@ -0,0 +1,28 @@
+From 525410d5dc2a7c33590d25d6c574dec7eb826ec1 Mon Sep 17 00:00:00 2001
+From: Richard Freeman <rich0@gentoo.org>
+Date: Mon, 25 Jul 2022 15:36:21 -0400
+Subject: [PATCH] Fix default user fallback.
+
+Signed-off-by: Richard Freeman <rich0@gentoo.org>
+---
+ src/bin/mail_on_failure.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/bin/mail_on_failure.py b/src/bin/mail_on_failure.py
+index 132eab9..dd2288f 100755
+--- a/src/bin/mail_on_failure.py
++++ b/src/bin/mail_on_failure.py
+@@ -26,7 +26,9 @@ user = subprocess.check_output(
+                      ['systemctl', 'show', args.unit, '--property=User'],
+                      universal_newlines=True)
+ user = user.rstrip('\n')
+-user = user.split('=')[1] if user else 'root'
++user = user.split('=')[1]
++if not user:
++    user = 'root'
+ 
+ mailto = user
+ mailfrom = 'root'
+-- 
+2.35.1
+
diff --git a/sys-process/systemd-cron/systemd-cron-1.15.19-r1.ebuild b/sys-process/systemd-cron/systemd-cron-1.15.19-r1.ebuild
new file mode 100644
index 000000000000..400475508671
--- /dev/null
+++ b/sys-process/systemd-cron/systemd-cron-1.15.19-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit python-single-r1 systemd
+
+DESCRIPTION="systemd units to create timers for cron directories and crontab"
+HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"
+SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid test yearly"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=sys-apps/systemd-217
+	sys-apps/debianutils
+	!sys-process/cronie[anacron]
+	!etc-crontab-systemd? ( !sys-process/dcron )
+	${PYTHON_DEPS}
+	sys-process/cronbase
+	acct-user/_cron-failure
+	acct-group/_cron-failure"
+
+DEPEND="sys-process/cronbase
+	test? ( sys-apps/man-db dev-python/pyflakes )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=( "${FILESDIR}/${P}-default-mail-user.patch" )
+
+src_prepare() {
+	python_fix_shebang --force "${S}/src/bin"
+
+	sed -i \
+		-e 's/^crontab/crontab-systemd/' \
+		-e 's/^CRONTAB/CRONTAB-SYSTEMD/' \
+		-- "${S}/src/man/crontab."{1,5}".in" || die
+
+	sed -i \
+		-e 's!/crontab$!/crontab-systemd!' \
+		-e 's!/crontab\(\.[15]\)$!/crontab-systemd\1!' \
+		-e 's/pyflakes3/pyflakes/' \
+		-- "${S}/Makefile.in" || die
+
+	if use etc-crontab-systemd
+	then	sed -i \
+			-e "s!/etc/crontab!/etc/crontab-systemd!" \
+			-- "${S}/src/man/crontab."{1,5}".in" \
+			"${S}/src/bin/systemd-crontab-generator.py" || die
+	fi
+
+	eapply "${PATCHES[@]}"
+	eapply_user
+}
+
+my_use_enable() {
+	if use ${1}; then
+		echo --enable-${2:-${1}}=yes
+	else
+		echo --enable-${2:-${1}}=no
+	fi
+}
+
+src_configure() {
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--confdir="${EPREFIX}/etc" \
+		--runparts="${EPREFIX}/bin/run-parts" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--unitdir="$(systemd_get_systemunitdir)" \
+		--generatordir="$(systemd_get_systemgeneratordir)" \
+		$(my_use_enable cron-boot boot) \
+		$(my_use_enable minutely) \
+		$(my_use_enable runparts) \
+		$(my_use_enable yearly) \
+		$(my_use_enable yearly quarterly) \
+		$(my_use_enable yearly semi_annually) \
+		$(my_use_enable setgid) \
+		--enable-persistent=yes
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/lib/sysusers.d/systemd-cron.conf
+}
+
+pkg_postinst() {
+	elog "This package now supports USE=runparts which is enabled by default."
+	elog "This enables the traditional run-parts behavior."
+	elog "If you disable this flag you will get the new behavior of having"
+	elog "multiple jobs for each cron.* entry run in parallel with"
+	elog "separate services/logs/etc."
+}