gentoo auto-resync : 11:07:2023 - 04:28:45

author: V3n3RiX <venerix@koprulu.sector> 2023-07-11 04:28:45 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-07-11 04:28:45 +0100
commit: 7e110ec617b903791c3d309845e11a8b27f441cc (patch)
tree: d9e8b4826e21ef9fa1fc2255d459f563d5581283
parent: f2a91413828611d85d0496e98e1656e9b0e4528b (diff)
120 files changed, 1299 insertions, 413 deletions
diff --git a/Manifest b/Manifest
index 75a032191510..5a2e70f67747 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29327 BLAKE2B 9d91bddcac69a7c4c8b763c1bae79184eb936880cc8d30e59f2a19a46db54f5fa36943f9167fe943604a0540aa80a87870325e4becf49a513d7febbd00394995 SHA512 d2e88d38ab2f4b6eeaf864c80f2c27e44b30728a6cb285e4b966b3bd49fc5cb2b39698841735bccf3ee1a78d60c7bb8a7409e47651fe58a7619cf7192fb2123d
-TIMESTAMP 2023-07-10T20:39:49Z
+MANIFEST Manifest.files.gz 29331 BLAKE2B ec2566743277cdab9f7edf2401009f7f5d6718cf9d8035ad74e8e50f62736cbdbd8583ecce04eecc470fdc2795255aad0863b2d2ca61d9d1de9b74b28d2d2cb7 SHA512 459e5d5ad27416f4dfb3c8e769099d5a6092f25034866cd6d8605cb81be117d61ac6efab015f7e6ef74b98c9a2f01abe2b2ebc0dbe22c394821423a64d59726d
+TIMESTAMP 2023-07-11T02:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSsbJVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSswPJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAj2RAAkx6tJ111hmIse5mkOwZR0IKiIUdNwom6aiklJ56ueAOXgYo5KNGLQBDr
-Umnaz6WjP6GhWrIuw6ekTZLMabZK8XvK5Cz96ByNxUyMvbOXoAOq2DmqBOT2xDzT
-oNceJO+ErVnwibXOOh3C3mNVtUmwFmOs6Dnoe+U4MUrUPuvIbqZW6l1ecXPRLJ96
-BI2TzpwyQ4lsRRwq93g/KB5JqxneoZ9qJEHQeU832ii2DsAuCxVRz1tilWOwy6i0
-W9THySi1rBwkKCyJIB4Z4WyXco1cGa4Mb4vZokFgmU+kqLWw4Nf51YGRvlqAshI9
-ypjkiP+OHTQErTK7GuJD0h1R/naISS5bCVQ0PdhiyqjCN209dCBWXBy7i2TPcQfB
-/Htlt7BC9ehbtJDVQGG3a/6/+As3tjV3SB1KZsrI7AFL95vhSI76ZRZNFdLh+XBM
-sTyELaMk+ldYMQoi+Thy1fG6qDSjpfvVe7GOtfqBnUa7KNFWNz5dlhqn3a25Eon4
-dbtV68/zW+DaZD8gK9APRThFVy7JP202QD9fqiW19b/v2/9+Dg0+DJPaP6rHbuKS
-/f6Wgb3RMaeJ0x8ozDgwrUqpGSzsZ0LTb0RHye//4AV9bgB6j4d0VK5OjTepP9C2
-2WIit6EvpCP7WQLfTVkhdH6FrBWOfh3glBRCoBcFaaoroGkltP8=
-=PCrO
+klAEdw/7BJApgTy20BvH11zZlnQ49qOmEjrHB38CnhumPSws2hpWoK2zFSD59lKP
+EhYuMREP20yWjbf1vHLLATu6CLX03KN/V8WmFoOihXtVr4aqeqrH6gjZOTxNNGKm
+JD9RvP7F8RzKYT8RY7W6+zr6K6Blo96tZsNHFhziHh7ZmO0UrHCa2t+x25MtUu3H
+RyNH+bAZ7NymXril6hFFTBr4p6iRph9ZVIGujY7FPWXob5S02iKLYiVDnyyB07pu
+q4+P+b8lrorL1/ov9PxCB2Y81rt2j3K4d1i4bE//bczIekGJAZ/VsOvLJT5iaFAP
+Ae9iWzuMKKxACZsrX2GoFeWPV26VpLwjnDRWt03jScA60Vk3BH4nf6yoxJj0r7Am
+VzdlhOe0qjW5xXXpWWT+oFJLDmzi9ZNDMS3sIu1hSHNsynu0KEBtLD/QhTe8y417
+IdYdsDLWYIY5YrLa/Kw9wR+hKSmAswjYzBB34YQUsfs8VHRzRShZLsgBsKawOGKg
+Le8pPpTzczXg2bbsRdXyVecUQmUHXwKmO/2KazcQKwOf49v2ZuHtkFUph/A9TslN
+eKjksXF1i1ZP+8C8fzHMYHIkuJqsOYkV+/Fkuo00W3sxBQ2lvIG3APGprJ9W31RK
+Ghn1j6ud0bZPY2ZokUHCdrcbw0SKSIowKSLkLIItSd5d9/Dl8Ks=
+=rFnT
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d8d84474fc8f..7ec5edc1f84e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 4d3243630164..952289388e14 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 50359954341a..cebb14a19275 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -2,12 +2,10 @@ AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0
 AUX borgmatic-1.7.13-no_test_coverage.patch 248 BLAKE2B 624e21cc8971d9374b34dee002635d9090576ba785cf3b6da7c10a91f439fd8e11b335bb33dc9c3b7421b4a5a8982e2a5f67b723b06051969651d626f09bf972 SHA512 fc549c0a63a6182b1848d89a1c9aacd3057f07988d1e8ec3b6ae1defb0675e7b934b0c65c9b09edc431172bc550521058ab73cb64ae6e577072331d4d5269e78
 AUX borgmatic-1.7.14-systemd_service_bin_path.patch 604 BLAKE2B 534a545b5a8d65c6e46102a5e558c25444d82dd3679b81c0ba50c72dfec8ce8f935fdcb558ff61fec7bf30409b4b9809d76e7488554f4461c4b5eac035a60c07 SHA512 9b4c65b249a033f17b68c5209c0132bd94e310d46193a9a85090cb8520220705aacd91c19d713e11e6955c1e0b1e09823abcaf8164ab0f162ff9a62652bb7e56
 AUX borgmatic-1.7.3-systemd_service_bin_path.patch 604 BLAKE2B 9b1c613ce2667d2b8846e1bdf7e7bd838529fb9029af2ca572dcbafc5a8c9b64c79cab820be3b750c5fcb060da72cdf1c449cbe50efefe63ef1eb6a884e26e14 SHA512 6ca6c351697db1ae26de2b00ad543fc8f1cea1b0f4ef84f82f9578d9e56da58b4437ed48839c5aaf7d5ea66fcb79620d0cc12b8a2b30862b488fae07ad182638
-DIST borgmatic-1.7.11.tar.gz 365247 BLAKE2B a06737c48722fdf24efca76d40f6b413f39635b4137685d6279bf7a7dd002fadef28dab35a503fabf872c732a0f32fbff8c791fa9b4602299937aeae568d6137 SHA512 cedca889cd409e92484c15240fd8da91c655f81e38c6672d25e44feedc4adf6594281d92f7072fd11edc5c9f8589098226a3520e71e3441ee7a7acf97e1b2daa
-DIST borgmatic-1.7.13.tar.gz 378163 BLAKE2B c20b384853c0ddf52a095250a05d9ebe813a23ee6ef00bd5748dacf05adcff9e4d324eb2e785ebbf139d34cadab3e58d3b8305d50ec5ff20681630040433e5ae SHA512 5109c093ad3096269e27abe761e6e87ebc31b78a56bfe16e540c686ea1cd935249d063aa7c350b60a3c509990065f3a50f9e4516d40d4a1bde68c43617de18b4
 DIST borgmatic-1.7.14.tar.gz 380875 BLAKE2B c30939392df03ce03feed4c5132ef99eaf9c676f51f7ad6b8bd536f45a7e76eff1871fc5bf0d7fd0025835b51325e961f538a661f2f6a78e0ce026550a9ecd84 SHA512 15f774b994d13ab224bcbcb0335145b5cf9a2fca04b098c15bf790c20fc5033073fe341a76d4e9dc8ad85e5fb898a0447c73fc5bc74d0ac9ec6900c333e6660b
+DIST borgmatic-1.7.15.tar.gz 390819 BLAKE2B dc9086a0363afb8acbe943776cd6f388ba85a18e50554b5187c86e7054e7ff748ea878623d9b46c19564198faf5c566b137e54681812086115311970bc517455 SHA512 cf1f6da782a5ad547a76b9e4cb00cbd4ca4232cfb5dcd027c6fee9f1a3b97fda894f27c512007b449b8e11e939249060f63c3cdde29aee3aa86710200cf8d2db
 DIST borgmatic-1.7.8.tar.gz 350233 BLAKE2B 3fcd392983f73ec5e97f0dc6b96e211d7f1e1d1a4ce95c635c675cf043e796925df53c30c1e4f8eb1a095d9ec5ff81e90edee5ff2576f4683053d3108004afd9 SHA512 bcc65fdb7ea1171fb61deda9b1f69a00596e1e10a99508d336977b694bd8f93d74837aad9211bf1065b785220aaf1460a3ea403bf23fa4873d1bf4c6b4016525
-EBUILD borgmatic-1.7.11.ebuild 2046 BLAKE2B c7f49967f3783c437566bfc3819ee42c953ede06df4996efb565d1f39b133f8f0e388f95c91d9637a17f00344b10a151aaeeaeab7b3e31cb953c9542b23f20d4 SHA512 bc18e9feaa4aa68ac4cee4e99e576f79f5b7b2c520810ecd798ed416739fa254c59c7e4fd40adb44d04421088dfab9776acba9c653d8b42d0ce91b9e765465c0
-EBUILD borgmatic-1.7.13.ebuild 2047 BLAKE2B ac75a7aa37070e15819b02da978ecb319a18277733880b355b397b3f9196501f3c4d9cd54f556422d334e45378908a6a1e32ec1153a6422764af66b84fde32c0 SHA512 9f05bb948ea55cd006bb67d6ebf9286adc027096e9fca4b6fd00e5b84b2c8bf7760d846d5fed5336adc2b85bb11dcb575790d12819ad977c4e36561e46c2942c
 EBUILD borgmatic-1.7.14.ebuild 2048 BLAKE2B 8b06498b565462070010efca152439b4de2f0be91c87569679c4a243c0a3f8e03249c382b2defd5e81e75138b43dc656c6fbbf81a1d119f4f569080052408a68 SHA512 227adf4c2f02cf6b9bdf8a491a758d5f4c1f34cfed677b3f58ca920cf9e477de7fe1978df03c14f4ea1a544787c06f051fc6dec79e533000b9109b1960c0cde9
+EBUILD borgmatic-1.7.15.ebuild 2040 BLAKE2B c204fc85f282faf5e1b7834a2900d524c5bfa0bce9de4ff8b56736787d0c2c9f9beb3b75ef96dab3cf490a8b7008182d995465ef41c4ae4c884969e6a766358b SHA512 6aed82522fcc67f7c20234a2eae5810eb02f4d24cb297192fc56aa67b22193b62631fd47ed042eba995ce21ffbeb1189c0c3b092fbc54d6ac3ca454bbc18603f
 EBUILD borgmatic-1.7.8.ebuild 1643 BLAKE2B 9e05c2bfc9894d3e3636d17254cbd6d386d44fdb3305d16278be5a42d6bd56f3d1e0b81c53245b264d91118b10c03fc9515573146ad47b15b5b8148f77c849e5 SHA512 0c3788e897ab3a838548f456a6b3ccbc644d877f7ce83bbbbea59f9f586c3e69af44222016cfb0fe803e639baeebe61d7e77b5160b4ed7ea223add48c3dbca6b
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.7.11.ebuild b/app-backup/borgmatic/borgmatic-1.7.11.ebuild
deleted file mode 100644
index c0230dbfcdbd..000000000000
--- a/app-backup/borgmatic/borgmatic-1.7.11.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd pypi
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-
-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.7.3-systemd_service_bin_path.patch
-)
-
-# A fragile test whose only purpose is to make sure the NEWS file
-# has been updated for the current version.
-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"
-	else
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 1.7.11; then
-				ewarn "Since version 1.7.11 ${PN} defaults to a different way of selecting archives for multi-archive actions."
-				ewarn "For details, please see"
-				ewarn
-				ewarn "	https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#archive-naming"
-				ewarn
-				break
-			fi
-		done
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/borgmatic-1.7.13.ebuild b/app-backup/borgmatic/borgmatic-1.7.15.ebuild
index 89d5cb17e987..952c8c26725e 100644
--- a/app-backup/borgmatic/borgmatic-1.7.13.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.7.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
@@ -33,8 +33,8 @@ BDEPEND="
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3-systemd_service_bin_path.patch
 	"${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
+	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
 )
 
 # A fragile test whose only purpose is to make sure the NEWS file
@@ -54,7 +54,7 @@ src_install() {
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
+		elog "    ${PN} config generate"
 	else
 		local oldver
 		for oldver in ${REPLACING_VERSIONS}; do
@@ -69,5 +69,5 @@ pkg_postinst() {
 		done
 	fi
 	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+	elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
 }
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 5fb8251ec7b1..01b9b9b5afa0 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index a6806ce866a6..c300700f4b08 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -2,5 +2,5 @@ AUX gramps-5.1.3-test_locale.patch 1195 BLAKE2B 1b1aeb08b90bff9db9d028499428efa6
 DIST gramps-5.1.5.tar.gz 17425167 BLAKE2B f07fcb84c28f1def84c5568da6ac38a78def8657a0ee010163cb7e0899dd94ebb1c851e2c9d207fd9725754363ac7243a66f0de6e0d9708270d2d43c90485212 SHA512 8e36e8da7cfb41cc0c77881993cfc212a15bf9775dad3c8be131889b70360117e023b6837b91dad28fc03198080290a08c8089856c753246ff14c7fc3bca38be
 DIST gramps-5.1.6.tar.gz 17429153 BLAKE2B fe94d80ff209e1f27ec1cfa533e916514336c1d367435e0a9da4b8309efbc9c047302a67ec24e28237eaead67ff63e76bd1384ac1e3df10e08ae98aca126566b SHA512 419bbfa54ca3bf33e71fd579c84a56eebe4afc78ccd50c23b2d62869684709ccbf373e8da0e65835d9fc21a29d2d144597d6cf8c425e14c91574535d4b1ab64d
 EBUILD gramps-5.1.5.ebuild 2910 BLAKE2B 23b626f1dbcb0b4076162b855a3adbb43ebd0d2124173be5df10fc0f79baec1d41dc4f954ca05b68d265010726fa6e308d8c45f859dd086c50709c00920ec836 SHA512 a4dba3514bf4cd44a3472de3741ea9ea97bd240a706aa9049152946485c61f1e737a1c4fcee083189a1ae0eaff298ebf704b812c10f6e40f1552c59c167f30ad
-EBUILD gramps-5.1.6.ebuild 2795 BLAKE2B e7575bfda3e64bb818eb7535ea1ca6cbb2cae9e146b23c8916d3e475257fa00324b36147ea0f949b1a20883d4d87485c0002e5b949ba9761f9c5d34f8e8a39c0 SHA512 dbb0d03df6123d80f4fb367c5d9025982e914d1d366655be22830c5f58c0165e198aec33add06e5e35efa9c92981102c1cede62b8183470c88363da5ba67cd0b
+EBUILD gramps-5.1.6-r1.ebuild 2156 BLAKE2B 13b504c32e687156be9da756b20063cc0a449f68ffcf08846cdac421ec268599a418c35e33b718d07671e081b9bfea3e0d0944141184c367bccc29795ef03b01 SHA512 48e4ea73dcdc1c099d9f029d8eb887409729a25568c70a7de5730de4e0580fd2ad2d9c7b3d65f9a6fbdc3871a28977e9e15e332918a830460c7b4de198062aca
 MISC metadata.xml 5703 BLAKE2B 1c4879fcccfb62b99140eff6e5059129bc75b0a6f5f6d55167981b0ca3476e286a786caec2452c5aa9690e287c7142e3e443edc7ef8ad1d6ea4002d37f624647 SHA512 c3c926d1da8d57f5dc3b9f0691299552aceeef437e01f9385a6555c5fcf1ffea82fd1f9e87f20e23bc54d7578e0819786f1d1bc59d633cc30bbd9e79f236f3b5
diff --git a/app-misc/gramps/gramps-5.1.6.ebuild b/app-misc/gramps/gramps-5.1.6-r1.ebuild
index 35795730b469..01e06e6e7b85 100644
--- a/app-misc/gramps/gramps-5.1.6.ebuild
+++ b/app-misc/gramps/gramps-5.1.6-r1.ebuild
@@ -3,13 +3,10 @@
 
 EAPI=8
 
-DISTUTILS_SINGLE_IMPL=1
-# Sadly, PEP-517 mode breaks both the test suite and the installation of some of the data files
-DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="sqlite"
 
-inherit distutils-r1 xdg-utils
+inherit python-single-r1 xdg-utils
 
 DESCRIPTION="Community genealogy program aiming to be both intuitive and feature-complete"
 HOMEPAGE="https://gramps-project.org/"
@@ -21,10 +18,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="exif geo postscript +rcs +reports spell test"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 # Some of the tests fail unless the deprecated BerkeleyDB back-end is enabled.
 RESTRICT="test"
 
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
@@ -41,6 +40,7 @@ RDEPEND="
 	reports? ( media-gfx/graphviz[postscript?] )
 "
 BDEPEND="test? (
+	${RDEPEND}
 	$(python_gen_cond_dep '
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -51,44 +51,27 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.1.3-test_locale.patch
 )
 
-distutils_enable_tests setup.py
-
-python_prepare_all() {
+src_prepare() {
 	# Install documentation to the proper location. This can't be done
 	# easily with a patch because we substitute in the ${PF} variable,
 	# and that changes with every revision.
 	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-	distutils-r1_python_prepare_all
-}
 
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		--resourcepath=/usr/share
-		--no-compress-manpages
-	)
+	default
 }
 
-python_test() {
-	# Gramps builds just fine out of tree but it confuses its test suite.
-	# The following at least lets the tests run properly in legacy mode.
-	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
-		die "Failed to symlink build directory to source directory"
-
-	# Set a sane default locale for the tests which do not explicitly set one.
-	local -x LC_ALL=C.UTF-8
+src_compile() {
+	${PYTHON} setup.py --verbose build || die
+}
 
-	esetup.py test || die
+src_test() {
+	LC_ALL=C.UTF-8 ${PYTHON} setup.py --verbose test || die
 }
 
-# Ugly hack to work around Bug #717922
-python_install() {
-	local DISTUTILS_ARGS=(
-		--resourcepath=/usr/share
-		--no-compress-manpages
-		build
-	)
-	distutils-r1_python_install
-	echo -n "${EPREFIX}/usr/share" > "${D}$(python_get_sitedir)/gramps/gen/utils/resource-path" || die
+src_install() {
+	${PYTHON} setup.py --verbose install --root="${ED}" --resourcepath=/usr/share --no-compress-manpages || die
+	einstalldocs
+	python_optimize
 }
 
 pkg_postinst() {
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 3aa2a7f0c027..0e48ac731b1a 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index f6f49ec05994..26484e54d3cb 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,5 +1,7 @@
 DIST benchmark-1.7.1.tar.gz 196575 BLAKE2B 05a0ae69c0eee231b5d3c06d474c89680e4a2dfaae2ac0ffa1777cf011907cce6230648bfdb631008c2aa10f01b55652f58949849714d6333c5a0351ef42e567 SHA512 396af1c1d3eaa2b78c6d23b1472f6088db85a294056ae1c2366dc5c0becdc8f141ba8fc3a235033324ab0a41c2298f5d242ef09b9b6f69d9877de6bcb2062efd
 DIST benchmark-1.8.0.tar.gz 204701 BLAKE2B d4a2b673152c784efef118b7c5e2971a7f7749b2bbb3b5eb09d1567261853a3e85983e82bbb3a470be72204581a2d031b194cb92d4386e120ffaab71c8a58f6b SHA512 ae8df163ca1319752a03497a259800dc33c71164e7def2feeadcf18d018c64eaf846ea2a562183e3d3cde0af58291de0b091ec6d9c025076f469c403b2ab0d51
+DIST benchmark-1.8.2.tar.gz 205926 BLAKE2B b39ee0c983e1b7417c54878507e692d9bc04d83da91c8059ae08373fc59286f28b8910d1d5ea425b0c512502de0aee51b10b1b191bac3ec29ec5f9ffc9056d64 SHA512 532f2cee66cf527ef4452a060cfdedba6417e5d8f72225d6bf50adf6422d9a769b0f54f48982b438fa9ced975ac47bcc5e62c3c23ce871b5cfdbcf9cc0d2b829
 EBUILD benchmark-1.7.1.ebuild 912 BLAKE2B 46027df03fdba76ae5fc34a442feaba1d417669344f2a75980896299a269356c7a0ce5cd60f1f0f495508f5e0795743b1a5166deb6e96068e81b892b2a81841d SHA512 68a1bd35e2b84a3f4fd35124478e46afb300dfa16a50c206605dbfca47518bbaaab207131780cf200cd374ed8af37b4c037b1425330d662e2e57f45f52f54326
 EBUILD benchmark-1.8.0.ebuild 917 BLAKE2B 7f1097d1fe7c4389e3f44e30895f62e14d9db9e593a79ee634bb7cf85ab255f83a47eb2d526871abb21d95f741bb18b0fa34933a39c610306bdc44a2cb8d7503 SHA512 cf2d8204f16d1398e992b58870a0226eda878aa2c91767fe106be467c6d3049492053da38d2520bc1a7fe1b6eeb1d2d115674514c84d53c9cd31867acf10c6cd
+EBUILD benchmark-1.8.2.ebuild 917 BLAKE2B 7f1097d1fe7c4389e3f44e30895f62e14d9db9e593a79ee634bb7cf85ab255f83a47eb2d526871abb21d95f741bb18b0fa34933a39c610306bdc44a2cb8d7503 SHA512 cf2d8204f16d1398e992b58870a0226eda878aa2c91767fe106be467c6d3049492053da38d2520bc1a7fe1b6eeb1d2d115674514c84d53c9cd31867acf10c6cd
 MISC metadata.xml 563 BLAKE2B 2c825b6895d64a3e5e4ea6b61a707e03e14873bc5fbe9f67a756a56c8edd0dd04dd8f3aa1d1a80bf8b4921f25aad19320222b3607494ab512d3713152b1ce41e SHA512 09856cb99c18336b143b725f8acd7fce84d7cce2aea22f03f80934f6681161fcf667f084af236fd654051acf4a261c7e25026822ce3ab79d6fef0ea3212a601d
diff --git a/dev-cpp/benchmark/benchmark-1.8.2.ebuild b/dev-cpp/benchmark/benchmark-1.8.2.ebuild
new file mode 100644
index 000000000000..10aeaa981372
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.8.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 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/gflags/Manifest b/dev-cpp/gflags/Manifest
index 9b8b6d34b38b..d287a3a75a0c 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1,4 +1,4 @@
 DIST gflags-2.2.2.tar.gz 98704 BLAKE2B 54cbf3b0a422d662e89c1921614ae9f20a4a383524d374d1e7ce1473eff0a6e121c1a2255df0b9d27ae9866c8e63094b908534c5fd2173737033cc0f184a5e4f SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447
-EBUILD gflags-2.2.2.ebuild 1025 BLAKE2B 845c06482234435cef110520dda50a08db6fdd50bf5a6fc97e0ec2737e0bab8d7ea6e79e0fbeaf2d9791ab0043d98a24076524eaec200f7f70ac4b610b360f04 SHA512 bcb1acf03a22b453563f381be854f9a70466c04dd5b7cc05d985248a07203a00e78a335f122ee40aaf71074cfc2a8a66c5e5234a29f39f98151229a53f31ef8c
-EBUILD gflags-9999.ebuild 1020 BLAKE2B da1b451350f59314cfe06d4ee218b3e1256ccb489ef78f91ef4987804c5b77bba54b652fc5611f53bb362d05e1718e4d3e017bed419267d192b700d7a549e8ba SHA512 12f7287d79ceb72f9a0ca4015791a1b3dcc0b83a63f2b61cbca2457efe4f703d04870739bdf9f47aa12e5b369150c49005ed659d33c4e0c3860bf76075d4c8e0
+EBUILD gflags-2.2.2-r1.ebuild 1059 BLAKE2B 0cdb99a8e3290e4e5e4cad995cb52b2c1228870a9685f7faec73e50d05efe5eaa8dd83ff4736c0a6778b6bee0d76f15dd5f5be799b04ec057a00441d2f69bae6 SHA512 2d443fa89dd54ba622e21386d0b1fa091578059cd7541608b6131ac7fb6e24597967b646ec6b5e987b61b60ee5d70d6563ec6ec860038c5c1457af7793639e80
+EBUILD gflags-9999.ebuild 1066 BLAKE2B 23fc75e77551362ee23c414cb571ab0410038b1f948fac3686e2c6cfeb1bd5f1b8f5d07a73c34916a9e5b84423dd7579c7f0c56b2013a422a0ec4e0f1c657e58 SHA512 5348253c9ed0795bfeec89e22102dab7518348db3d474e8df480ecc4484c143f2dfae0aeb2ddc0c2c8962cf5b8441293c61f2d9b37327d600f7bb32f5615b236
 MISC metadata.xml 304 BLAKE2B 60a6da87c20f4ada3ec9a2422aff9f3fb9eb1a4705f95dbd571188162d2463c29816c96749afe2b79121111251152c41cad9c3ecc71c7cbff39b1b828fd3e1dc SHA512 d05d1c3c886539f75bc1edcac267dbe1c38db77563680091c2a3aab915a0982a43fe9570b5c8b6180a9d2b7fdc1cc96dca313e2a7339a4a6f398cd09eba90f9e
diff --git a/dev-cpp/gflags/gflags-2.2.2.ebuild b/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
index da0ea88c47b5..a841f16304c3 100644
--- a/dev-cpp/gflags/gflags-2.2.2.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
@@ -25,6 +25,8 @@ RESTRICT="!test? ( test )"
 DOCS=( ChangeLog.txt README.md )
 
 multilib_src_configure() {
+	append-lfs-flags
+
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DBUILD_TESTING=$(usex test)
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 613e8bc12948..a6c7626265c0 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
@@ -25,6 +25,8 @@ RESTRICT="!test? ( test )"
 DOCS=( ChangeLog.txt README.md )
 
 multilib_src_configure() {
+	append-lfs-flags
+
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DBUILD_TESTING=$(usex test)
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 63de9e54dd9a..79759cebcedc 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 2d21e7361f1e..db56983a324b 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -2,8 +2,10 @@ AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f
 DIST libbpf-0.8.1.tar.gz 942702 BLAKE2B 084be7d4258500fa894560ed2e52821addcc5d150dcd77fd646271b614d788b7931271be9c3e46fdbc4ed93d053ea3e09023158a8e4a31f9452d10dcb0677b58 SHA512 e3bb602f55215a4f030e564af7321ba6338937c426fcaee478b607f88b0c773c40a0c3f59a2b345bda951a19e79061733f8a3fdc10a6292e92782e65754b584a
 DIST libbpf-1.1.0.tar.gz 2337951 BLAKE2B 70bee4e94c3b372501e1697cec6573fb3292e61236ed210bde4c3a838494cc951571d7c47720c28a47b8e038331775d66d3f4ad24423f5102e1ee708d1981f88 SHA512 751126893883c68e5472724988327e03f7f52becd472f7d6239fa838762f857e54a0347f8f824b8c32ca93b8f419310a86e1d75e3646dae72c2d2992d093b828
 DIST libbpf-1.2.0.tar.gz 999623 BLAKE2B cd10fd9133f01d3f8dbd5ed4585e5605c3b9fb0d9f6ee76a49dcb61a0555edfeb85e333f7b8eb069f47a65d0ab24dcdc33502bd660378cd662a366f10de627a4 SHA512 b5291e807a3c83cb80a47e3518a3ab5ad0b0e6157842117c0684c32e525dce0cca199c3c9028390b94a73ff968391aa023312d3b8bd7472aff1c9ee5206c424e
+DIST libbpf-1.2.1.tar.gz 999804 BLAKE2B fa384675be2d24f284d8384d23a395e9106d9f0456a9c34608bcc57b990addc85708b1aa17102044c03a0458949e494865316babc0d7e496d8ce902abf64a072 SHA512 080103800808a16cab99c445add50af2656584776b360d90a8d3abbf44bcde55b64f8ff36a2577a13918375b578ca474740f333c860962fb98957d67f0ae83d9
 EBUILD libbpf-0.8.1.ebuild 1153 BLAKE2B 98da8cd35ab316a4bbf9d4e6a9c40b278ecd1385d8077a16e4582fb9a4209c40ebcf4ec9e24d3312334ace6c2f99da9732e7a9379a0dd478baa66bdd790a4793 SHA512 16a7e9a08fe9d782da9f57727b50592d42c7cfcd5cbf407197c5764e2a7175f0277a116e25379092e0f67adac353513f614d9bfe2edac2990d0fc91d5adc9a26
 EBUILD libbpf-1.1.0.ebuild 1185 BLAKE2B 57c4bfa90f1601343e66e0233c30af684c47688eda103bd2672472cf6a199f8849f0821d2e889e583dc09a4a8e36b9a9f92fb3d1abb6e2db844b5f57c3566489 SHA512 ab6998bfa3a4674c6df8ccfa0b46216779d6ea48d22f33a45836f233f3c755b714aeada2f8950814a083a1a490ca10672df60351b9c8ece555fe98a3a1bb5c27
 EBUILD libbpf-1.2.0.ebuild 1187 BLAKE2B 0e21d28560cab7cc4f356d7325d635fbdb5bd006561cd6d2e8736c5bab5a21e4a8aedbe77617fac5d1292ad47144d4cb6394014c67b8574f14fecd588047013b SHA512 7f2e7a789a5cd8d11d2bcdf34364160cfd875a94899efa1391a1921686360b44d4cd489727c42a68058e2a2076ac57131d09a78c05cbf3f669bad830dfd23e11
+EBUILD libbpf-1.2.1.ebuild 1192 BLAKE2B bd3087d68ed1e96220a836e005d3d5e82c7322159e79d3e43c2ed2d14b02d8103c024f0a43dee77383e2abfc5fb7b12bff2a7925cde32393e9a7bafc87c4c5a3 SHA512 a4623adfec492b597089d4d8a3a30e56d6ecee6065a109d3488ca2e0e719ee72b21a2acc37e75bb9acca0d28e91686b9b904af090aaad6cdb82c992cda877442
 EBUILD libbpf-9999.ebuild 1192 BLAKE2B e26a265cb13392e4e90e48ab96cabad38188e9b28ccf40e8e7b11a08117193dbe025f5ab71c09da29a7e3ab2561c154389e87be9b1a1fba8e7d57eb3105a07bb SHA512 955be1dde34476c2b66014f9b3da584ea38459105f49980e29fd943198feb3ee228a6ffb121c9bbce7c109712c37bbc8996f8cc4715eba626bd08aadaa23d7e8
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-1.2.1.ebuild b/dev-libs/libbpf/libbpf-1.2.1.ebuild
new file mode 100644
index 000000000000..c444170afb0c
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-1.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+S="${WORKDIR}/${P}/src"
+
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+HOMEPAGE="https://github.com/libbpf/libbpf"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="static-libs"
+
+DEPEND="
+	sys-kernel/linux-headers
+	virtual/libelf"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/libbpf-9999-paths.patch
+)
+
+src_configure() {
+	append-cflags -fPIC
+	tc-export CC AR PKG_CONFIG
+	export LIBSUBDIR="$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
+	export V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LIBSUBDIR="${LIBSUBDIR}" \
+		install install_uapi_headers
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 3813fa21de69..3e913f74ebd4 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,4 +1,5 @@
+AUX libp11-0.4.12-openssl-3.1.patch 961 BLAKE2B 01aae650ec002a7fd1d70cd41953138f7ca8be5168e626530db8e78c85aa2681e8f2bb61e5811a2a5cac116d22cfcfd102736554bb53719509f81e20ac9decbe SHA512 018d026b56bb50219c7b946dcbdee8aaa91f7d48cfdc595fd46a5250ff1a9f9766fd5dd4f97261ac9adbb109b78023971b97bbd42a6533f0a43bb7d437924824
 DIST libp11-0.4.12.tar.gz 516414 BLAKE2B a816749984753a1916dd58860c51b49d316946b59eb3bc839f6a21dcff14de48d7a4937f55fc7ad96a26b914591854d5cf11a1fbac2d5f2f5e04c833973c0e42 SHA512 674cfca2c9eaf162262204c94f9d59d3095dabbc348c1842e758b897e1a5bd4ba08b2d589ec3b2a2d1343a8760eab253e7008dc09ef5b499e2f16385efe5c8cc
 EBUILD libp11-0.4.12-r1.ebuild 735 BLAKE2B 345d0b033c53d9842e47be807ecf22b382da1b96b2a258ec7163f5924489abad6ccdd6499b1831868ab8fb7b3201056ec2483c90e5d82795953148a00c44bd34 SHA512 247b4fcd656d60866ec9a3d6d361cb0a16b35b70b4aef696937cef4c5133aa69cac626b1ec10cca1396e5d1214933b53ab81d27c672f226430f3ac554b605c7f
-EBUILD libp11-0.4.12-r2.ebuild 780 BLAKE2B 25a1115cf75e6a7416d6f62699969d363da3a9e16f4aa61c5042b628106f02160a5976932cb993d473f288ba5c188ff127f74b0cf4093eab15b48cee2a270d98 SHA512 0ebc01c4e83d072e7e7dbf12f47642ac4898d6b1bb039858ead27fab0e960f263b45e02293d220f3e07d7f35db8dc978c8d229d36367e4e94516e5ad5ba60a87
+EBUILD libp11-0.4.12-r3.ebuild 932 BLAKE2B 9d9d3a6cac738ff4d46d949c906d365a5a54c1bd319258e84eafeccf6300c0fc74460af916cb7986dbd8e492cb8b9f104112ea66efd0f3ce219013f762066f13 SHA512 ca823dadd68bcbf859c807ac538edc629cd8b1acc2075b1037cf9537fd728847ddf87211f2be6113b5286c11461ced8a656b0e4e3872075c092ec49e384b4f6c
 MISC metadata.xml 605 BLAKE2B 69d65e5f468abb8e4ac74afe597d7f1129e3dd1ecb249aa794a75c628268e5250cc0385c8119c0752155967d22a07fdfac2d31af458c0811a47bd32663627d1d SHA512 a2bd8e47b0d86aa7f3009bc724cc22adfbab5ddc041b2ec87f6f96faa4f2bfb442e501668c27627723727058b4c615cd6c80ef40f1bbdd580fdf6b7fe7326229
diff --git a/dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch b/dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch
new file mode 100644
index 000000000000..fbc7cf9d64ed
--- /dev/null
+++ b/dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch
@@ -0,0 +1,25 @@
+https://github.com/OpenSC/libp11/pull/503
+https://bugs.gentoo.org/910203
+
+From 580c12b78b63d88010a6178d7c4c58186938c479 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Tue, 6 Jun 2023 14:27:46 +0200
+Subject: [PATCH] Detect openSSL 3.1; compatible to openSSL 3.0
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d6b0ee91..b96979d9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ AC_C_BIGENDIAN
+ # issues with applications linking to new openssl, old libp11, and vice versa
+ case "`$PKG_CONFIG --modversion --silence-errors libcrypto || \
+ 	$PKG_CONFIG --modversion openssl`" in
+-	3.0.*) # Predicted engines directory prefix for OpenSSL 3.x
++	3.1.*|3.0.*) # Predicted engines directory prefix for OpenSSL 3.x
+ 	    LIBP11_LT_OLDEST="3"
+ 	    debian_ssl_prefix="openssl-3.0.0";;
+ 	1.1.*) # Predicted engines directory prefix for OpenSSL 1.1.x
diff --git a/dev-libs/libp11/libp11-0.4.12-r2.ebuild b/dev-libs/libp11/libp11-0.4.12-r3.ebuild
index 7b6e2ec011e6..83c149c404b1 100644
--- a/dev-libs/libp11/libp11-0.4.12-r2.ebuild
+++ b/dev-libs/libp11/libp11-0.4.12-r3.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
 HOMEPAGE="https://github.com/opensc/libp11/wiki"
 SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
@@ -20,11 +22,21 @@ BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	test? ( dev-libs/opensc )"
 
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/libp11-0.4.12-openssl-3.1.patch
+	)
+	default
+	eautoreconf
+}
+
 src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
+	local args=(
+		--enable-shared
+		$(use_enable static-libs static)
 		$(use_enable doc api-doc)
+	)
+	econf "${args[@]}"
 }
 
 src_install() {
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ed1e767a72c7..463cc5ac43a0 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/mkdocs-ansible/Manifest b/dev-python/mkdocs-ansible/Manifest
index 1bce4c863d4e..7f0b8b8bb1b6 100644
--- a/dev-python/mkdocs-ansible/Manifest
+++ b/dev-python/mkdocs-ansible/Manifest
@@ -1,7 +1,4 @@
-DIST mkdocs-ansible-0.1.4.tar.gz 27751 BLAKE2B 33bf7edeadda869dcc620b1625deffad326d7a6296f70360a6138581ec60af8524ab8ccd7571c597b9574092dbb10a4296539eea3c9b586c0cc30c297f2a25cf SHA512 e2e3380e226c618cdcf87449ab76478be537b19b1c1da8bd93aca8791f29c98441b630997c203af3739509714eb2d7d2e1a0d8f07ef71b1c79a67c9651ad4886
-DIST mkdocs-ansible-0.1.5.tar.gz 27864 BLAKE2B b34fac1cb5f1ae960776f60ebb7405c3e8bf6c00bee3df81bfb2c77db03f2b1d7486967a7366e1702c969772ab8dba219a44f7be809563af01c867a5839b1ac6 SHA512 4d177fa532676cee76e7c861c06e920b3446d99bdd5ce062e3cf9d1a555153df197375f822df745619e9140e61a3ec590e046614509f4ec7b97e8e58c49e432a
+AUX mkdocs-ansible-0.1.6-prune_deps.patch 479 BLAKE2B 12248f17e1b62f03bbe992c534596da3eb4412c7568dd2cd6eb19e1a0a26778495547a92efda1ec07f66c9a78eb66b288a99fc262c63867eb0c16065d2fabaf8 SHA512 1adbaa1c110c0d4fb1da6c60aacd14755e2490e325dcd63d0746cec260f79c995f82a656a4681f02085f80d708fb4b7e7e529aee1b67afa5c6584f13ea060151
 DIST mkdocs-ansible-0.1.6.tar.gz 27829 BLAKE2B ee1248c2301d841876abfde43e0a883d553f7848b9be367634c4332ceccff4f9aa5e22b58c38f997ffc9c861ac36a0b9e40e4ca445aff7dc040f953f83f3fab8 SHA512 96235bc91d86e52781ae190ab6bc83fc086fa5fdd2ecb21a544549bd49d94b0ea99e56956442884930a6d20c975970942ca3bc0c62cee23b17a3884989420672
-EBUILD mkdocs-ansible-0.1.4.ebuild 466 BLAKE2B 6ff72a9fddb0594f354b5141f36121b160c0153441cabbff0af8c4ece3b6a3bebffc2fd83d033fdf36383d3b36e8377d24819ac0140b951df4b35148afd1a668 SHA512 971c85feb0ee105cf1b5a4264856d6688250294ae1b1c7c0da8630c2857fee86f7dd59b3df3f8a51c2a7ec40d60b3450b74fe8194c703083469dfee1d04f7000
-EBUILD mkdocs-ansible-0.1.5.ebuild 466 BLAKE2B 6ff72a9fddb0594f354b5141f36121b160c0153441cabbff0af8c4ece3b6a3bebffc2fd83d033fdf36383d3b36e8377d24819ac0140b951df4b35148afd1a668 SHA512 971c85feb0ee105cf1b5a4264856d6688250294ae1b1c7c0da8630c2857fee86f7dd59b3df3f8a51c2a7ec40d60b3450b74fe8194c703083469dfee1d04f7000
-EBUILD mkdocs-ansible-0.1.6.ebuild 474 BLAKE2B 919a0ac31b9b96102af02ed18f84287516f57640eb6f9d51fbaf9f21a31f3ff3ccbe9c2c32775b3f7cac8a5dda15b16fbc1fbe0d5a6ff5e794dc6d299e954a87 SHA512 23a10514e411adc36eb5c104a9eca061385baffb5db85adf8d67913773b4bbf8520c9bb0ddc3a900481cd2f6b9d90deb6e4fa02475b3e9a9a50a324a1487606c
+EBUILD mkdocs-ansible-0.1.6-r1.ebuild 1255 BLAKE2B 5315f52af1831f9cd8d62463c9a008fd031fc81a09aa537442d6e07a6bb1e5158c7f3463a39ed4704525c6829340748f50df92ca535f518791eedfac3299409d SHA512 9ddbdb58891fb6f97021cd03a15fc87643e3ec64417e2912beff013248fb7d24656a0bb4ce4be2374552f8f6fdaa18dcdf0a6dc858d39fd08a7355345fbf7c65
 MISC metadata.xml 409 BLAKE2B 7552f90e363cbe4b38bedae3630074db6b4b3fd75a13d3e34740470490b49f3cc553cb76d87bae5bfdf247b5e8ab57da2888ff12723bac72999c23484350485f SHA512 70fb7dfda89462823c26b7058a941d405015a46bd0445f0c75c5adeb659122d5d558b6e757ab20224725e8eaff5390bc3b0ce7e2bf7b56dd9982c04fc59a59e7
diff --git a/dev-python/mkdocs-ansible/files/mkdocs-ansible-0.1.6-prune_deps.patch b/dev-python/mkdocs-ansible/files/mkdocs-ansible-0.1.6-prune_deps.patch
new file mode 100644
index 000000000000..dd6b81b59a84
--- /dev/null
+++ b/dev-python/mkdocs-ansible/files/mkdocs-ansible-0.1.6-prune_deps.patch
@@ -0,0 +1,20 @@
+As of 0.1.6, no mention of pipdeptree anywhere in the actual code.
+
+--- a/.config/requirements.in
++++ b/.config/requirements.in
+@@ -11,5 +11,4 @@
+ mkdocstrings-python>=0.8.3
+ mkdocstrings>=0.21.2
+ pillow>=9.4.0
+-pipdeptree>=2.4.0
+ pymdown-extensions>=9.9.2
+--- a/.config/requirements.txt
++++ b/.config/requirements.txt
+@@ -39,7 +39,6 @@
+ mkdocstrings-python==1.1.0
+ packaging==23.1
+ pillow==9.5.0
+-pipdeptree==2.7.1
+ pycparser==2.21
+ pygments==2.15.1
+ pymdown-extensions==10.0.1
diff --git a/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.4.ebuild b/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.4.ebuild
deleted file mode 100644
index d5f242d2a01f..000000000000
--- a/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Ansible theme for MkDocs"
-HOMEPAGE="https://pypi.org/project/mkdocs-ansible/ https://github.com/ansible/mkdocs-ansible"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="dev-python/mkdocs-material[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.5.ebuild b/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.5.ebuild
deleted file mode 100644
index d5f242d2a01f..000000000000
--- a/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Ansible theme for MkDocs"
-HOMEPAGE="https://pypi.org/project/mkdocs-ansible/ https://github.com/ansible/mkdocs-ansible"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="dev-python/mkdocs-material[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.6-r1.ebuild b/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.6-r1.ebuild
new file mode 100644
index 000000000000..f13655d4f5dc
--- /dev/null
+++ b/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.6-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Ansible theme for MkDocs"
+HOMEPAGE="
+	https://github.com/ansible/mkdocs-ansible/
+	https://pypi.org/project/mkdocs-ansible/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/markdown-exec-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-include-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-gen-files-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-htmlproofer-plugin-0.10.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-9.0.13[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-minify-plugin-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-monorepo-plugin-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocstrings-python-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/mkdocstrings-0.21.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-9.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.2[${PYTHON_USEDEP}]
+	>=media-gfx/cairosvg-2.6.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.6-prune_deps.patch
+)
diff --git a/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.6.ebuild b/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.6.ebuild
deleted file mode 100644
index 34e33cbb072c..000000000000
--- a/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Ansible theme for MkDocs"
-HOMEPAGE="
-	https://github.com/ansible/mkdocs-ansible/
-	https://pypi.org/project/mkdocs-ansible/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	dev-python/mkdocs-material[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 2c41b0811584..630eab36f93b 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,3 +1,5 @@
+DIST pyopencl-2023.1.1.tar.gz 472723 BLAKE2B 4960db0b9096ef624f0459f6711a6d1fc4561599f96c3b01c5efe3c183c8cc4284b63038b2a5e98d43c194a8e5ce3331886f675c0bc5f44073bc353675400985 SHA512 50c23132028bb2c35816b6c83c054eaf929d333fbb172230e0d696a5e6103ad6ee6ccbbbd0b5d3d2d3c5f02505340a885422097eccecb1bf51845658c7938c8f
 DIST pyopencl-2023.1.tar.gz 472581 BLAKE2B bfa25646b00b8d5c1a2fb7b98c18383e3013b9aa1573dc1bcbc1e056d3bd50d48fb35b7b74c4d87c079fe9334817ff325edd235bdd0de610373850c3ab057773 SHA512 3a6c61715338b31f9e9c3b9c8afe029e63d2689f9d52174c91cfe7383425643b3d08f5c125ab7e24ca776c86ff19d5adb7bfe56f1bd531ba443f99dcf9449244
+EBUILD pyopencl-2023.1.1.ebuild 2016 BLAKE2B c6e80026ca608c628cd52ff2ca042e7503d6dfefc9af9eaba9831eed0e1cba579088a9203a40184b5bfc95a73e87d9d15d545eca64ec7f3af69e3e1efc15e4a7 SHA512 9ae16d857277c60fd7e09fd9c30d0c664f08ed35681719d0e2fcdc8bd51ac8951068fe0999ac7855d755752dace1b0f3cab9924fd0d2d6f99c64315165d4c82e
 EBUILD pyopencl-2023.1.ebuild 1999 BLAKE2B d64eb47dc442534e666b141e7d02bde62d80ead50d74cbde05dc32b28b143f20e1e6ceab3c199720ae07fa4e26272c034484ee8cd2962ba98dfc9f5db9cf4346 SHA512 d339449a1043befbf8eacbdb9f6874b16be9b54fcc17c0c1070ac4176fccdc04fb488dcef44555031d5aed30179bb3a74684240ec980dc66c67b7b63be1f34ac
 MISC metadata.xml 373 BLAKE2B 0de89cb91a5dba1c34bacf04a95d4e2eb9e903bfb55e291f2ed20d579b9736a9a25f27620eed05d19c903c117e0dfbf410f408e9ff4008ce8c93f7b1b004141e SHA512 4ff5643089e5590d1ae4ef413a1ab0fa2772f71922a9da2c8b43ae375ba2e6e3d95ab90a13d51d22fdea49663c112c36352df609eceebd520fdc06590907b0e7
diff --git a/dev-python/pyopencl/pyopencl-2023.1.1.ebuild b/dev-python/pyopencl/pyopencl-2023.1.1.ebuild
new file mode 100644
index 000000000000..19df443f1f4b
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2023.1.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="
+	https://mathema.tician.de/software/pyopencl/
+	https://pypi.org/project/pyopencl/
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="examples opengl"
+
+# Running tests on GPUs requires both appropriate hardware and additional permissions
+# having been granted to the user running them. Testing on CPUs with dev-libs/pocl
+# is in theory possible but has been found to be very fragile, see e.g. Bug #872308.
+RESTRICT="test"
+
+COMMON=">=virtual/opencl-2"
+# libglvnd is only needed for the headers
+DEPEND="${COMMON}
+	opengl? ( media-libs/libglvnd )"
+RDEPEND="${COMMON}
+	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
+	test? ( dev-libs/pocl )"
+
+distutils_enable_tests pytest
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+python_test() {
+	# Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
+	local -x PYOPENCL_TEST="portable:pthread"
+	# Set the number of threads to match MAKEOPTS
+	local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
+	# Change to the 'test' directory so that python does not try to import pyopencl from the source directory
+	# (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
+	pushd test >/dev/null || die
+	epytest
+	popd >/dev/null || die
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index a7ee185cabad..03be4c879ad2 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,3 +1,5 @@
 DIST python-versioneer-0.28.gh.tar.gz 77503 BLAKE2B a4d75ce8a7db057421e36fd75bfa9ec83a41191b999c2a81b3879290424005b521f7b6046debb847bf78eae459ef7247d903f971d2a0c4fce116ec0cd1f34833 SHA512 ef27f4588f1c76eb5da1e108f2eee635707b2427cd79a71880f8df217317329e5fb81b30b1e741f2439550dc73f9a816ebdf47af475862344d67ed2189f92a1e
+DIST python-versioneer-0.29.gh.tar.gz 78801 BLAKE2B e0af2887a8aaf5d4aee14d8370fa47d4ad9f0a5d385382de5b14f34fb1d6388daacaeab48677523b157ef685c8ad6e18b89bc8546ad8c991cde06e5c78da701c SHA512 10dce0923e2a48036117b64c8b746bb57db4b33f9f752ba950bf877319184451928d1eb37693ffb1a4f95afd774a4883cf265b8a82f35bd77b26c0967caa9ad6
 EBUILD versioneer-0.28.ebuild 1238 BLAKE2B 52cca5e3c4526009a54b04a4c8e04aa38379b1d3c04336ee6b404a8ced3cbabfa2134341c60887e2959ac55ae1498bdc4b124e49298b5c56e595dbbccace1aaa SHA512 40432ad507eda946ea131a4eb8f9d7fdba5be10f485dd10aafbc5fbef73f762fd00804ebd310c4bc2d47fd92cc6138eda1db6d124e2c689cc980e5a0d8314c34
+EBUILD versioneer-0.29.ebuild 1238 BLAKE2B 1ff3aab1bd2b71f4b800b19c3135fe9b58c4dc01f42cd0eac159f6263615c454f9b194420fbe4e913ac3fc1c8445369d01874e5215f48e0bb42579cc8f49c62d SHA512 f8f62ec1fb932fe691bf10720c5980f538ae972d80674375293a27522ee5e399a5e172b0b6ff6b9f0e4a9b47ce05079bceb241479193b7babceecf8ae8fbd225
 MISC metadata.xml 426 BLAKE2B 050a6c51f12ce466d0149041e103227c176f792326f859474c996a38f510544f09a594b6a70036b3cdad78013ff9982316c671e77be6ed2e7f0fa643bf89d320 SHA512 da99aef0b58491715dca230579ecba68bfe357909dd8bd122e790d7f0300e0b1d11cf224ea3a3c76763d593f45013cca6cfe27cc774c6eb90dd6da562a061c38
diff --git a/dev-python/versioneer/versioneer-0.29.ebuild b/dev-python/versioneer/versioneer-0.29.ebuild
new file mode 100644
index 000000000000..ed03e7b79ef0
--- /dev/null
+++ b/dev-python/versioneer/versioneer-0.29.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-versioneer-${PV}
+DESCRIPTION="Easy VCS-based management of project version strings"
+HOMEPAGE="
+	https://pypi.org/project/versioneer/
+	https://github.com/python-versioneer/python-versioneer/
+"
+SRC_URI="
+	https://github.com/python-versioneer/python-versioneer/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="Unlicense"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-vcs/git
+		!!dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	esetup.py make_versioneer
+
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	git config --global init.defaultBranch whatever || die
+
+	"${EPYTHON}" test/git/test_git.py -v || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7d85af042193..7abe87d7e5fe 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gitlab-cli/Manifest b/dev-util/gitlab-cli/Manifest
index 7fe6852db757..2478a323b6d8 100644
--- a/dev-util/gitlab-cli/Manifest
+++ b/dev-util/gitlab-cli/Manifest
@@ -2,6 +2,9 @@ DIST gitlab-cli-1.28.1-deps.tar.xz 36252544 BLAKE2B 8c7d4ef554bec4c7e8216bffd8ff
 DIST gitlab-cli-1.28.1.tar.bz2 16781342 BLAKE2B 0b59e60d0f8b7f1e95bbdf1aff8c22017dbf54eae2a72848a5416c35bee893341c1606249eeeaee1ffff1aa72500a8fe91389358abdf066339d9218a6ecdc648 SHA512 57b9d6e2b527bcaf227d8c07101129749a80203db061ac757adc84bda72576e35f6404d80972ffcecb6fecd2e9b644b0e5c9a06b6135a7e3a68c46af82de69b1
 DIST gitlab-cli-1.29.4-deps.tar.xz 38656412 BLAKE2B fcbb787a1fb893ae8d3452919e9e540f011ce0d35827a383f083e1492018a335f80089f2f87315329afb42bebdd1014ef6dc59e6673b930d4397edfa57384513 SHA512 12382eb22cf71cf11ebdfacf834dbcd08d6dc5fb02f7f705772240d896b907e8054a1847976a1ba9105b765df194eb5581dbd8d77fc191ac01b63257f1e76370
 DIST gitlab-cli-1.29.4.tar.bz2 16787326 BLAKE2B d0cc93c92cfb9ae01b9acfec04341c1e06a1bce36f666abec46c6bd0eab6700e2b6ea4f8cc27606da499b8246795c145a402dbf32c8f94074c0feaae34b8ec8a SHA512 a212f73fb06849c1d197efac1a7cf33a09fc94a3b8d954de1d442462deb59e52ff1a89c68e6ce4deb0a1472367890947ccabebfd459fd6e172142a9931c68df1
+DIST gitlab-cli-1.31.0-deps.tar.xz 38653264 BLAKE2B 79ebd6c213a03a7c4a45de602f3074098fc9d20fa0359d27608eb345676e02c6d302d11df3486bd275b4b4e826312d3bde80f0aed3aaf6418ad8d176ff0c26fb SHA512 6cdacd95acfc607a49d1b47b3b975c7234a4249a5f544a262d462d222211dca4ba0553f3dc5d9e2c4e025e630aee6cfc972c41f51abc23b3c4fa5e50adfbfa94
+DIST gitlab-cli-1.31.0.tar.bz2 16794522 BLAKE2B 72051d063be5b4108fec878d7b51cfd0680274e6a3e5e1eab3a992dd0838ff00ca19196e80a5651895dc261518bb93a0f0c5c4f2db2a99dc8e7f9b332af7022a SHA512 4020e7e62c7f3b420c0988712b61ca0a89733cfe8c370faf2a5c21d3983bba69283e85dcff98b3c5a8c6cb18319fb85101789490435d2f38a704ae9eed9aedb1
 EBUILD gitlab-cli-1.28.1.ebuild 761 BLAKE2B eeab83c2137cf556cf9ecc1f97941fbb808c3df1ce7d9137fb62eb86e2ed574bf454eced1be24b785a00d4cdd004e2921c96863b632e17c62599ca52754a0316 SHA512 5759b1f9cf1e6a84a3a854aeb310cefdfb84a07bf9290082e365d34f6de8d40cb24d5180a422c0c544b16ee6e56d6cd378fb528b157bfbc8ea1ee8bda2643fe0
 EBUILD gitlab-cli-1.29.4.ebuild 761 BLAKE2B d325afadbda01c64d8d94f4f9a4aecc22b0a0bf85ecd288f60ad2e276da2679cfd586f8b9f1c529880fe44ea9988820f799d570789739dc56f46e596643bfeba SHA512 4d96944fb2c67a7883d7866a296f74aab42d7037dbb14bb94a70d5e2eec7f86181ec65440046c30a7c59cfce5abbf0f2af3d2d556d856e71554a66c1fd7f7338
+EBUILD gitlab-cli-1.31.0.ebuild 761 BLAKE2B 065e135dbff8ca709739ef3c09c5fda33b373b1d1ccfbc63a55bf54e1ece89150a4678d304c5b6e739064ac44108669830e22151df22aac974b82fc38805b089 SHA512 2f19d72ea968638b2169365fb5c6d98e05be121dabe353a2ca72049e2e87796ada6b6f0a4b75aabe205f80fc547587c9c380213443190286343601dd172ffa11
 MISC metadata.xml 328 BLAKE2B c15cee65978853695fcc911a6beb02ac29f8e82d7a82417989e497a0c014a2c5c2c22503cf2c099600e0885399496d0e7ce3b3590c8b8cfa0f6ecc6a63988d46 SHA512 4df241882ef7e722711132110271b672ef49913a92e9d70972857968e7d12a8403f5b19b5079fd78f3f08fb4aab8e615b51a6073db2c460aa2ae3ec31d8e3a28
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.31.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.31.0.ebuild
new file mode 100644
index 000000000000..0562e5401e38
--- /dev/null
+++ b/dev-util/gitlab-cli/gitlab-cli-1.31.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=1f8464b403a4611ef689a89893cb700718abdb20
+
+DESCRIPTION="the official gitlab command line interface"
+HOMEPAGE="https://gitlab.com/gitlab-org/cli"
+SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests communicate with gitlab.com and require a personal access token
+RESTRICT="test"
+
+S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
+
+src_compile() {
+	emake \
+		GLAB_VERSION=v${PV} \
+		build manpage
+}
+
+src_install() {
+	dobin bin/glab
+	dodoc README.md
+	doman share/man/man1/*
+}
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index 51b902117766..2e5ac4fa7ea1 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -2,13 +2,13 @@ AUX gitlab-runner.confd 688 BLAKE2B 1e99cdca8949a1a085e126c9aa2f23cf15d081087d02
 AUX gitlab-runner.initd 1174 BLAKE2B 53b897abb3bc358839843faf56b52d99412c2a08e2e69e1b8258bab907a0da10dedeafd95e6c4e505fd7e8e4d2344dc07b1e693a130fe0d6a3730bf619ee2e75 SHA512 eae2668c5a98a9e111573a2ea193266252e46e073fafd2c101d3a93e65cb9705f78ceab173ca4d3e1c806443345e7f66b7b97c8b644188cf9f86dc4c087d401f
 AUX gitlab-runner.service 419 BLAKE2B f1a9217eb97d03036eac67569ec6ce6ed91dc2182b20357cf8d17ee0eee01b8d094854b1c76942e0515c2a5923f4d3a1ed044c60b89d8a29c354955f9f666160 SHA512 10cbe1cc0a0b7bb9decde5780bc20caf73892759532df5fc42a7c3b55e141b26957a2986656ac1eb79ce15fd95ee01a184893c22d0dd1ce9117932d0e55ae1b4
 AUX gitlab-runner.tmpfile 54 BLAKE2B 4b2849b9c72998409efce207a336dce42d6e9104e72e0071266e03509841bbb5f39ad8e560beb696eee780bfe82efdec5b877120b5606c524d5cd002095e52c4 SHA512 2b5cccd83c8113a8c58011ced9ff5720a5aeaedb8f819c2a71c8fff3b1683ad87b54fa3da67b7e5f91ab35659d2adf5cf792d93ff293eee39924fbb5b9db2d4b
-DIST gitlab-runner-15.10.1-deps.tar.xz 161343688 BLAKE2B 9bc650e4d4bfe8971962c9b32e3a4e466194d5f8ea9fad8f425c77e2e59b36dddf6b45acd877ba698391a99e51fcc8f9458d7f9f96a136eb3c1131e1336e41dd SHA512 1eb2d8e584b3b758c6c75262aa864199a5eee63e4c8163d47b3067df02dcb01f96b35a2411e3263c9138fb1f9d0b83ca48ea32dfe127188e0247d7b216ee8dbb
-DIST gitlab-runner-15.10.1.tar.bz2 1278748 BLAKE2B 8c6c9a61af952a2fe97810d0d926035cdaa00d79bd32e48aefdd55b1fc9a225060b25c46341a2ef952e73fd2c1e1af441d37d6576beb80eaed99a6a33d92dddc SHA512 df5a613f4011049b556f2becb8902a1bcb64e060c98c2bbbd1528e7bdaedf75b0ff6cbaf31a56d53bfaf3b56691ffba0dbe08a851cee7bfed00d7e5e449ef91b
 DIST gitlab-runner-15.11.1-deps.tar.xz 161358304 BLAKE2B a318aa741a29c3e1623a389966acbee54df66ec0ac55bf59fec21eb6d1ed394facc835b01ad52429037849dddb388b0690b378721c9700c18a223876cc63adb6 SHA512 58222949571c74fcb6a28290a304db39269271fce5234027136cb2b3f51e239d610efb9f362c726ef7be741ebb2c68295cce7e4dd4d99ad21459b1b67562b5d9
 DIST gitlab-runner-15.11.1.tar.bz2 1343959 BLAKE2B 3c1a12aedb6ec4ba88b20f1aca30e2cae3acbfab7aa22ab91cc87c355e1f1926f27c70a0357be6f969634bca200a7b9e69fb2bd09403be21d7fc4383c48d951f SHA512 5756952adf79a72ba62eef7e28d4dd134fd1aa00a020c615a11fcd6d8fadeb2ba40cf8e20d8bc253082885ea8fe77f18124da35fb7fa5f7bc7360b8143a85cd3
 DIST gitlab-runner-16.0.2-deps.tar.xz 161413208 BLAKE2B 8e8ee06371bd8482a39c129bf155a829cd3c782a4a5a968128e75d263ab4e8b07f88ce02697ef47d14cde81133936578d2c12a747953a77b6acec0b635131c5d SHA512 4c37eb14f81d092a12dae9ce7f50aac7b2555d1366d1d5ab2b0faa835e352caaed6683a63ae44a8447ee8ca09f38fa4a4465d22a21391841f0d4169494be9dd5
 DIST gitlab-runner-16.0.2.tar.bz2 1346109 BLAKE2B ed8bf9a893fc4d38aeb9ef2e1823eb0940b23e12fd2236f5ffbb90832634b244201d8518e1e5231ee7d4445ac3742ca47b1f3d8a66d06a93811e040d9229d19e SHA512 54b1e7c0b5838254aa30199e62760a845a9bba0a04cc9963b0bdaa776c7219bf0acee71a62f3c958b3d22d9aaf3380bf236228f18ac3e0f3d615578a1d3f9b87
-EBUILD gitlab-runner-15.10.1.ebuild 1679 BLAKE2B 155e02174b6ee06840770cb1561766b652132c9b0d88798d0e180dd8f2a5ff55c757be108febcca65f8eee0004ff5e236a7101a6a86d06904b54cad038729884 SHA512 ff1240350cddb671535e43d619a4bd6589ed51cb3244ead7c8b6169642f0fe990851c9266749462df416ddf7c74a1e1c9f9cda6dec0683dcba41b97312b727b9
+DIST gitlab-runner-16.1.0-deps.tar.xz 199599928 BLAKE2B 585dd1038106e5f0f397fc801309449e19da4af3419874d4dba178ecdf3109950fb39c4e20578ad388db455aeb20607aeb3d505f8304124fdc07747f43108062 SHA512 c7b714fe60f4dd8cda6ae3ee9700d6d8c748b42c3499e0d3a5377008e6eac55fc99fbea693a72ecf38fb10be7f56e0d72c4a12ffe7bac8ea1de29448fa934707
+DIST gitlab-runner-16.1.0.tar.bz2 1353795 BLAKE2B e0f8fc23c9e50dc2bbe50187c7256381678504aef1d23e82a2fdbaef10f0c502ba8dfd31bbae450d22362b9b82b81184895dac1353f5dcbd32cefe9a263a7a81 SHA512 2fe31471e80943e24b7667ee8d544d6b031435c88ab2fb58911752b248d2e0293fdede0996e2715f54ec71b4c6d58aa422b87fb112e005c1022af0d4c1a80caa
 EBUILD gitlab-runner-15.11.1.ebuild 1679 BLAKE2B cf8f346d67d02d5b218657cec906f39cd8e5c8c446aa443c06bbbc33905df637332f48a4ea3ad908a35a90bc69255dcb887169d4e5a716d22cf644022f71ea7c SHA512 c75e0213226b66a2c2b8cc3957b45c175fca11301327a7cad9ba4489a7a4b66bb10f6c49cc46d8e0680aeebd121660be5f8cb9157734a810a07679e5118534f2
 EBUILD gitlab-runner-16.0.2.ebuild 1679 BLAKE2B d931fc780ff864aa896187200339818486938cbfb4166f88dad1d697776ec7c179d7be9fd056887b09cca5aa814104c1be2a24671881b2fcc3d8a64ffc037863 SHA512 6d17817593edd811784a955ace900679c2083cd73c4dba87ecd9d80008a2b1389582f7ea5fb5b0e8608222ed2b6bc11fd7b5b1d2ca03a8f3011f3df5531c8925
+EBUILD gitlab-runner-16.1.0.ebuild 1679 BLAKE2B 273cb9e8534e225b12079aeb55e8a716a8e5515363236f8335eb0860c08f5abf253fd29a9d3e81514c8200e662f09cf6c3a9d1413b01c369455a5117614a3db2 SHA512 5b7240e90bc72cc2fd4be569cbf426735fc6bbff2e93d56daa4a96ede700dae89f5de7e0d720b08430f49ff3172f3c9d53a890717b59a6a16fbf284a473a7723
 MISC metadata.xml 338 BLAKE2B dfdcaaee18d3e5492674d3b4055002201342fa4d5b713f88240753002de2bde6244469fe42fe514cb82544d15deacd235cd031dcf71d661a24b26f422c67c392 SHA512 b12a8270df4f07c6b4359150a3b7341d3913a93598153824ec758384758e69667a89de20066735ccc24aea7af07b5c1bdd444fca3193be5402bce5154f90ec79
diff --git a/dev-util/gitlab-runner/gitlab-runner-15.10.1.ebuild b/dev-util/gitlab-runner/gitlab-runner-16.1.0.ebuild
index de4193f0ef40..22ed526d5259 100644
--- a/dev-util/gitlab-runner/gitlab-runner-15.10.1.ebuild
+++ b/dev-util/gitlab-runner/gitlab-runner-16.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 inherit go-module systemd tmpfiles
 
 # make sure this gets updated for every bump
-GIT_COMMIT=dcfb4b66
+GIT_COMMIT=b72e108d
 
 DESCRIPTION="The official GitLab Runner, written in Go"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 5638056255c7..9175d023133b 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest
index 17e29b838604..6f1804061cd4 100644
--- a/dev-vcs/git-machete/Manifest
+++ b/dev-vcs/git-machete/Manifest
@@ -1,7 +1,7 @@
 DIST git-machete-3.16.3.gh.tar.gz 1618456 BLAKE2B e8207b11bfea6dd50965aaa300ec7303684503b900912b031f08378c7d80b388b341d23769cea5fe4aef0d78bc8457b0118aa3e05a49b0c1c4a3f9a97019c46e SHA512 fcd856c0fefecd2cf97ba149f1d1df57eb6fab0345c00c3d3df763041cc86226e3f815dda7c0050f8669d7d082e329dd76304de2092c7b43219e0c50a2e3467a
-DIST git-machete-3.17.3.gh.tar.gz 1623473 BLAKE2B 57749f566f27086c6359a5ea08004bc2b84921c3bb42dfb7d9a2029b032cdf0626541ded8dc7af04ab821e187358e5a7ff6d789bf2e204a9f1ad4367939e3477 SHA512 bc138636e96f2fb415c28e6a429cc5a10de7b1edd22f752ce1f552fa33f16f668c5bc6917186f437ccf28fc2be15c8dc9cf21c3c9ec4ab49e5d63af5fee0f521
 DIST git-machete-3.17.4.gh.tar.gz 1624890 BLAKE2B f81fc2322aa40736130180ec1a269248280ce826d70b32ac7d435da906a7c480e385ff22def06b28d5f8b5af8d3e683aa222689249ec9555a58844151bb8117a SHA512 2af06171d642a1e4fbbfe7dc97961b348e656025e03120b8699a8d6a43c3f0571eddfdfb0dac6f1f96d8eda7e47ba0307f398993ae8f56a63d68b24665bc5288
+DIST git-machete-3.17.6.gh.tar.gz 1638444 BLAKE2B 91995dec3dba53cd538db549248d9c42932ab4f4c3b7f016d60e4999617bd428c1c4fcfae3bc2aca75bba7bf62b4466e139ddada47a962f0f7d876cd220dbe34 SHA512 0766997db950a04ed5eec560be7fe1e76370d2c5f747bf121241280d44a3aff094c5828535bd11831ce1b326e05d48c8e4edf620c1dcccfbeb20e9d94c3cf023
 EBUILD git-machete-3.16.3.ebuild 1113 BLAKE2B 2a6a42b99966e5f3f1f48ee1154d72aef41bc274cd28dcf2ada2c92d09d6419a237ebbcce34318304e791a4786fd8dea6b07e7cdbb05734bba266f3cd38e4b92 SHA512 4b12e321b6f6960ded2d7a31eb0827fa66274270e0af1e42b659aa580b3ea6f2bd56ee342cd155ae96029b69c47a7a05da2c9cc6f2cae144294ea4442e31d70d
-EBUILD git-machete-3.17.3.ebuild 1115 BLAKE2B f8847098953db2ab68ac64283d09e34f377144e6d1c55f8b54676261c2c652539604e7d80f4ee4b0fe5617ddd8880c2eecc1729921f3eac40bf9cdbb921ea67e SHA512 e90e99eb6942a49f375f05ed7f02722d4abf5009d7fec4dcb4f33053fa80d7c89c6e9dc9394008413ecc38e417e4df3aa14498e80baaef0bb2ae346bc3cfc654
 EBUILD git-machete-3.17.4.ebuild 1115 BLAKE2B f8847098953db2ab68ac64283d09e34f377144e6d1c55f8b54676261c2c652539604e7d80f4ee4b0fe5617ddd8880c2eecc1729921f3eac40bf9cdbb921ea67e SHA512 e90e99eb6942a49f375f05ed7f02722d4abf5009d7fec4dcb4f33053fa80d7c89c6e9dc9394008413ecc38e417e4df3aa14498e80baaef0bb2ae346bc3cfc654
+EBUILD git-machete-3.17.6.ebuild 1116 BLAKE2B 0d6f1eccb290bb1a3a1805149a653bf977617025ff9fb2c68fc7891006dce8bf7cc6ba6856fb07eefc0920056cadd707170edbf382da61379c9bcc4141dceed0 SHA512 987fccb73684c5619bc5683f8c4340ee013e3d2000b18278909d6b239222b89322d41038fe2ec7ce772bc2926352ebc6ca252bf34b74034555fe89c69bfbab42
 MISC metadata.xml 835 BLAKE2B f59f4070f862a09fb74c57b5ef093e4c8d1394887f71b8f490e49e49f64722b48ab44f15907edb0eff322227f5a97aaf5d2d92512c818b8aa1020e6f735971c8 SHA512 d31266b47abfef805f0f0ae5f13c1f89ec13907fc7e33e126eefee5600087ffadf8f55e48c5c42c295dc7de8d901a3231db0756a79d666651569a150d7016cea
diff --git a/dev-vcs/git-machete/git-machete-3.17.3.ebuild b/dev-vcs/git-machete/git-machete-3.17.6.ebuild
index c04f32d1e272..a8fc208cd9e1 100644
--- a/dev-vcs/git-machete/git-machete-3.17.3.ebuild
+++ b/dev-vcs/git-machete/git-machete-3.17.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit bash-completion-r1 distutils-r1
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 1a208a9567d6..1b563e383d56 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,9 +1,9 @@
 AUX pre-commit-2.20.0-tests_git_file_transport.patch 2021 BLAKE2B 764b353d3268176162ae2a5d6fc97c0cb9ad7d2cd5de69f19f8fcd78c8bba507f25f53cd3d6c767fbcb9b9f885f8eceda2fc82d1b6ed54f34c1d4907d0fddd72 SHA512 6d8a3b5c9026f5c20a84d581ca92d74743643de010af468217b2f44324560d56b504e033ccebe102194492b25a01a4ed503995c222561ce406577fce211c2eab
 AUX pre-commit-3.1.1-tests_git_file_transport.patch 1527 BLAKE2B 18d047f3b8a6fdc3da77aa5b8d9f60970ab5b69adc3790489ceffc17839a4cd21ed46428c5e2e98b50278b2c4dc49e35a09dd778000546828327ae96f910f95b SHA512 36cb194250dc0fefad2900452447ab590f678e6cd5edf07a7f072363733c263b7cb1167297c465a9372d4a38ab77a6c057046c66b872a958132a97d1a937d029
 DIST pre-commit-3.0.4.gh.tar.gz 264952 BLAKE2B 3c45da675d5a1a1fc115db0ef7186c1ec1e5a6d6d9353c5a53dba85a14de2c94bafe0ef9e8d0b04bae55ded81890d726997e695c95889719096205e1b212a237 SHA512 d51aca29b50f67ae42aa70d849939e6af96ff64c6fb214cddbc5a35cacebb8a54a4911110d0615a1a499516fcc2a06bb47d7e11da84ef636c3fcfdc8d2cbe343
-DIST pre-commit-3.2.2.gh.tar.gz 267269 BLAKE2B b3b245b2ac0f0f4012e2612515e376aaaf5b4de0b5494c02a2b38b1b9b8584ae3fa7d9ee482ee19bbf6eb5ac1d5f9ec187e44c4bb7bb6046488b178628af850e SHA512 bf2602508425482e57c2e1b1ca2b36085560fa0e51e5d559b6c715a0534f182897eb54831a17a60a713cea0301a7521bb75c03881e8cb8527fbc565259a23ddf
 DIST pre-commit-3.3.2.gh.tar.gz 267100 BLAKE2B 5692baacb40482bdafb6ee9c912d98a248396f85b4f31303cb3f5f5aee0cfe68b1cdc2a6ab5ca82166632eb0f984acbad0a9ad2077a33f057e414433496da7f0 SHA512 9b0928cadb4530789f6dd87ea07c320eb76bec9501b46887929918f9dc5dc39773ead90536cb85cb317140682c2a4cee0dc7bcbc040759e76d504023cb5e40fd
+DIST pre-commit-3.3.3.gh.tar.gz 267281 BLAKE2B dbe3b90dd3808d24084ede3e9bd76ddc5b070d43bd70b3fa813f8e8e95875a178b86632208463c50a3d68868f2dd9d888e00e7bf3aeba3f3b78c7cd39b514270 SHA512 d126bead7ffa2c72213a894c82bc45d0bce8b508cf7190e7b7d56c667b5d3ebff80eedf7ecb4bb1e01923ef9a43878b73356fda866614d8cbcc8f241ee9e01f7
 EBUILD pre-commit-3.0.4.ebuild 1711 BLAKE2B 3c1f5768aedd958ed6a9ccbb9396076084255f645e7339cc04b73d3fd4e976f4b1562a405125a40c941bb02adfde3e1926700e45c1fd29d2fcda55aa64a41645 SHA512 8790c810a8dfb7fd489536e45ba148c22e106c8cdb6641cd7a936124a3777e907163ad801b0252707273320505dbb9233161d3a5d7fd60e6c2b1fe0d434e1c01
-EBUILD pre-commit-3.2.2.ebuild 1735 BLAKE2B 39245136fb1d109190e66ff30b33d5de3b370fde1f955b9520b555e2c592df5276e2eb1cc7b7107d6154a3ee02ef4ae18fa74041aba45eb0dc587a05f291b327 SHA512 1a2bd2a70252d35ab0671e7209ad108b980ac7edcaeceeaa1c8c3786b08738b3c0ead8c0d3f9a4c6136a82ee7a41c3881d8d0316aceb586d0d42b02e4306deda
 EBUILD pre-commit-3.3.2.ebuild 1736 BLAKE2B a009077c45741c700ffcf9001dc08079f9835e562d1c2193a1485956f5d1c60b4628a51ffc25fef756181d06d16578361e04f25e2f9313bf176a5a5ef1946c9d SHA512 8f341dcf0405e5b1eb415223d936ce1afcf941043a48672146e017a3705c20a4939c36798fc8c0d7397d869c259f3d583ce4ebe837d87c9d72c861d2061806c2
+EBUILD pre-commit-3.3.3.ebuild 1736 BLAKE2B a009077c45741c700ffcf9001dc08079f9835e562d1c2193a1485956f5d1c60b4628a51ffc25fef756181d06d16578361e04f25e2f9313bf176a5a5ef1946c9d SHA512 8f341dcf0405e5b1eb415223d936ce1afcf941043a48672146e017a3705c20a4939c36798fc8c0d7397d869c259f3d583ce4ebe837d87c9d72c861d2061806c2
 MISC metadata.xml 380 BLAKE2B 99842a97367e91700c6f714f427b7b3d4b7212c401abae5ab715dfaa724776f02fe250184a33504d3433bb58cd5679af59a32ec21a7e7432481160dab36a4d95 SHA512 45330930d1e58fc1de0fd0ba55cd488dee96579ceab3be5073b91ff8f4f2b9adefff533dbfa5b0e8b23fbb648d45c0b7b4073a1ec57b586600cc2bf6347e0bbb
diff --git a/dev-vcs/pre-commit/pre-commit-3.2.2.ebuild b/dev-vcs/pre-commit/pre-commit-3.3.3.ebuild
index 017446fb29d3..85138095ce63 100644
--- a/dev-vcs/pre-commit/pre-commit-3.2.2.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-3.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 82bba36aede7..3a782321d1a1 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 94f3129380e2..c0fdc3712eec 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,5 +1,7 @@
 AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
 DIST msmtp-1.8.23.tar.xz 401656 BLAKE2B 7033c7e8ad74826ab233bd9b08b8db8e17f6c9bd4cc9f6e65890099e4e12445f4665acc2faf1468f5d6f5e16a53c2479d5a0144e39d65c0521436832c1a049c5 SHA512 69675cb539fa5c78b83e90a460e8215e56b1d0fa7a18729eb058b8d51414d13b88fbcdb2092767e7e96c325a143230ac09e041ea74d068bf267e508418cf674a
+DIST msmtp-1.8.24.tar.xz 409268 BLAKE2B 1661dffbdf9418665dfea3eacdcb716a27ea0916024247ccc221d0f6c3da0076f9bc3b822e9f0c152185f08b8d929268f8eaf63489304225d200a093fcff9d46 SHA512 9bcd1431bd27a74cea931da0e89adfdc53b5be027cef4a735e2fdaba3aed38408b4a266960b51a4071664b88b1af4545a3df5acf64b9ab8ce84000c49a8286ff
 EBUILD msmtp-1.8.23.ebuild 3241 BLAKE2B 483d53c2bb35715a62db8a19b3500f9102439189c69d542ffe92ac630d257ce40f083eeec9273222990e97d07c5ae4e8ee9101921fa911bdf48e6619fd6765ba SHA512 0fef47915cdfc10507cd870061f04a98be1af46559a5ae13fea1c34fef2e3cb64aa4a6a98266d30427369fc7918ece38197f149aef69d6e3e453ac30680087f2
+EBUILD msmtp-1.8.24.ebuild 3255 BLAKE2B de6cbb5628e749fd17727463a61e16ec40f554370027a09ef67057af5d1908252813253c6b435d9ebf81de13b9f6ccb4f4cdd8d97199ad732d5c5ab0f313b1f0 SHA512 edaf1229f1655839c92c3cb782485fa005d4ee6b2e24fd6d4b5d94077d8a432e4d382f9a485a37fdc553e6c1b43fbe771176d9656e241c872ea94dbec2fb2f0b
 MISC metadata.xml 390 BLAKE2B c245db441455174144a9071fc47570fe4760b8fe696baef76f32e69ef9a9d221efaf8dba090a555e0a5aa47b601703ada191c7b88c134271924bc46e61227d8e SHA512 b90c6215a3044a7964b2e6ff6817eb40bb79fc4d1b845904788b8990ca6dcc58f2ff5f1745a977a374ee8a9ecf0775a18db2d91d0c8c41a597f70a10033d6035
diff --git a/mail-mta/msmtp/msmtp-1.8.24.ebuild b/mail-mta/msmtp/msmtp-1.8.24.ebuild
new file mode 100644
index 000000000000..f8f460e9df26
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.8.24.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2004-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps
+
+DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
+HOMEPAGE="https://marlam.de/msmtp/"
+SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="daemon doc keyring +gnutls idn +mta nls sasl ssl"
+
+# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
+# USE="daemon" in order to set the caps we need.
+REQUIRED_USE="daemon? ( filecaps )"
+
+# Upstream discourages usage of openssl. See also
+# https://marlam.de/msmtp/news/openssl-discouraged/
+DEPEND="
+	keyring? ( app-crypt/libsecret )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	sasl? ( net-misc/gsasl[client] )
+	ssl? (
+		gnutls? ( net-libs/gnutls[idn?] )
+		!gnutls? ( dev-libs/libretls:= )
+	)
+"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase
+	daemon? (
+		acct-group/msmtpd
+		acct-user/msmtpd
+	)
+	mta? (
+		!mail-mta/courier
+		!mail-mta/esmtp
+		!mail-mta/exim
+		!mail-mta/netqmail
+		!mail-mta/nullmailer
+		!mail-mta/postfix
+		!mail-mta/sendmail
+		!mail-mta/opensmtpd
+		!>=mail-mta/ssmtp-2.64-r2[mta]
+	)
+"
+
+BDEPEND="
+	doc? ( virtual/texi2dvi )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
+
+src_prepare() {
+	# Use default Gentoo location for mail aliases
+	sed 's:/etc/aliases:/etc/mail/aliases:' \
+		-i scripts/find_alias/find_alias_for_msmtp.sh || die
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-gai-idn
+		$(use_enable nls)
+		$(use_with daemon msmtpd)
+		$(use_with keyring libsecret)
+		$(use_with idn libidn)
+		$(use_with sasl libgsasl)
+		$(use_with ssl tls $(usex gnutls gnutls libtls))
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		cd doc || die
+		emake html pdf
+	fi
+}
+
+src_install() {
+	default
+
+	if use daemon ; then
+		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
+		newinitd "${FILESDIR}"/msmtpd.init msmtpd
+		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
+	fi
+
+	if use doc ; then
+		dodoc doc/msmtp.{html,pdf}
+	fi
+
+	if use mta ; then
+		dosym ../bin/msmtp /usr/sbin/sendmail
+		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins scripts/vim/msmtp.vim
+
+	insinto /etc
+	newins doc/msmtprc-system.example msmtprc
+
+	src_install_contrib find_alias find_alias_for_msmtp.sh
+	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
+	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
+	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
+		einfo "In addition, per user configuration files can be placed"
+		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
+		einfo "/usr/share/doc/${PF}/ for an example."
+	fi
+}
+
+src_install_contrib() {
+	subdir="$1"
+	bins="$2"
+	docs="$3"
+	local dir=/usr/share/${PN}/${subdir}
+	insinto ${dir}
+	exeinto ${dir}
+	for i in ${bins} ; do
+		doexe scripts/${subdir}/${i}
+	done
+	for i in ${docs} ; do
+		newdoc scripts/${subdir}/${i} ${subdir}.${i}
+	done
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d15e8facb131..dde1c991ff71 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 262f363567d5..26cf01f36d20 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -5,9 +5,9 @@ AUX gmic-3.2.0-relative_rpath.patch 406 BLAKE2B cb92f21c090bfdb3c91aef60fc854fd2
 AUX gmic-3.2.4-makefile_automagic.patch 5367 BLAKE2B 7f720d964746fdb745f7741b092f3b313d9d92fb885e4660cc869ee0cd11affd57ec405e6db4002bd1085d8809c9b5af310b78103cf036ca3a7af272adcc1f63 SHA512 bca841fbd9bbca0c89833fcc77c3921db1a3fd83a156b1d58c2d8cebdb025ff0c9ab5c29a2ff9e9ffefb739f9513a1e2844fd0746973423cfcd2ace60ab95743
 AUX gmic-3.2.5-relative_rpath.patch 759 BLAKE2B 0c6deda724d6f983e9d1cf3101862fc5c3096fecd5951fc185c814bdb8e59774a30591ec969b4121951c3a1662ab5cb4040d4e9b9cfaa463496fc90bc59a301f SHA512 9c5daf6ad03002867594fc48c19c19b1050d9e7be3cab161e8fbe2f84a5fc31ceece2241c0bfa6cc9eaced44a6ceb0d716f485ca04e62a1160530316e4a3d50c
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
-DIST gmic_3.2.2.tar.gz 11321544 BLAKE2B e6786fdb0342e1dfa62043837fedeea25961b375af5d1dde247be373c0ef3e35a556dc78d6dd09b5b4c4ead3b531e2bb6a7b671a400dc9d477b22f1c6c7da6b9 SHA512 be695107f8cceb94789aaa021ca431ead3e0a7f87533478df0942ea6ad94f81639de8af827bb24fbef1baccc6ded8d41b4f5386ed9ee37704c2483ea7596800e
 DIST gmic_3.2.5.tar.gz 11352319 BLAKE2B 812e28119bcbe485a7551c7afc89d7efb2a46ba3d9cc31597fddcd4c4ba48fa040827eccd92c1abbef3035c057d432f6b7b783ff9067da8be2806a05902bdf35 SHA512 e453b83201fa7aff7dc193c529c6b81306e94990a03356488abbbe3acdf8eb6b07e12c16e496e9607bcb730258218b3431c489b3fd1434bb31e28727be7eae27
+DIST gmic_3.2.6.tar.gz 11574989 BLAKE2B abd33048a448ca8406169c61a9d97bf6e785cbb286cec1d5104f12960640de9eb292677256c074eee5371fa77ed7041671f77a63140c2fa58070c01404962be6 SHA512 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395
 EBUILD gmic-3.2.0.ebuild 3456 BLAKE2B 5e98b8d4ce0bc98c91ce5f77a92833ca4a48a17986fdac664528981451a723061b469ab3b502f5cb9988768cd9afd5bf03edf51573169f1a0bd261386b65fd98 SHA512 209ab91667f7574fb5cdd9e42a54f444d6c96ff91b55a5677c3e4c05284eae79d48237eac8bda942408df9ca7a2aa3b50f4827364cdba5a865e9774b4fe475d5
-EBUILD gmic-3.2.2.ebuild 3471 BLAKE2B ca9e659dee49ae79135a998ba11109cafb0eb829ad0c5c1345b34fef1baabbf568e04a8d8c4ab428603a060417fd940f07d2d9c6bcb94ad98f6ee715106cb9d5 SHA512 8d9036a0d4f44725e50de73ce1812d0ee50b023ae11ababd4be3c9e8577f2168a65c4e133945c1009f56346b4470f9e2a78616b863732e76a9071357f22a55d7
 EBUILD gmic-3.2.5.ebuild 3471 BLAKE2B 877f5bcbf0b15e202ca28fdd35e6b5b38883cba8f808647c9a75cc6357b53b62eb66c5e54431afb4122028bdcff01cb79382163c2eba7387621ceb0af7f3edbd SHA512 f76eb11a0827bd026b3e234342e446bbc08e0ca8ba0a78a040dcd7a592b4749343a56def6f9f9eed81243f1a57dbbf45e9bc7fef1dc6735c52f9355459e1059b
+EBUILD gmic-3.2.6.ebuild 3471 BLAKE2B 877f5bcbf0b15e202ca28fdd35e6b5b38883cba8f808647c9a75cc6357b53b62eb66c5e54431afb4122028bdcff01cb79382163c2eba7387621ceb0af7f3edbd SHA512 f76eb11a0827bd026b3e234342e446bbc08e0ca8ba0a78a040dcd7a592b4749343a56def6f9f9eed81243f1a57dbbf45e9bc7fef1dc6735c52f9355459e1059b
 MISC metadata.xml 466 BLAKE2B 672259377cf7d693bc2493557b22150ddd3504d5bcb3f7b11c8e7e9a8ff591573503e5c9481d8a81e27757d4ebe205dd51a0fb57c0e691461988bc99fc714fc5 SHA512 62d65a13a3061fb31954fc08d753f6df7d76c262dc1c14304c1473dbe3f3412fb77cf808f0f205dc73d124f6dd1104c13d9dc79194eba702a0acdfb112fe6530
diff --git a/media-gfx/gmic/gmic-3.2.2.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild
index 3c824f3eee11..e49f4fe6fe0d 100644
--- a/media-gfx/gmic/gmic-3.2.2.ebuild
+++ b/media-gfx/gmic/gmic-3.2.6.ebuild
@@ -63,8 +63,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
 	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
-	"${FILESDIR}"/${PN}-3.2.0-makefile_automagic.patch
-	"${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch
+	"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
+	"${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch
 )
 
 pkg_pretend() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index da79adc14f78..02232c985824 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 505f0575cb09..4c2001d26d00 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 10 Jul 2023 20:39:45 +0000
+Tue, 11 Jul 2023 02:39:41 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3144caff65e0..530ba18763bc 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-07-10T20:39:48Z
+TIMESTAMP 2023-07-11T02:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSsbJRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSswPJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD3Iw/9F5cvhRCsrsk+NXxvscLzimm2dhMhFftZ/1PCX7Exx+172rTeyBrceBX7
-4Ttjw9YFrOS56Br5vg1jYmgwmKO+JruiU1TjkN5A1G2/HkaPcE4kZJmvef7qZFyD
-0WzSnJpms0Or/lXPwFDTad0o0mMFmjoDVH+22mfc5mv0txxDSp/Ng13UWzfPsRGH
-xPQtWw9uVrpWyFws24IK9o4S8tNr7aJyyBYTVQ1K/RJNV4BNCsKZIyDt3Cwiw09O
-qGfqzK47dmeG+ehrgVSno5EozsUwN6mgimhoODEROfH7H+q3kcCySTXGgDm8rrt3
-ZReQAi9qQhDlNnzZTVFQZFhhdQpr3nrwAPcmLCQTiwiCXD/MbzibiqcL+6tKwUGG
-gJ8jJlfM3KeUgQVVqHbvTkAviQBrekXY771vX0rDwzHz5BnBPZ4uVgcchNkPe+7k
-nFey3Dmquhbp1/qjNwZVrnt5iQRop5Kb7L/ZHMgBGtYw29Au3V9uCCapQvr3O6Kp
-vMW0x4Nx6JUOBITvhOLI9sfODKiRXij3bFWHCEPnqydRmTXED5VEs4pwIazJc9zZ
-Jbdl0iQdV10/cBcLCV+Nvuzm8JQPvBbINnOurS/wQzfi3R6K6YvRFXWD5CVUIxzu
-5LjKm/aVkdA/4UCW19aXEYoft++qft3yAdpQypEl4U6y0tOZfSE=
-=eSTK
+klDA4hAAiEmD/h3U3KF6Teq9jMOizGxut0Ojf8LkQ6TBWUuUka/E/cy+hZ1exs7x
+Lr1ncrGSu9VgMWEXfPhg8urolpQMDT/8wxIlcP5vCFSnjvtU2gBah87+MjCRSo01
+YFQDwCNUh1O+GJrMPD67Id3gcU3C0+RVH7zWnyvpRih7n7DmGQ78iAK3w2Sek40O
+Ehj60oxWTguUhpAoZnMipFGrhGfxs386M2N2otKgJFtt0Oap4rqnKyLnP2/BdaeK
+lDtwoW1HQmwrfOUprQVonrEHQ0veSBXXcqwunTytcogPhuol6cZx20Vn+20AzMfB
+J9obfiX/qib4JoK475+YHQ2c/EiItmBouVqpEoA6fKbWOe0CKNcXx7IGW2D7cYk+
+ZChmFszJzBwMJa3DiwPsovYOzIomSVcB7+bIg5Pt5v3OcuRh+2W6kL18iAb0wHHn
+UiiLKxYfPQU+VxDKkOzXt4ncavVUbmvSTomcr2mAiniEIvv8ov5Tg7CoVzOQ1/Vo
+36rwSOHNkvyUC6jbvq5QpNJEgFRSbQ59GfGnlLYZ4DaU3QDbNgCQJKVlAetVZoGo
+Q2+h+KOQEQwILkMVLBinqQ4JhiAuI2be4OYt3Kx4tyep1gCn0PxKHnA6KNzb3/pK
+2HEQcFGhXYfAibj9gfwFEtAuutoJAxwreA0QbCA8AHoayIceZIA=
+=P7en
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 505f0575cb09..af45697767fa 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 10 Jul 2023 20:39:45 +0000
+Tue, 11 Jul 2023 02:39:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 81beb5819514..cba096df70fa 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 2d956048960d..e7f382c2b46f 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.7.11 b/metadata/md5-cache/app-backup/borgmatic-1.7.11
deleted file mode 100644
index 2b97641819a3..000000000000
--- a/metadata/md5-cache/app-backup/borgmatic-1.7.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( 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_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_10? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.3.1[python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_11(-)] >=dev-python/wheel-0.40.0[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 pypi
-IUSE=test 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_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_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/b/borgmatic/borgmatic-1.7.11.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=346282c911eac78a8e4b2a5c017387d6
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.7.13 b/metadata/md5-cache/app-backup/borgmatic-1.7.13
deleted file mode 100644
index 0d850f3c2578..000000000000
--- a/metadata/md5-cache/app-backup/borgmatic-1.7.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( 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_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_10? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.3.1[python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_11(-)] >=dev-python/wheel-0.40.0[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 pypi
-IUSE=test 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_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_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/b/borgmatic/borgmatic-1.7.13.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6c815b26869a67b818c6cdbbe0e12bfd
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.7.15 b/metadata/md5-cache/app-backup/borgmatic-1.7.15
new file mode 100644
index 000000000000..8fef5fd16452
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgmatic-1.7.15
@@ -0,0 +1,16 @@
+BDEPEND=test? ( 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(-)] ) python_single_target_python3_12? ( >=dev-python/flexmock-0.10.10[python_targets_python3_12(-)] ) ) test? ( app-backup/borgbackup 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_12? ( <dev-python/colorama-0.5[python_targets_python3_12(-)] dev-python/jsonschema[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_12(-)] dev-python/setuptools[python_targets_python3_12(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.3.1[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/pytest-7.3.1[python_targets_python3_12(-)] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_single_target_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_11(-)] >=dev-python/wheel-0.40.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/gpep517-13[python_targets_python3_12(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_12(-)] >=dev-python/wheel-0.40.0[python_targets_python3_12(-)] ) 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 pypi
+IUSE=test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv
+LICENSE=GPL-3
+RDEPEND=app-backup/borgbackup 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_12? ( <dev-python/colorama-0.5[python_targets_python3_12(-)] dev-python/jsonschema[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_12(-)] dev-python/setuptools[python_targets_python3_12(-)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_single_target_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/b/borgmatic/borgmatic-1.7.15.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=efce6e39366e9fec16e9b4b767596584
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index ef6dc20de622..24216cc6329e 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.6 b/metadata/md5-cache/app-misc/gramps-5.1.6
deleted file mode 100644
index a9b767278bcf..000000000000
--- a/metadata/md5-cache/app-misc/gramps-5.1.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_11(-)] dev-python/pyicu[python_targets_python3_11(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_11(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DESCRIPTION=Community genealogy program aiming to be both intuitive and feature-complete
-EAPI=8
-HOMEPAGE=https://gramps-project.org/
-INHERIT=distutils-r1 xdg-utils
-IUSE=exif geo postscript +rcs +reports spell test test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_11(-)] dev-python/pyicu[python_targets_python3_11(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_11(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.6.tar.gz -> gramps-5.1.6.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5c937d1c8f2e63772113727b7c5fdd9d
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.6-r1 b/metadata/md5-cache/app-misc/gramps-5.1.6-r1
new file mode 100644
index 000000000000..2e11fd15e1c4
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gramps-5.1.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_11(-)] dev-python/pyicu[python_targets_python3_11(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_11(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] ) python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] ) )
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DESCRIPTION=Community genealogy program aiming to be both intuitive and feature-complete
+EAPI=8
+HOMEPAGE=https://gramps-project.org/
+INHERIT=python-single-r1 xdg-utils
+IUSE=exif geo postscript +rcs +reports spell test python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_11(-)] dev-python/pyicu[python_targets_python3_11(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_11(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.6.tar.gz -> gramps-5.1.6.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6decd67edbb9289d8e7ad03b544b6a56
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index e74cb1cbf3d8..c568970ef6bb 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.8.2 b/metadata/md5-cache/dev-cpp/benchmark-1.8.2
new file mode 100644
index 000000000000..71caa5bf0491
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/benchmark-1.8.2
@@ -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.8.2.tar.gz -> benchmark-1.8.2.tar.gz
+_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b4a80de7665f1442a1f4fe6516f201b3
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.2 b/metadata/md5-cache/dev-cpp/gflags-2.2.2-r1
index 1377206ba25e..07d696f72cf1 100644
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.2
+++ b/metadata/md5-cache/dev-cpp/gflags-2.2.2-r1
@@ -1,9 +1,9 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Google's C++ argument parsing library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://gflags.github.io/gflags/
-INHERIT=cmake-multilib
+INHERIT=cmake-multilib flag-o-matic
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.2
 SRC_URI=https://github.com/gflags/gflags/archive/v2.2.2.tar.gz -> gflags-2.2.2.tar.gz
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=22e62201c1b5dd92cdfe07ecb6e3ad82
+_md5_=a8fbd050e6c092e965f3d1598a5d8a26
diff --git a/metadata/md5-cache/dev-cpp/gflags-9999 b/metadata/md5-cache/dev-cpp/gflags-9999
index 1a1a02e7018e..cc832a6bc733 100644
--- a/metadata/md5-cache/dev-cpp/gflags-9999
+++ b/metadata/md5-cache/dev-cpp/gflags-9999
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Google's C++ argument parsing library
 EAPI=8
 HOMEPAGE=https://gflags.github.io/gflags/
-INHERIT=cmake-multilib git-r3
+INHERIT=cmake-multilib flag-o-matic git-r3
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/2.2
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6c2f2afee552021a1ae17732ac054e75
+_md5_=ce1b6721391035442c0716da76158b36
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ea5a3e51f8c6..e9f22fb047bc 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libbpf-1.2.1 b/metadata/md5-cache/dev-libs/libbpf-1.2.1
new file mode 100644
index 000000000000..198bafc67d17
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbpf-1.2.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=sys-kernel/linux-headers virtual/libelf
+DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
+EAPI=8
+HOMEPAGE=https://github.com/libbpf/libbpf
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 BSD-2
+RDEPEND=sys-kernel/linux-headers virtual/libelf
+SLOT=0/1.2
+SRC_URI=https://github.com/libbpf/libbpf/archive/v1.2.1.tar.gz -> libbpf-1.2.1.tar.gz
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=071bcc289c0b977d2f84b619b66f3b56
diff --git a/metadata/md5-cache/dev-libs/libp11-0.4.12-r2 b/metadata/md5-cache/dev-libs/libp11-0.4.12-r2
deleted file mode 100644
index e44997d2fd15..000000000000
--- a/metadata/md5-cache/dev-libs/libp11-0.4.12-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-libs/opensc )
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/openssl:=[bindist(+)] test? ( dev-libs/softhsm )
-DESCRIPTION=Abstraction layer to simplify PKCS#11 API
-EAPI=8
-HOMEPAGE=https://github.com/opensc/libp11/wiki
-IUSE=doc static-libs test
-KEYWORDS=~amd64 ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/openssl:=[bindist(+)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenSC/libp11/releases/download/libp11-0.4.12/libp11-0.4.12.tar.gz
-_md5_=78ceddb931ae1c7280a6bcd41ff5abd0
diff --git a/metadata/md5-cache/dev-libs/libp11-0.4.12-r3 b/metadata/md5-cache/dev-libs/libp11-0.4.12-r3
new file mode 100644
index 000000000000..6af8408f0d7f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libp11-0.4.12-r3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-libs/opensc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/openssl:=[bindist(+)] test? ( dev-libs/softhsm )
+DESCRIPTION=Abstraction layer to simplify PKCS#11 API
+EAPI=8
+HOMEPAGE=https://github.com/opensc/libp11/wiki
+INHERIT=autotools
+IUSE=doc static-libs test
+KEYWORDS=~amd64 ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/openssl:=[bindist(+)]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OpenSC/libp11/releases/download/libp11-0.4.12/libp11-0.4.12.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=0ffa4e776b957ccc41ac50cbfa0ef6fb
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8c9f04c2ff37..f16031569a2d 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/mkdocs-ansible-0.1.4 b/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.4
deleted file mode 100644
index 1b75869b71c0..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Ansible theme for MkDocs
-EAPI=8
-HOMEPAGE=https://pypi.org/project/mkdocs-ansible/ https://github.com/ansible/mkdocs-ansible
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=dev-python/mkdocs-material[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/m/mkdocs-ansible/mkdocs-ansible-0.1.4.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=ecf3ab03dd9292d6d9fc5116debd52dc
diff --git a/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.5 b/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.5
deleted file mode 100644
index e0a78b0b6cfc..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Ansible theme for MkDocs
-EAPI=8
-HOMEPAGE=https://pypi.org/project/mkdocs-ansible/ https://github.com/ansible/mkdocs-ansible
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=dev-python/mkdocs-material[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/m/mkdocs-ansible/mkdocs-ansible-0.1.5.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=ecf3ab03dd9292d6d9fc5116debd52dc
diff --git a/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.6 b/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.6
deleted file mode 100644
index e4d5a90e17c2..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Ansible theme for MkDocs
-EAPI=8
-HOMEPAGE=https://github.com/ansible/mkdocs-ansible/ https://pypi.org/project/mkdocs-ansible/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=dev-python/mkdocs-material[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/m/mkdocs-ansible/mkdocs-ansible-0.1.6.tar.gz
-_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=347c7a5aa9dcebbaf93f025c4a4e6c9f
diff --git a/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.6-r1 b/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.6-r1
new file mode 100644
index 000000000000..ef92220436cc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-ansible-0.1.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Ansible theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/ansible/mkdocs-ansible/ https://pypi.org/project/mkdocs-ansible/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=>=dev-python/markdown-exec-1.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-include-0.8.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-gen-files-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-htmlproofer-plugin-0.10.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-material-extensions-1.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-material-9.0.13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-minify-plugin-0.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-monorepo-plugin-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocstrings-python-0.8.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocstrings-0.21.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.9.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=media-gfx/cairosvg-2.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/m/mkdocs-ansible/mkdocs-ansible-0.1.6.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=450d5064447a0306ea3bcc0340c08459
diff --git a/metadata/md5-cache/dev-python/pyopencl-2023.1.1 b/metadata/md5-cache/dev-python/pyopencl-2023.1.1
new file mode 100644
index 000000000000..49b31bcfedfa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopencl-2023.1.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-libs/pocl ) test? ( >=virtual/opencl-2 >=dev-python/mako-0.3.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/opencl-2 opengl? ( media-libs/libglvnd ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+DESCRIPTION=Python wrapper for OpenCL
+EAPI=8
+HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
+INHERIT=distutils-r1 multiprocessing pypi
+IUSE=examples opengl test python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-2
+RDEPEND=>=virtual/opencl-2 >=dev-python/mako-0.3.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyopencl/pyopencl-2023.1.1.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=8d210b1d4c1db2b77eaf3abdcdec520a
diff --git a/metadata/md5-cache/dev-python/versioneer-0.29 b/metadata/md5-cache/dev-python/versioneer-0.29
new file mode 100644
index 000000000000..0a57c9ae8329
--- /dev/null
+++ b/metadata/md5-cache/dev-python/versioneer-0.29
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git !!dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easy VCS-based management of project version strings
+EAPI=8
+HOMEPAGE=https://pypi.org/project/versioneer/ https://github.com/python-versioneer/python-versioneer/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Unlicense
+RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-versioneer/python-versioneer/archive/0.29.tar.gz -> python-versioneer-0.29.gh.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=71ad6bb3bcf0b07716b89e42ffbda6bb
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 375468f060f4..d4e850b5ab33 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-cli-1.31.0 b/metadata/md5-cache/dev-util/gitlab-cli-1.31.0
new file mode 100644
index 000000000000..fb67b004119e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gitlab-cli-1.31.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=the official gitlab command line interface
+EAPI=8
+HOMEPAGE=https://gitlab.com/gitlab-org/cli
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://gitlab.com/gitlab-org/cli/-/archive/v1.31.0/gitlab-cli-v1.31.0.tar.bz2 -> gitlab-cli-1.31.0.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-cli-1.31.0-deps.tar.xz
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=51cf3fbe3ce1048779fe43ea97a7f9fe
diff --git a/metadata/md5-cache/dev-util/gitlab-runner-15.10.1 b/metadata/md5-cache/dev-util/gitlab-runner-16.1.0
index bec6897a88b6..5b41a8e2b463 100644
--- a/metadata/md5-cache/dev-util/gitlab-runner-15.10.1
+++ b/metadata/md5-cache/dev-util/gitlab-runner-16.1.0
@@ -10,6 +10,6 @@ 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.10.1/gitlab-runner-v15.10.1.tar.bz2 -> gitlab-runner-15.10.1.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-runner-15.10.1-deps.tar.xz
+SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v16.1.0/gitlab-runner-v16.1.0.tar.bz2 -> gitlab-runner-16.1.0.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-runner-16.1.0-deps.tar.xz
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=98234acfca48f6c9f8cea291d5a53e43
+_md5_=6ce0f1337e2aebd8b9580763da3a8b2b
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 91a7d3417629..af165963f928 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-machete-3.17.3 b/metadata/md5-cache/dev-vcs/git-machete-3.17.3
deleted file mode 100644
index 07cd4df2d89e..000000000000
--- a/metadata/md5-cache/dev-vcs/git-machete-3.17.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-mock-3.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) test? ( dev-vcs/git >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Probably the sharpest git repo organizer & rebase/merge workflow automation tool
-EAPI=8
-HOMEPAGE=https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/
-INHERIT=bash-completion-r1 distutils-r1
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=dev-vcs/git python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/VirtusLab/git-machete/archive/refs/tags/v3.17.3.tar.gz -> git-machete-3.17.3.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=0a9bb7b441fb15b279e300adccfd974e
diff --git a/metadata/md5-cache/dev-vcs/git-machete-3.17.6 b/metadata/md5-cache/dev-vcs/git-machete-3.17.6
new file mode 100644
index 000000000000..8a92df27b54b
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-machete-3.17.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-mock-3.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-xdist-3.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.4:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.12:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) test? ( dev-vcs/git >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Probably the sharpest git repo organizer & rebase/merge workflow automation tool
+EAPI=8
+HOMEPAGE=https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/
+INHERIT=bash-completion-r1 distutils-r1
+IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=dev-vcs/git python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/VirtusLab/git-machete/archive/refs/tags/v3.17.6.tar.gz -> git-machete-3.17.6.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=9be40183f5a7db835ef755f3fd79966a
diff --git a/metadata/md5-cache/dev-vcs/pre-commit-3.2.2 b/metadata/md5-cache/dev-vcs/pre-commit-3.3.3
index 73d46379ced4..5b8c2579cc1c 100644
--- a/metadata/md5-cache/dev-vcs/pre-commit-3.2.2
+++ b/metadata/md5-cache/dev-vcs/pre-commit-3.3.3
@@ -11,6 +11,6 @@ RDEPEND=dev-vcs/git python_single_target_python3_10? ( >=dev-python/cfgv-2.0.0[p
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/pre-commit/pre-commit/archive/refs/tags/v3.2.2.tar.gz -> pre-commit-3.2.2.gh.tar.gz
+SRC_URI=https://github.com/pre-commit/pre-commit/archive/refs/tags/v3.3.3.tar.gz -> pre-commit-3.3.3.gh.tar.gz
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=33a99de63b545e86e04c05c568583091
+_md5_=99ba80a012e12930d20a80ebae4fddbc
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 35d9ab64ebe7..741fa128357c 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.24 b/metadata/md5-cache/mail-mta/msmtp-1.8.24
new file mode 100644
index 000000000000..12b920c64d0f
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.24
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( net-misc/gsasl[client] ) ssl? ( gnutls? ( net-libs/gnutls[idn?] ) !gnutls? ( dev-libs/libretls:= ) )
+DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
+EAPI=8
+HOMEPAGE=https://marlam.de/msmtp/
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=fcaps
+IUSE=daemon doc keyring +gnutls idn +mta nls sasl ssl +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-3
+RDEPEND=keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( net-misc/gsasl[client] ) ssl? ( gnutls? ( net-libs/gnutls[idn?] ) !gnutls? ( dev-libs/libretls:= ) ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/sendmail !mail-mta/opensmtpd !>=mail-mta/ssmtp-2.64-r2[mta] )
+REQUIRED_USE=daemon? ( filecaps )
+SLOT=0
+SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.24.tar.xz
+_eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191
+_md5_=833003b066f33b876b03dce4c4357f1f
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 192a9f3d0acb..f3515e2eadf1 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/gmic-3.2.2 b/metadata/md5-cache/media-gfx/gmic-3.2.6
index 30491b0b0e53..345a29bd8ec5 100644
--- a/metadata/md5-cache/media-gfx/gmic-3.2.2
+++ b/metadata/md5-cache/media-gfx/gmic-3.2.6
@@ -11,6 +11,6 @@ LICENSE=CeCILL-2 GPL-3
 RDEPEND=sys-libs/zlib:0= curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5 >=dev-qt/qtgui-5.2.0:5 >=dev-qt/qtnetwork-5.2.0:5 >=dev-qt/qtwidgets-5.2.0:5 ) graphicsmagick? ( media-gfx/graphicsmagick:= ) jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:= ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:= ) qt5? ( >=dev-qt/qtcore-5.2.0:5 >=dev-qt/qtgui-5.2.0:5 >=dev-qt/qtnetwork-5.2.0:5 >=dev-qt/qtwidgets-5.2.0:5 ) tiff? ( media-libs/tiff:= ) X? ( x11-libs/libX11 x11-libs/libXext ) ffmpeg? ( media-video/ffmpeg:= )
 REQUIRED_USE=gimp? ( png fftw X ) qt5? ( png fftw X )
 SLOT=0
-SRC_URI=https://gmic.eu/files/source/gmic_3.2.2.tar.gz
+SRC_URI=https://gmic.eu/files/source/gmic_3.2.6.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=21cda35aa3ebb3545fef5f4b3742ddda
+_md5_=621ca7fbb1d77d1a454cbc4477d9e83d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 588125ab3f3e..7e6ba08c5b09 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-10.4.0 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-10.4.1
index e71d7ee4e0b4..715bcf412063 100644
--- a/metadata/md5-cache/net-analyzer/nessus-agent-bin-10.4.0
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-10.4.1
@@ -8,6 +8,6 @@ KEYWORDS=-* ~amd64 ~arm64
 LICENSE=GPL-2 Tenable-Master-Agreement
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://www.tenable.com/downloads/api/v2/pages/nessus-agents/files/NessusAgent-10.4.0-es8.x86_64.rpm ) arm64? ( https://www.tenable.com/downloads/api/v2/pages/nessus-agents/files/NessusAgent-10.4.0-es8.aarch64.rpm )
+SRC_URI=amd64? ( https://www.tenable.com/downloads/api/v2/pages/nessus-agents/files/NessusAgent-10.4.1-es8.x86_64.rpm ) arm64? ( https://www.tenable.com/downloads/api/v2/pages/nessus-agents/files/NessusAgent-10.4.1-es8.aarch64.rpm )
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	multilib	c19072c3cd7ac5cb21de013f7e9832e0	rpm	745ef34afb8c31915d9d42a6aca23a35	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
 _md5_=5a3e30df0bdeb84333f7c38f0b3ea8f2
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-10.5.2 b/metadata/md5-cache/net-analyzer/nessus-bin-10.5.3
index 10f60e36fc70..2f936dcd11e4 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-10.5.2
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-10.5.3
@@ -8,6 +8,6 @@ KEYWORDS=-* ~amd64 ~arm64
 LICENSE=GPL-2 Tenable-Master-Agreement
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://www.tenable.com/downloads/api/v2/pages/nessus/files/Nessus-10.5.2-es8.x86_64.rpm ) arm64? ( https://www.tenable.com/downloads/api/v2/pages/nessus/files/Nessus-10.5.2-es8.aarch64.rpm )
+SRC_URI=amd64? ( https://www.tenable.com/downloads/api/v2/pages/nessus/files/Nessus-10.5.3-es8.x86_64.rpm ) arm64? ( https://www.tenable.com/downloads/api/v2/pages/nessus/files/Nessus-10.5.3-es8.aarch64.rpm )
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	multilib	c19072c3cd7ac5cb21de013f7e9832e0	rpm	745ef34afb8c31915d9d42a6aca23a35	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
 _md5_=174c13b58e73eb97bcd62739365feed6
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 1db83cc666da..b416d39f64cc 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.23.6 b/metadata/md5-cache/net-p2p/syncthing-1.23.6
new file mode 100644
index 000000000000..6872bad3c015
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/syncthing-1.23.6
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm prepare test unpack
+DESCRIPTION=Open Source Continuous File Synchronization
+EAPI=8
+HOMEPAGE=https://syncthing.net
+INHERIT=desktop go-module systemd xdg-utils
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense
+RDEPEND=acct-group/syncthing acct-user/syncthing tools? ( >=acct-user/stdiscosrv-1 >=acct-user/strelaysrv-1 ) selinux? ( sec-policy/selinux-syncthing )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/syncthing/syncthing/releases/download/v1.23.6/syncthing-source-v1.23.6.tar.gz -> syncthing-1.23.6.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c8096c0b539b49ce7d5adf4ef4d49ef2
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 4417f33b8733..ac3d26c0fc7c 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.49 b/metadata/md5-cache/sys-apps/portage-3.0.49
index f7bbe639494b..3d6a082fbc56 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.49
+++ b/metadata/md5-cache/sys-apps/portage-3.0.49
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
 IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-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=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/coreutils-6.4 >=sys-apps/file-5.44-r3 )
 RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/baselayout-2.9 >=sys-apps/findutils-4.4 !build? ( >=app-admin/eselect-1.2 >=app-shells/bash-5.0:0[readline] >=sys-apps/sed-4.0.5 >=sec-keys/openpgp-keys-gentoo-release-20230329 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[bzip2(+),threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[bzip2(+),threads(+)] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.49.tar.bz2
 _eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=685c6dbfdf89838f8393efe8eec7e0e0
+_md5_=f41f4bc6819728aaf0cd1a2f43e1d94d
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index b8ac3f062628..db66a2b9ad7f 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/grub-2.12_rc1 b/metadata/md5-cache/sys-boot/grub-2.12_rc1
new file mode 100644
index 000000000000..305e54d06d7e
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/grub-2.12_rc1
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/flex-2.5.35 sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+DESCRIPTION=GNU GRUB boot loader
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/grub/
+INHERIT=bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
+LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
+RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
+REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=2/2.12_rc1
+SRC_URI=https://alpha.gnu.org/gnu/grub/grub-2.12~rc1.tar.xz fonts? ( mirror://gnu/unifont/unifont-15.0.06/unifont-15.0.06.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=0538f5b5178ca3a0dea1c4ebf4cb750e
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index 75d3b97cb098..3f00cf653bb2 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -10,8 +10,8 @@ LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3
 PROPERTIES=live
 RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
 REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=2/9999
-SRC_URI=fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
+SRC_URI=fonts? ( mirror://gnu/unifont/unifont-15.0.06/unifont-15.0.06.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7bb14137ec39ea3f29590154c18eafce
+_md5_=b3b761e7abb9d2b9b9ccdf99be010fde
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 603c5aa25e79..6136445b5329 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-07-10T20:39:48Z
+TIMESTAMP 2023-07-11T02:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSsbJRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSswPJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCVkA/+PokFK6aSiJA0culdN+1e9X5oXtABVqdTiBqBtik8R1EuBQc+1JgpxbVy
-fEo+PVa9LDrh30P//NNX9+JKBqBM5MXa4v52YfZgguuK1z0Phy0NTzSEwzDmUziJ
-AbCCtfpXevM+tqELDPHL8GMUCoDPIX7EWoJQga5+XedeXOS/n5KW4HZ0/RJPeQDk
-Z5+agRkGLiTrOMwT4fCyV3NufTu6n+rfKK3DJjsc3NzYffuAqLFog2ZHXerMUwMZ
-JcjYMAi+qPZfqXD1A59AYjy356MqT2+ubrZjmC0+xJMD92l4GuqfLAcqWLug12R4
-zHOFqBeoSIj6G6FEU8YycrNbwczGY8oiSVuo5j7WZoeK6Z2yGX3TlgcLAm+1m99e
-KznivdC1gPhx5FH0c57Yu3WvaoVdRIjdtpPI/gkaAr5pOEq88CE68KBSa11N4sQm
-TwYbv6GLdOzdYl+e8jlmLGly7qYcMz84ya4bJpylGr/9LPYpYQbtXmJSnDeKOxHl
-zaQDd2W/+D4wf8lpRFDJv+HnRf+ikkyuFXpHt09jkE8eTdFKqX6JOVkDFTUUFs6q
-aKPKXVowtgk0t40ovdsNK3XfwtfRx/GQZk0hOVdVOE50quPEnNqMD6yTESsQANjp
-MfgRvhK1BT3MkNvIjRXA7ZaV9V6BlzrAlZsjLHMB6qTubaVDOPY=
-=HEM0
+klAjJw//fcogcNxOEoAk6kzOFKMNYQ50qv0U4ReuUHrIULhsgRtkO1yj60UKLRUl
+p40FqNgJXsQTksf98XOwnbSbh0sElgXmiWG+5M4UOfDBzNC2+fWNFW2IJLAQx02/
+3PNkKi+fvOOebg4UjG+Hfg+Gce+bptVsOBjxZAyhvXS/a9KhEwT+PUziAwacy/4k
+P+QBHMCdME/Yh36rq8G+G2ICju4K+VhfBxyxHmQ/1my2CStDflFwIqZ3o8K4VVn5
+Kvrn98j5Fup7RusAv9o+92pibFO9FsT2Bt4M9/u79DIesBmpRTWYkCeVe+tjBMjp
+/BxEsKWBFExzPk59KbTVKGGo5YSaXarRL7rrmZ17+naWDr5LsO0NFKnP/Kpb1PnF
+EMIYy/zElexmlTLrlA239o9e81tzxIEuXeZbNjtyBNQqgP27UJszyt5vkl23Rewb
+SPoc2ha1jwX8t0ai2B8g3KEZM+3Gl5VeOY5fHZMsY3tIR9Elqhh1qSJjlXi2sX6W
+dyzK7UHiAJ8cP+5StxjMdkTGejd52EVWWKL5wlWt3O7y87uSVGXoiTV+UIShyBXW
+f+5zaB1AkppGd6Qr6WV70PyxlaIYvs6yPvBFlCf+xP0C5mKRA8fpxbsM0eoz6szP
+/ZvFh8wk6gjvvQAOH+nMiHyQY7sK9PKQ7DBj2mhVzvTjbcqm1MU=
+=8Jai
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 505f0575cb09..af45697767fa 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 10 Jul 2023 20:39:45 +0000
+Tue, 11 Jul 2023 02:39:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7fa2d0ae6f84..c6633b85bcb9 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jul 10 08:39:45 PM UTC 2023
+Tue Jul 11 02:39:41 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5dfa8a807651..ccdbba95b417 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 10 Jul 2023 20:45:01 +0000
+Tue, 11 Jul 2023 02:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f87c9c15bca5..6114ac8a5a4e 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9e7e88c20f804d3b515792fb523ea397586efcfe 1689020346 2023-07-10T20:19:06+00:00
+26f73cddbae89f5a1a19264a4cf8777b016d9aaf 1689038158 2023-07-11T01:15:58+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2bffbf8f2000..c242e08cf984 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1689021601 Mon 10 Jul 2023 08:40:01 PM UTC
+1689043201 Tue 11 Jul 2023 02:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 505f0575cb09..4c2001d26d00 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 10 Jul 2023 20:39:45 +0000
+Tue, 11 Jul 2023 02:39:41 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3bada81dc048..4dbb478fcc76 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 91b50ed02245..91eb8cb11a61 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,5 +1,5 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-10.4.0-es8.aarch64.rpm 18363096 BLAKE2B 478a92a6a6da322b3bc1c2a16b9257e0a538aa76416919f8a2f2101f9776b3991f8c21fbb0da8e4fe6c0b50db6b49c77386eded8a85d5d2a8dff33f05ecc7575 SHA512 ce3a7b36af5d1f45623433100eb2a708cf6cabad961204023b8335f665fc1a3b82d1afc17345b5fc96bcc945976ac8edb4cfeac97fbb59b8c11edef42268a534
-DIST NessusAgent-10.4.0-es8.x86_64.rpm 19767232 BLAKE2B 8205d5699eb28132070f30bbab41cd3331b3b7cba5da4f61156f7cca056e323638995445bdb519f03ebdc4c8184072344c5f64e32d2c66f444de012cf4ed0221 SHA512 fad38bc7526c7522d34c6c1cf2ca86b56c9d3850a954e769533036432e4f279dcb669f6b7fa89b633bfd520cf383de3dd8e624c15415d8ba1f4e0708ebe7fdd6
-EBUILD nessus-agent-bin-10.4.0.ebuild 2212 BLAKE2B 2d18c6b09ffa2a2e54d4226bad72b09b9d581c8ddd9a59b9f93eac9252841448616ebfae7695bf2e6e07fcc753985681252e60d1a7095ca5965ffaa0e162daec SHA512 15436dadd4ca815f3a312149ac135fe353e6c5435d83cad8a5acc1143fa3232657fc9d7a7e5569b0afd9775af0e4941e11ddaf2a7d407b302f2aee9365af7203
+DIST NessusAgent-10.4.1-es8.aarch64.rpm 18298448 BLAKE2B 498c23274d84376ac14a128ee61bbcb966b68de535b2e0bc56397abaf2b1b02ab24984f45c945bce6265e3fe4713a2aa67fc5b20411eda2d131ad5d52db1c717 SHA512 b3145dcde06548695f2b75792a34eb39e110af437c4b12c37ddf040a83966fca1b83e09eca5759a8e56c5341d20b643244e9d8ec8571d33f76431241eec9bbde
+DIST NessusAgent-10.4.1-es8.x86_64.rpm 19686968 BLAKE2B 107467bd6e911b9932290b610025fec6766a0e98ffee6c45abeaf07a73b18ed423ba03c501ac09e4f2a12e1e0ba39dbb4989c9ddc9e2a75f218c6d3773325724 SHA512 377f5bf1db9f582e7c65d0a21624cd990183b47a633c777da67e119c6b3da847da8aea482a78e8e48aaa9d3c1798b9c0c9bbb902c8760c53ff4371884d3e9ca9
+EBUILD nessus-agent-bin-10.4.1.ebuild 2212 BLAKE2B 2d18c6b09ffa2a2e54d4226bad72b09b9d581c8ddd9a59b9f93eac9252841448616ebfae7695bf2e6e07fcc753985681252e60d1a7095ca5965ffaa0e162daec SHA512 15436dadd4ca815f3a312149ac135fe353e6c5435d83cad8a5acc1143fa3232657fc9d7a7e5569b0afd9775af0e4941e11ddaf2a7d407b302f2aee9365af7203
 MISC metadata.xml 354 BLAKE2B f3d046b6610423bd40c2cdbe29c8aa35d8111c56f6565d5b84aea31e03a8612b3a173965496833ec2ad2a38412b68d39f09d389e41797a0cda399758c85034a5 SHA512 1f4021d2781ddbccbbf0bf91492b50af18f142200bfc959a36b527941b9e8452a7814e12a1f720fcc62f6d069158cdb5093ae3760bc1b3b09d2cb73e4ab7f715
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.4.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.4.1.ebuild
index 0ed091eca8d1..0ed091eca8d1 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.4.0.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.4.1.ebuild
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 8aff9fef609a..95c7bfb746c6 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,5 +1,5 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-10.5.2-es8.aarch64.rpm 58830260 BLAKE2B 479715de274e33b305bea32016b872fb391378ca5d2ce75d3526abb72a17b2d460a8791e54729406e02d0cf7a603415a2147f0a526df67e64552dbb4626bcb24 SHA512 aec3c3dd7af05b7cba7bccbc6542a2a44ed81a276ae61b395c227e6427a575a1573b870eafaf85b67ac0a1dfb7e7dd5947eee36e5e6378bd4f48240eb4ba9277
-DIST Nessus-10.5.2-es8.x86_64.rpm 60204196 BLAKE2B c991f166b22cd406504538216b945150cf6d5db9e8d5c6d7a87657df6a55a1d08a1d41f42369937e1096a3edbb0ac411d5aa6e1f2d231b6e37691596efc3ee65 SHA512 718b41c3856427b933ccd7e493a92dd8a1250c52bce85546519422e3bbd70c24b77c2ac496d218e27b434b5ad08f81f8683fdaa72c1a8e5c66d43e7e7c4c8c68
-EBUILD nessus-bin-10.5.2.ebuild 1886 BLAKE2B 4fb8afe7907b490820b03d83e89ab5898219d22e70c1c4a1b5546cf97c63e8d47a83acb56686c253d96d446c0b75b39adb3bd039aea2c1275c8c13b80250a324 SHA512 18558958faa202c8a33558ffd8060b4d547c67c14e574cceeca92f420143ad18ca870f5bcbc72270d979c08ec01cf3b8f1303676ba53fea2b548a632d1386a52
+DIST Nessus-10.5.3-es8.aarch64.rpm 58985712 BLAKE2B 37e33beb2d2dc033427e8d3d3d7cb7b205461200f542af1275ee8bc35beecd1f92fcaed012a3d2749db50b40290591d357d771cc96ff40921f7aed3baffc10cb SHA512 d4b3ec54e8a5d13cde890633fb2b4be26b5b9673ba221309f830703de760cd91e8ceed7c6f53d59ff527857c001e1a3d8fdd290e8cb0d7cc8ac4d04dc8409b49
+DIST Nessus-10.5.3-es8.x86_64.rpm 60361352 BLAKE2B 1eab4a62c94832fb4b528123b457490d0b9769bea632141b0cfdb2f17cbfdfc080b3afb934e313eb61caa166501d211092721ddd946bb556312eb7914189aecf SHA512 a518da6eb56435cc3b4210c4ed7f9bf76452b983c6a69639745210c564a52f6b9b7e00ceaa36983fff703e1f98eac3cabdb80d0ee85dc94c882b5e42f04b08d5
+EBUILD nessus-bin-10.5.3.ebuild 1886 BLAKE2B 4fb8afe7907b490820b03d83e89ab5898219d22e70c1c4a1b5546cf97c63e8d47a83acb56686c253d96d446c0b75b39adb3bd039aea2c1275c8c13b80250a324 SHA512 18558958faa202c8a33558ffd8060b4d547c67c14e574cceeca92f420143ad18ca870f5bcbc72270d979c08ec01cf3b8f1303676ba53fea2b548a632d1386a52
 MISC metadata.xml 346 BLAKE2B 5e72f68ab557c56cc09cedcaaa9760f3619723bd6fc58b8ecc921526b1b42b6b65e971876ec569c1e68a26e55def24767c5d896fd9eb6a706041b485a8885023 SHA512 ab7e122c344a3f5078b2d497ed36a63f6af74fcfa7f2b98d6299ec7c82e7cbaf427da8fa595e6445e49ee041114ac581fb5b1d703f16fc70a54ee98375062e82
diff --git a/net-analyzer/nessus-bin/nessus-bin-10.5.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.5.3.ebuild
index a977f8ba6efb..a977f8ba6efb 100644
--- a/net-analyzer/nessus-bin/nessus-bin-10.5.2.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-10.5.3.ebuild
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index b532a194a083..cf6ac20a6486 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 59debb5176cb..089728493eec 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -11,5 +11,7 @@ AUX syncthing.confd 733 BLAKE2B dec494bd35422f57dd8b6d848325933da909000d79b3d319
 AUX syncthing.initd-r2 1288 BLAKE2B a1c74a4de5bfe61fe4e57f7be358a4ba2df28a92fd48e933fa1c67b7beb72281617c3a11d2e379e97a6e57c2378ae8d88fbdb7c80ba3d6e9513833eebd06eff5 SHA512 4f86a81112df1ba15f92bd88999ba632e4a3ba4a6e5a150b2d60a82011bd35f177f86e81a51e95e10b99f4be7698ebd2786ca423635d576872fccec7607c1564
 AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690907a2e2b8c2954da72154a885759589249c541f36b2740980f3fcd3e99db0d3f6d5a1bacee8c1574f9bc SHA512 73a5f7062b48ab4c7b343b43367b1999f8e133eadb624bd5e3e147ae41f135ded6acb4c617db2d385311441c9a52c288333791308c36762cb5273a853cce5a67
 DIST syncthing-1.23.5.tar.gz 14196275 BLAKE2B e9d44ed83546ea28e474379c7b3141e447e4f595cf8587220fe76d64844b1ee57551f56b06a7244afc3af45728c19bd76b6ba923da03983dc7ae9799ac36d9a9 SHA512 ef41c7bf8e693e3db5ea7c3cd645580a89131cc0fb48e12a50a24af28c86533bf973c58daea7cda5822544602c366a21f299c88dcd601e3913b6a08d5f4564dc
+DIST syncthing-1.23.6.tar.gz 14213659 BLAKE2B ef4f1a8bbf5bce6c7bc9bf80f55c875b5edfd5c10481676ddff9b1579afc518723a28d83424e62a178192f795b30526eca912a3e0d20be1901b065c431acf139 SHA512 32162bcf1677015d3359a141968c9e3544c8bd631905489a11bf79f45fa4ae442e8dc0f24c19c2b55defd88b3d5b56ae35d352aac9c09f6b82c50fd8b27fc796
 EBUILD syncthing-1.23.5.ebuild 2887 BLAKE2B 09ab0937a5697393094861c25f0ba64cd4bf9a4ca90e9c627d2599724d30efa8a35079c65219df615709d75e719a438e2222059a5dbfba05ef88cc8e98c16390 SHA512 1a3ff5674a898c68e5632c7cbf01445386c44a4ab009815283e8ec14ff86ee87b11275e323986c4633a0593e9e6a07a821cc690791d874748e4516a84ffb14be
+EBUILD syncthing-1.23.6.ebuild 2892 BLAKE2B d62d3764dbde48e231ddfff877bc324d3ae50ec2be2ccb8c05aacd72d933a2159a50c315db514e21ab1329bf67440f1b44da6a9e5d4448ab2eb2a5d037b1754d SHA512 819771dd2c2312e0176e93bc5cc1d5fd9fd7fb4bdd1a114666a69720e9855aefbb35554f9d48fe8e68cf6627dd3b041e6579a83fbc6c44b77d675974a9aa8ed5
 MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
diff --git a/net-p2p/syncthing/syncthing-1.23.6.ebuild b/net-p2p/syncthing/syncthing-1.23.6.ebuild
new file mode 100644
index 000000000000..d8e3bf08df7a
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.23.6.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop go-module systemd xdg-utils
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
+IUSE="selinux tools"
+
+RDEPEND="acct-group/syncthing
+	acct-user/syncthing
+	tools? ( >=acct-user/stdiscosrv-1
+		>=acct-user/strelaysrv-1 )
+	selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
+	"${FILESDIR}"/${PN}-1.18.4-tool_users.patch
+	"${FILESDIR}"/${PN}-1.23.2-tests_race.patch
+)
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/stdiscosrv|' \
+		cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service \
+		|| die
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+}
+
+src_compile() {
+	GOARCH= go run build.go -version "v${PV}" -no-upgrade -build-out=bin/ \
+		${GOARCH:+-goarch="${GOARCH}"} \
+		build $(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	local icon_size
+
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+
+	domenu etc/linux-desktop/*.desktop
+	for icon_size in 32 64 128 256 512; do
+		newicon -s ${icon_size} assets/logo-${icon_size}.png ${PN}.png
+	done
+	newicon -s scalable assets/logo-only.svg ${PN}.svg
+
+	if use tools; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+
+	systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+
+	keepdir /var/log/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	if use tools; then
+		systemd_dounit cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service
+		newconfd "${FILESDIR}"/stdiscosrv.confd stdiscosrv
+		newinitd "${FILESDIR}"/stdiscosrv.initd-r1 stdiscosrv
+
+		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}"/strelaysrv.confd strelaysrv
+		newinitd "${FILESDIR}"/strelaysrv.initd-r1 strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/stdiscosrv.logrotate strelaysrv
+		newins "${FILESDIR}"/strelaysrv.logrotate strelaysrv
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 70ce87c618d2..e0458e37c904 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index a5e1c4ab67ea..d851c92ac1f6 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,15 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Marek Szuba <marecki@gentoo.org> (2023-07-10)
+# dev-python/mkdocs-material is by design directly integrated with
+# Google Fonts and as such violates the network sandbox [1].
+# Upstream documentation mentions an option which supposedly prevents
+# this, however adding it to the Molecule mkdocs.yml has had no effect.
+# Looks like this will have to be addressed at the level of mkdocs-material.
+# [1] https://squidfunk.github.io/mkdocs-material/setup/changing-the-fonts/
+app-admin/ansible-molecule doc
+
 # William Hubbs <williamh@gentoo.org> (2023-06-30)
 # multiple repeated issues: Bug: #909394
 net-libs/nodejs lto
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b0b82a812ace..679389f89913 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 73d205b4a4c7..71d8f7e60d5e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -12,6 +12,6 @@ EBUILD portage-3.0.45.3-r2.ebuild 9026 BLAKE2B aaba365eaafaffb9dd2d8a66c41fa51c9
 EBUILD portage-3.0.46.ebuild 9028 BLAKE2B 45cc1c243acdcd59535c2b0ae9f0ab94719f5892d9d15574b1f19cd849b26b01c8ade885a219d270aec61c9973bb39c05c82f61988bf414c972e2a696c9ec6a5 SHA512 daa29ed42c599011e6b93e765a97bc55262acffd01dccc3c681a4e2fcd5eefd1aa173024221e71e6d8cb463f024b71c7bb276632cd5a7a58a3a2d470124899d3
 EBUILD portage-3.0.47-r1.ebuild 9272 BLAKE2B 5cfd00aa50d078fe299c5cf244064ddf63e9b31a713d96a515c6dac9efd4b2e9964630de983a1707831ef06df49286ea123b9c4dd6503162bb107202f60e71c4 SHA512 3914720ad172677040d9016783145c325ae2504df00180811bcb0418ca983f3c843e57d08ef76d749cddaea4a491e4b95148a62ac85de625a33e083b5289f4c1
 EBUILD portage-3.0.48.1-r1.ebuild 9269 BLAKE2B d4dd70f72286c3ca9ed910daa052c7eaaa7e391aa7a19b7b92535fff570c0e973e4d46c363d076569aa4617019fc942844ab008368c21cf624df0b5ffa30d1f9 SHA512 2767d6091fe1aa7f8c9df1c724193ed66897310c06e9e836d2ef8dd6be54344022b3ebba60235885d9be534e0998e01a24a395a7604abed0273876b372c4ae3b
-EBUILD portage-3.0.49.ebuild 9269 BLAKE2B d4dd70f72286c3ca9ed910daa052c7eaaa7e391aa7a19b7b92535fff570c0e973e4d46c363d076569aa4617019fc942844ab008368c21cf624df0b5ffa30d1f9 SHA512 2767d6091fe1aa7f8c9df1c724193ed66897310c06e9e836d2ef8dd6be54344022b3ebba60235885d9be534e0998e01a24a395a7604abed0273876b372c4ae3b
+EBUILD portage-3.0.49.ebuild 9268 BLAKE2B 7852854596062c19578e584aeab7688ce35dc0320ccc0e81747685380e17b441586e64538f898ca8d48560c8b2e5a816598fafc078f4e86c2c749af348f11c0b SHA512 51b0f1ff5fb9ee01da59c4e62ccb0ad9813fc137090e59630be2ed4527c8980b5eb66d23ecc2fb63445b1e71f4fc00627081902d63700ed7aaa7c1efe1af4ef8
 EBUILD portage-9999.ebuild 9206 BLAKE2B dbd2078ae019d8047d4246dff0c5f74ed9efbd5409a48bccb34c2e3b8198c53b29237ab1978f2b2b4a65cd51e1b70f6b6c65cdb86c754d578409d52d300b63d1 SHA512 718d004ad310227b92c7cb3956e2c9359ba6974cf99b33a0d9266c3647aed3314e92a3731108bc3ed22299163b9b4c0561401ae124e4c562da066368c69ff2c0
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.49.ebuild b/sys-apps/portage/portage-3.0.49.ebuild
index 9e5f7353bb48..8cf174c553ec 100644
--- a/sys-apps/portage/portage-3.0.49.ebuild
+++ b/sys-apps/portage/portage-3.0.49.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	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"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 75cb12da05fa..ecd911e18b1f 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index ee58fadc789d..a870ef6d1166 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -10,7 +10,10 @@ AUX grub.default-4 2644 BLAKE2B a954461f46df2ea1be2b6a6ae0ba3c023bd72f75d1998ee3
 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
 DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602 SHA512 99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
 DIST grub-2.06.tar.xz 6581924 BLAKE2B 2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417 SHA512 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
+DIST grub-2.12~rc1.tar.xz 6589460 BLAKE2B edfad62a01970026ca4ad088056da6225ef1319a08e8a95418b24cc8102be7fe45bb1412797aab13f8c1f4f690cf2fa9e5b4725f6769013ce76aa81c43952557 SHA512 6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
+DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B 81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca SHA512 0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b
 EBUILD grub-2.06-r7.ebuild 8678 BLAKE2B 92cad67d1751e45d31315c9952c0e79d9287344d03fd35d3e35e954c08ddf5a3e007a97a10471d6ec755b1696d353b55952d53309dbf705b0571969d877c9362 SHA512 021d34fc8e8aca25f729dd11100f530a3a2c845633f9deba48ed0bcdacbdce8ff89e246eba82dd077b9f90f5beb203167f5afd02aa27bc52b64c12630b5ede9a
-EBUILD grub-9999.ebuild 8267 BLAKE2B 076e96240bc34ef50cfd249f5d46eb6256669d4d51972b154e6c4c379127e891860551392bc4658d43197bcddcba995f62690b2c0af652bbf9ffcae51d66d10b SHA512 d0e17a95f3cd3c41e72fc5d680e7d0bf01cf62e6a39b716f5284a6db2ff8c2edf0773cd80a3d4ce369bbc9da7d18513fcf34d4752d7e4ad73e11162169a86aab
+EBUILD grub-2.12_rc1.ebuild 8351 BLAKE2B 12744f5cf47262945370ce05ebac58bf6437189d4a89e336f13c73764503a0b63ada9f5f220c1aca40d257c76a21e38cb17ce7ce618eb46da18779a82d42016c SHA512 598bf54bbd72a6029a5f1f909b83a6a64d326532861c37f39aaf3cb2fcba373ac3c56afbbbac1dc835d0c92fada1adf7b65e17a3aa90098cd9a96db20d9577a5
+EBUILD grub-9999.ebuild 8350 BLAKE2B a837dcfb5ec8bbc0fa99ee5e7eaf5aeb270f923b45d6f7fea8f5d6de57f632edef949107fad12e077004f9a95bf2d8e968c9c4658d9c10c53168dccd970a05e3 SHA512 3d7ebdca907c937c7b638345dcbb13c408ff3dbf945b3b3685ac461de1b54e3b92db737506d68a3f7808d3aa4885940dddba8adca2a9063a84349b033bb1d6ef
 MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/grub-2.12_rc1.ebuild b/sys-boot/grub/grub-2.12_rc1.ebuild
new file mode 100644
index 000000000000..96f3d98c6f01
--- /dev/null
+++ b/sys-boot/grub/grub-2.12_rc1.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This ebuild uses 3 special global variables:
+# GRUB_BOOTSTRAP: Depend on python and invoke bootstrap (gnulib).
+# GRUB_AUTOGEN: Depend on python and invoke autogen.sh.
+# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
+#
+# When applying patches:
+# If gnulib is updated, set GRUB_BOOTSTRAP=1
+# If gentpl.py or *.def is updated, set GRUB_AUTOGEN=1
+# If gnulib, gentpl.py, *.def, or any autotools files are updated, set GRUB_AUTORECONF=1
+#
+# If any of the above applies to a user patch, the user should set the
+# corresponding variable in make.conf or the environment.
+
+if [[ ${PV} == 9999  ]]; then
+	GRUB_AUTORECONF=1
+	GRUB_BOOTSTRAP=1
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+WANT_LIBTOOL=none
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+	inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+	inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+		MY_P=${P/_/'~'}
+		SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+	else
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+		S=${WORKDIR}/${P%_*}
+	fi
+	#KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/gfxpayload.patch
+	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+	"${FILESDIR}"/grub-2.06-test-words.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-15.0.06
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/"
+
+# Includes licenses for dejavu and unifont
+LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"
+
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot
+	qemu qemu-mips pc uboot xen xen-32 xen-pvh )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+	grub_platforms_coreboot? ( fonts )
+	grub_platforms_qemu? ( fonts )
+	grub_platforms_ieee1275? ( fonts )
+	grub_platforms_loongson? ( fonts )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/flex-2.5.35
+	sys-devel/bison
+	sys-apps/help2man
+	sys-apps/texinfo
+	fonts? (
+		media-libs/freetype:2
+		virtual/pkgconfig
+	)
+	test? (
+		app-admin/genromfs
+		app-arch/cpio
+		app-arch/lzop
+		app-emulation/qemu
+		dev-libs/libisoburn
+		sys-apps/miscfiles
+		sys-block/parted
+		sys-fs/squashfs-tools
+	)
+	themes? (
+		app-arch/unzip
+		media-libs/freetype:2
+		virtual/pkgconfig
+	)
+	truetype? ( virtual/pkgconfig )
+"
+DEPEND="
+	app-arch/xz-utils
+	>=sys-libs/ncurses-5.2-r5:0=
+	grub_platforms_emu? (
+		sdl? ( media-libs/libsdl )
+	)
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+	libzfs? ( sys-fs/zfs:= )
+	mount? ( sys-fs/fuse:0 )
+	truetype? ( media-libs/freetype:2= )
+	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+"
+RDEPEND="${DEPEND}
+	kernel_linux? (
+		grub_platforms_efi-32? ( sys-boot/efibootmgr )
+		grub_platforms_efi-64? ( sys-boot/efibootmgr )
+	)
+	!sys-boot/grub:0
+	nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test ) test? ( userpriv )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		pushd "${P}" >/dev/null || die
+		local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+		local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+		git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+		git-r3_checkout "${GNULIB_URI}" gnulib
+		popd >/dev/null || die
+	fi
+	default
+}
+
+src_prepare() {
+	default
+
+	if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+		python_setup
+	else
+		export PYTHON=true
+	fi
+
+	if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+		eautopoint --force
+		AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+	elif [[ -n ${GRUB_AUTOGEN} ]]; then
+		FROM_BOOTSTRAP=1 ./autogen.sh || die
+	fi
+
+	if [[ -n ${GRUB_AUTORECONF} ]]; then
+		eautoreconf
+	fi
+}
+
+grub_do() {
+	multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+	multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+	local platform
+
+	case ${MULTIBUILD_VARIANT} in
+		efi*) platform=efi ;;
+		xen-pvh) platform=xen_pvh ;;
+		xen*) platform=xen ;;
+		guessed) ;;
+		*) platform=${MULTIBUILD_VARIANT} ;;
+	esac
+
+	case ${MULTIBUILD_VARIANT} in
+		*-32)
+			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+				local CTARGET=i386
+			fi ;;
+		*-64)
+			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+				local CTARGET=x86_64
+				local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+			fi ;;
+	esac
+
+	local myeconfargs=(
+		--disable-werror
+		--program-prefix=
+		--libdir="${EPREFIX}"/usr/lib
+		$(use_enable device-mapper)
+		$(use_enable mount grub-mount)
+		$(use_enable nls)
+		$(use_enable themes grub-themes)
+		$(use_enable truetype grub-mkfont)
+		$(use_enable libzfs)
+		$(use_enable sdl grub-emu-sdl)
+		${platform:+--with-platform=}${platform}
+
+		# Let configure detect this where supported
+		$(usex efiemu '' '--disable-efiemu')
+	)
+
+	if use fonts; then
+		ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+	fi
+
+	if use themes; then
+		ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+	fi
+
+	local ECONF_SOURCE="${S}"
+	econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# Bug 508758.
+	replace-flags -O3 -O2
+
+	# Workaround for bug 829165.
+	filter-ldflags -pie
+
+	# We don't want to leak flags onto boot code.
+	export HOST_CCASFLAGS=${CCASFLAGS}
+	export HOST_CFLAGS=${CFLAGS}
+	export HOST_CPPFLAGS=${CPPFLAGS}
+	export HOST_LDFLAGS=${LDFLAGS}
+	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+	tc-ld-disable-gold #439082 #466536 #526348
+	export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+	unset LDFLAGS
+
+	tc-export CC NM OBJCOPY RANLIB STRIP
+	tc-export BUILD_CC BUILD_PKG_CONFIG
+
+	# Force configure to use flex & bison, bug 887211.
+	export LEX=flex
+	unset YACC
+
+	MULTIBUILD_VARIANTS=()
+	local p
+	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+		use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+	done
+	[[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+	grub_do grub_configure
+}
+
+src_compile() {
+	# Sandbox bug 404013.
+	use libzfs && addpredict /etc/dfs:/dev/zfs
+
+	grub_do emake
+	use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+	# The qemu dependency is a bit complex.
+	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+	local SANDBOX_WRITE=${SANDBOX_WRITE}
+	addwrite /dev
+	grub_do emake -j1 check
+}
+
+src_install() {
+	grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+	use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+	einstalldocs
+
+	insinto /etc/default
+	newins "${FILESDIR}"/grub.default-4 grub
+
+	# https://bugs.gentoo.org/231935
+	dostrip -x /usr/lib/grub
+}
+
+pkg_postinst() {
+	elog "For information on how to configure GRUB2 please refer to the guide:"
+	elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test -gt ${v}; then
+				ewarn
+				ewarn "Re-run grub-install to update installed boot code!"
+				ewarn "Re-run grub-mkconfig to update grub.cfg!"
+				ewarn
+				break
+			fi
+		done
+	else
+		elog
+		optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
+		optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn
+		optfeature "enabling RAID device detection" sys-fs/mdadm
+	fi
+
+	if has_version 'sys-boot/grub:0'; then
+		elog "A migration guide for GRUB Legacy users is available:"
+		elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration"
+	fi
+
+	if has_version sys-boot/os-prober; then
+		ewarn "Due to security concerns, os-prober is disabled by default."
+		ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
+	fi
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index e10ab779e8e6..8d6f9d06e40d 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
@@ -57,7 +57,7 @@ PATCHES=(
 )
 
 DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
+UNIFONT=unifont-15.0.06
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
 	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
 
@@ -129,7 +129,7 @@ RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )
 "
 
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test ) test? ( userpriv )"
 
 QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
 QA_PRESTRIPPED="usr/lib/grub/.*"
@@ -280,7 +280,9 @@ src_compile() {
 src_test() {
 	# The qemu dependency is a bit complex.
 	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
-	grub_do emake check
+	local SANDBOX_WRITE=${SANDBOX_WRITE}
+	addwrite /dev
+	grub_do emake -j1 check
 }
 
 src_install() {
author	V3n3RiX <venerix@koprulu.sector>	2023-07-11 04:28:45 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-07-11 04:28:45 +0100
commit	7e110ec617b903791c3d309845e11a8b27f441cc (patch)
tree	d9e8b4826e21ef9fa1fc2255d459f563d5581283
parent	f2a91413828611d85d0496e98e1656e9b0e4528b (diff)