gentoo auto-resync : 04:08:2023 - 21:18:29

84 files changed, 867 insertions, 405 deletions

diff --git a/Manifest b/Manifest
index 90fe32c9216a..ed9a11c20989 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29263 BLAKE2B c7b97d1684289edb463f9e9910f968c4969820929b35c77092fa3091c8db9d91bf4a40de7f949d21a831217958a2eb13874ef730e01d7e925202677e64505412 SHA512 4682bd454e53b88a9e4514949df345e943a6daf24d58ae6b07c03ac440d8492f2fe7904774cc0c1a4225127704084c3a5010752faaab37bf598058fdb89a196b
-TIMESTAMP 2023-08-04T13:40:17Z
+MANIFEST Manifest.files.gz 29271 BLAKE2B 5cd0e3cef52a44c4061e3d63652ad7689247a952c7101f36c4ae08897d1baa84b03f910f643d742e5376d81dc675f1920b8341654d1fe4a46e6f0171105b1565 SHA512 9e7cea7b4b0cca1ab728626f3477a0871cb335a5a65bb67af8cc65de1f29d2d60518f1901790d6cc82d2b3dbe4267d11d87bb9bdb9e35a6c6283dffc53041779
+TIMESTAMP 2023-08-04T19:40:15Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTM/8FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTNVB9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCBUw//SaWbFC6cHhnkp7jlLjDETkLRUSmA9DOQNv82z1irMxjH+AFKL6uP8+H8
-Mx0EzzMGzsgcfqo2bc1FiUUjL2jtRW7KxL1QuVRcOEoKlzpHI9XViJ2P2vJAqv24
-odPOD6LRd1tXtgGab/S+SECTi31Or4pC0snOnt7a4iqMmB+3z6svnU18iVXmjieB
-fyihYNeWJzkVciyDs8PcbThar92yucpxA2dK3YjZqAMqkBQZSRvG+t+iE2Hwsv88
-6LROnJH4+wjgl8T+uZHl76Do/bOf94QpIjJS7emNOzAHCopgiEK547Ot7yimKrq3
-m1IbNzlGdu7Jzr6dqIMxnY8Hfpzv+6z1+69VC+fyhEaGoBS+SP8Tb8PL2/MvbhFE
-yvk58GU+cqEX1ICLNI7FT5Ld/fJ1kg/rxdsaRDMxNs8uintxXPsyTzghKwet/UN9
-HKtlc7ep99U6NN8gnYNo171VPT+hDPCbTwbKtZPhlMMnI4x7LF9qD2nQHjVPhsZ5
-CNpwXDPjDBm/wtbZXrmiVdJSIhPt6WreCt66iBd3JaR8upmQmJV7afjpB5e7ooU5
-V6LEXr7QB5XiWf9FA0KjBzeoM//CvS0tmPV6LLa8KMfDcQ+0MsNWhtBEJKkv42uG
-act0A+2mEmDNLUnOatueZ3qlPd5m00dM8eDyEcRNqoHA36oVxLw=
-=hCWD
+klA9FBAAja4qbqUMc48xwlpguNdVQMoME/yBz/IKCHDoQUGsYt8dEQs9X+oyuhAF
+pXWOqASrcuvKb1ighnH6CAz5BVMhotsfh8JTPHAMs4wjGSVfnUb3cyIddTHlh6ZC
+MfsbjUgOufCyp8butBpLc9c3WAtezeOgmt3xYO66mnBrWRzz5py4+tm52dPqeJbs
+tCUA2REfWk5TySWIZ5DT8wevpgNwQ1TbZiP82QnHqKkOh1W/h4BnYVfVoGybXhIt
+jeFa/Qh5SSo0AcLM5lL6nRT44fbNpB0W2CqGRTE2SVoQ29hZLm0Ld0V0sR674M7W
+i6vTjrKVGv1bazy2gGvuQF0reaOzizdI+5JjUQE92PDuZTE7YM9A3dWa+LK4HoP+
+a0Ba3hy6TLCad7AACWP/0M054Vv3o7lDLw6HOZUXeUob/1Hzt3n3X7nVJzcX2D1u
+l/wJAxrtL1R3atk13s/cy9PUDk9wmbZi6s21dsRz2XSUwMcJx8mWsFTtwnQkq1Zj
+8ljoyr/Zttw+rEOehSntuj1Lk+3F+CQ81gZlC/xdRoUz8qaQykkabLQMbsKMhXSG
+m53SOXYYm6cKTarQigooADLhWPkKX87vFqx1dh/dQdTZN68A4qh8PEpCQwp/MtbH
+wYcrJzwAW326IfpeImkiIx2aAKvL83oyG4BkD5FI73HFsED2vn8=
+=JdWg
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index aa6536e7faf0..1d459c2041c2 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 5418b926c4a2..1ba9914c6c00 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index 94c493cadd1a..eb37f13fe683 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1,4 +1,4 @@
 AUX lynis.cron-new 72 BLAKE2B 1f2d683c74e9e85f142c23277f24e8c81b33e4d1691a6f171694194bd5d81a5e1473532afe2c6fca23c995d9c7bd08d18d6eed78a07661618c12e22b35e9ff81 SHA512 1cdaaee433912c2ccdec8ad7c9b88be55fe3f1d68e2fca79cc6e0e10112d465a70cfbe0a049623437f604bfc9793e0d29b709e035cbf710d4d38ba48acc5355f
-DIST lynis-3.0.8.tar.gz 339467 BLAKE2B 490bd6799619a4247c3fa68cc96f2f1fead651b23db0ffb512394960f8ca0360ab7f25d2bb8d9e742641558972e1fdd4b1e18d7de0d13007988276eed3a97b1f SHA512 df41aa8b7518a72ee17732eb7e69ccc62ca6e1323d3adc7aec509cd1c21494fece873e101bc317655dafbf58b32699f56dd27eec13a2ce615801cee75961cd33
-EBUILD lynis-3.0.8-r1.ebuild 1807 BLAKE2B 7011dff427deedcaecaa249c55a8c0ab796a01d0b908baf1321d86311158e360e29673a658621b72899a18f9cdbaeec800e3cd4c8c4386919c58d853b6875570 SHA512 bd39a2cc0d4c50a5f4beba5dcaa73ffc16305c06b7ca7e60b7c85c23b754028038d5aae47c32a6b66c1d2da95d95f1534cf7a6846888c03bfcdaaa8187b6ff47
+DIST lynis-3.0.9.tar.gz 339171 BLAKE2B dc7912c7d1782c3ffdf369cc7f0f004267bd2a2c408982909e654db14ecfa83ebdbd2f731c3d3ee8864e7de21945b1faa2f9d2845dedf3e742a4c79c62373eda SHA512 7fc0349be9ea9d6e311b834cb7f9089bd0d393381edb5325a0bea88ed83dcd3d816dc213c6a6d17f88ff937af71be72004570894e427e4faf1b0d39448aa3a43
+EBUILD lynis-3.0.9.ebuild 1807 BLAKE2B ac0eb355c2f0bae6585d1252c901d2a641266a09eb23152e3bda36f476069bb9d50745df512d7606394bf2af1f68ef89e7d2e5b2e78a3b3f22ca3d52735839e6 SHA512 357c53bc2b84a40985c2ef0bd84b6cbef8117aa16d69232b9c92d1baf9fb98afb4586d1af740a52d5047106cb7814e85fda7c58ef310199f6e697a43d96022fd
 MISC metadata.xml 324 BLAKE2B 3ccc9fa29e93b80f279e24768171e1ed3ae9c371ec0cc1fca13770f498c91a75235e886b1c873dbf2a6a7355caa054c614612054251f3cdd828813e93948b6be SHA512 349bad0292a35a2434456d7b9385163a41e2430651f3fe115a3953ae8419d4369b339691b84502ff661267c8948fac13eeffe9dec2cb0a92bdf3d478cb48b0a5
diff --git a/app-forensics/lynis/lynis-3.0.8-r1.ebuild b/app-forensics/lynis/lynis-3.0.9.ebuild
index b7df6561856b..8ed08f4c8527 100644
--- a/app-forensics/lynis/lynis-3.0.8-r1.ebuild
+++ b/app-forensics/lynis/lynis-3.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index b7b244c08469..82b0ef72c368 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index ff56f4fff599..99f1a2563f35 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -296,5 +296,5 @@ EBUILD rust-bin-1.68.2-r2.ebuild 6835 BLAKE2B d05acd0a3dfa60ca96f0f5e4a05df2fa36
 EBUILD rust-bin-1.69.0-r1.ebuild 6823 BLAKE2B bb1d577b2e5240704c756d809d83eb5969ac4e390dd2125d4a06f99f5843dda466b1837462da306c788216c879e7626b89c08c36a56246d223da607f7624bf10 SHA512 13a81c0860ddb0b9e4eeedceaed27a8020dddaffc191d7b181efcbf71764cd693651b472b928bae8108544c32b66124f8ca2f29b21a5a04ea757fec37cc4d620
 EBUILD rust-bin-1.70.0-r3.ebuild 6954 BLAKE2B a3ae1c953a749c6760a72ad2c33c0ed1829ea2edf033236c8274f70f1338c3d3c3b0fccc2a5139f76947e56bf53dd7ad52c6aa87d5abee8a4cf6334bdc2cc848 SHA512 237df77e25c14dae3b71a6c70ff8dcad2004af0188ef64a5c7c2a096c61d66e6484172efc85dfa5e0b331c120f2237ff60bd559463783403cf73402e9f6389ef
 EBUILD rust-bin-1.71.0.ebuild 6961 BLAKE2B 6008f67d9d0a01ee97752898abd04a2dd13ac818f18c933c3cafaaac23479fe8eac33d32ec32ce6b612ed5aa1c7d1c060a8ef9a695b23e5a4e5ee06f12d24713 SHA512 e66c7774d441151843bfa98ff242135c7a309fe5ff0479496380ed22779f3c47eeb9100b659c0a80d7bab3c34db715b02ccbf41d6f67b66283ba68e281337edd
-EBUILD rust-bin-1.71.1.ebuild 6962 BLAKE2B 8205c93de33f2348b6e945308499948fec17733556dadcc4878455f32b11edaec97a47f59d2bff340af2b1028a8840a650f462433375dce3094aaed01fa07771 SHA512 08cf2721d2266d25b649290460ad942e9efb32da168ddb1f2030051ad29a4d30e8123ce3f3b0a1b5a5b5c925b9548f2287a1af25f5dc809821ef8f47eb5977a2
+EBUILD rust-bin-1.71.1.ebuild 6962 BLAKE2B 4d5de7dedb705cf7d7c71f3a58de2ed49358e799e8925766d4aa8529bafe8f7d80f2abd1defb1940d57256e675514cfc718e91021967a2f9aed93410b7595c24 SHA512 115c7cfaf496eab27bba95c9b13ae560f7e5a7dfca9d3a47dc6ebde9c9563598d71d09e3bf33b562a1d93351c0464c38ddf6caa46856a07b82691e0440e0d777
 MISC metadata.xml 602 BLAKE2B 8e74f441d22eeb8b276d77ed0a9c5bde01540a3f34d6053185b2be77dd9188b80c01c536f8bb18c4c60214bd0bf366a504c1f3627110a213332120b533f7ddd2 SHA512 5f120deec600c7453d503b6acb9460d1c765a567954c79749654365721b1b6fa2dd48d60d5f3fc86191e79d5f7f78d7aa1e9634e6127f333f81e546f9b0f74ac
diff --git a/dev-lang/rust-bin/rust-bin-1.71.1.ebuild b/dev-lang/rust-bin/rust-bin-1.71.1.ebuild
index 0b965f82ffb6..05579e617530 100644
--- a/dev-lang/rust-bin/rust-bin-1.71.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.71.1.ebuild
@@ -7,7 +7,7 @@ inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minim
 
 MY_P="rust-${PV}"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
-MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2023-07-13/rust-src-${PV}.tar.xz"
+MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2023-08-03/rust-src-${PV}.tar.xz"
 GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
 
 DESCRIPTION="Systems programming language from Mozilla"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 97db1d488797..2e53a3b5dd91 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 2a00d66e3e3c..74e554d17657 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -4,5 +4,5 @@ DIST iminuit-2.22.0.tar.gz 2324676 BLAKE2B e45952ee6a7f7b6ef3e1ac570abf167423c59
 DIST iminuit-2.23.0.tar.gz 2325309 BLAKE2B 05e94a0604daded06419d41dc6fa61f3aeb621dec1a84fd69d93a2028a990a6cdae72c99c2b184514003695025c70bea22340138f45abb2092775042293d8e92 SHA512 ea0b69722a75e537159fbdbd111eaf48431e0f5c355ef1256f32763873f9dfd3a1a195c45647eb4ca4be2d0532955eb5aa1f6ff43482764d3e566dce4b401305
 EBUILD iminuit-2.21.3.ebuild 980 BLAKE2B 2f95e35c5c19b7068b30aa5d5ee118f875fe7562d0d76243c46e51061ede83c6d254c048c652cb40ba48694e887e2353fd251be5090daf6ee3e0a58218f73d3f SHA512 3873a89561036f06478c92051d543345e6d6681d01a499754b3db8693adb2b277be83bcbe4eb38ef1e8fa61dd76add2bd1abba32f53e1a9a0b1d06bbc46f12b8
 EBUILD iminuit-2.22.0.ebuild 1123 BLAKE2B 5b5708164e64e309daa2683944bd89a9cf9cec12545a1aa56e2fc93804fc3eb3b3d08f089ae631dd75c04c18ef43226826f9119a2cea31c47ffa2045f2905602 SHA512 b9ef92c660c6fd74cfa9fceacc77ae315a5cc1f443a7c27e3869486a953633931f320534cb37f51decb51dc9eb8b11a886e52b2608491a53a37fe0df2159dd60
-EBUILD iminuit-2.23.0.ebuild 1123 BLAKE2B 5b5708164e64e309daa2683944bd89a9cf9cec12545a1aa56e2fc93804fc3eb3b3d08f089ae631dd75c04c18ef43226826f9119a2cea31c47ffa2045f2905602 SHA512 b9ef92c660c6fd74cfa9fceacc77ae315a5cc1f443a7c27e3869486a953633931f320534cb37f51decb51dc9eb8b11a886e52b2608491a53a37fe0df2159dd60
+EBUILD iminuit-2.23.0.ebuild 1185 BLAKE2B efcb77abfc58221378cb0757da83cd2dc53a515f3834afdb14217213b3bb9a8c10a466ed0afc8e20b29e7e49254ceed4cd638456bfc5c6b50bd2a6b5e8b97bab SHA512 6c735ca3dc4261b0046fd1511be88e3228bdbee9e6d6cb637a61b6abc9624fdf421f28ba8a03e7085e8ac63519db5b612306308a7f6be9ebcca167648906c6df
 MISC metadata.xml 494 BLAKE2B c97d7fad530773c29b5e723843f13c8305aa1f011e678ad4e9625181ca633c1dfaa3847cb7b3aa09433b6ce665cbf4eb39fde7f80ead402292bc75bb8442beba SHA512 04413a2cbdc7f6843f89560a519ccdb00bcfcf0c9254e9fff7a8901ed992cd7121ba052191399fd60f76f35e495f84c2297acd0a9a1898d4fbcadb7a60841d99
diff --git a/dev-python/iminuit/iminuit-2.23.0.ebuild b/dev-python/iminuit/iminuit-2.23.0.ebuild
index b8a08320e0b8..5ec527b423af 100644
--- a/dev-python/iminuit/iminuit-2.23.0.ebuild
+++ b/dev-python/iminuit/iminuit-2.23.0.ebuild
@@ -22,7 +22,11 @@ KEYWORDS="~amd64"
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 "
+DEPEND="
+	dev-python/pybind11[${PYTHON_USEDEP}]
+"
 BDEPEND="
+	${BDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
 		dev-python/ipython[${PYTHON_USEDEP}]
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 6eef5714d75d..d75163b6e045 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,5 +1,3 @@
-DIST M2Crypto-0.38.0.tar.gz 1241269 BLAKE2B 95433090e08ff72cd2b0779491dc38b89eca159b26812e763b5b8973e3d27249a96d5a2c983b59f414184f64beb8e455dc26979310378db89dd2081741d4d17d SHA512 b1e24e3101ce0dd9f17be4cabeddc2ec0f1228b270d74ef2fb38bae8807c5025b031d0743185f06370786a3dd5c3f42129720534dcff07ea4de3c727613f8d20
 DIST M2Crypto-0.39.0.tar.gz 1248372 BLAKE2B f89793b847fae3c51a0ea79c3ba861d26b53fa12b2c8d68c3b3476bb2c944b586e875bea0c4693c213e024024096a06de0734631e546c4284d65fc5494784476 SHA512 5d8210c6204fd71f06d238c5b1fe08dd38d6b8e92db7b1e433a9e4e2fe9af46d6d55df7550716a7d05328fb3c9eed427f015b7d5a1fe33a073f0af15a82ab050
-EBUILD m2crypto-0.38.0.ebuild 1732 BLAKE2B 00095b11d459ac799eeed239fe2f60a2529a1229a7aab1741a3fc3bc320d9abcf57d147114a1bd938a5877ba07aedcea2086289faab451dbb683e070a545388b SHA512 ed3c5decd518a2a9455a07d8e2b26fbc92b84c9c1fd3a00e7cd3e450790b1156c6c40991cbd1d8fdfce8d134ec8016d2957a36c5041d40c2f694ba91701f6b5e
 EBUILD m2crypto-0.39.0.ebuild 1678 BLAKE2B e01bc9f506bc78eed153d0db6c57758286bb452587afa343e5eb4a1e6083171d5f2669470420cd9e94fb046a25bed232294b7831c3460091fe9fb7dda363094e SHA512 cc4f71f467c1744d61d23cb18e3f40a32e05b9167ddb57a33a99381cdf6919679e47bfe563acba01a2333e2392f4c4a8ce9ad4daf37380b3fd8d83fcacef5af5
 MISC metadata.xml 381 BLAKE2B 9581f2ef53dd3b8bfff3724e91e36733892f9c4331376861ec25cee892d63f69f4f1846e46c40bc5a5045963d91aadcc2cdf70b574bf519557afe72cffab256b SHA512 95cfd7f65c912a520f371f236a49f41b711101f5997b14fa81f027cbcabe4bf6361d1a6f647d0de6e6b7756a2c662f2336c6dea5779d00372aa5b05f0566663d
diff --git a/dev-python/m2crypto/m2crypto-0.38.0.ebuild b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
deleted file mode 100644
index 5566c34aa87f..000000000000
--- a/dev-python/m2crypto/m2crypto-0.38.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{9..11} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="M2Crypto"
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs pypi
-
-DESCRIPTION="A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test abi_mips_n32 abi_mips_n64 abi_mips_o32"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-lang/swig-2.0.9
-	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests setup.py
-
-swig_define() {
-	local x
-	for x; do
-		if tc-cpp-is-true "defined(${x})"; then
-			SWIG_FEATURES+=" -D${x}"
-		fi
-	done
-}
-
-src_prepare() {
-	# relies on very exact clock behavior which apparently fails
-	# with inconvenient CONFIG_HZ*
-	sed -e 's:test_server_simple_timeouts:_&:' \
-		-i tests/test_ssl.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	# setup.py looks at platform.machine() to determine swig options.
-	# For exotic ABIs, we need to give swig a hint.
-	local -x SWIG_FEATURES=
-
-	# https://bugs.gentoo.org/617946
-	swig_define __ILP32__
-
-	# https://bugs.gentoo.org/674112
-	swig_define __ARM_PCS_VFP
-
-	# Avoid similar errors to bug #688668 for MIPS
-	if use abi_mips_n32; then
-	    swig_define _MIPS_SIM = _ABIN32
-	elif use abi_mips_n64; then
-	    swig_define _MIPS_SIM = _ABI64
-	elif use abi_mips_o32; then
-	    swig_define _MIPS_SIM = _ABIO32
-	fi
-
-	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
-}
diff --git a/dev-python/snapshottest/Manifest b/dev-python/snapshottest/Manifest
index f06864e2fea0..35f56b6c988c 100644
--- a/dev-python/snapshottest/Manifest
+++ b/dev-python/snapshottest/Manifest
@@ -1,4 +1,5 @@
+AUX snapshottest-0.6.0-py3.12-imp.patch 1203 BLAKE2B 709dac804fc8bcf6b5fe30ec4ebe8cbf02b5727311f8ffb14ba7e9e1e4b33d542b77b372b91b23bb5c9e20c4a8e87a1674d196d6bb22cb007eef505160df51ba SHA512 41f4524dabc6dc664390818e6e468164aedabb08583948c70d136fd0306b21e909621df752360af7ce42b954b55f3bcfcfdefe178eeb9a5453eabbd1aa106941
 AUX snapshottest-0.6.0-remove-fastdiff.patch 1979 BLAKE2B 1645f9fe0d7a5ba9523f81c50f31c54d854d56d3137a8b6611594bb825ccc0c183c763dbf641b1517e45b4ae39979efc86d5fffaa6adc111ee937a8c2f4143b5 SHA512 da43e9d1eb27f66512e5c3f02a0693756ea1e6889c6a9c3871c2f53a80a6ab4cdd7a705cfbe523231b8496a5eca3587c71e57babeec89c653307923c045413df
 DIST snapshottest-0.6.0.gh.tar.gz 19887 BLAKE2B d85b3025731dbe80c04388f8adf755f48f428df5f15496ad7e47d436ccfba0f8955833f576b12a38a3565a56deb49a425b67f9040bce69a7711be05558f0ef4e SHA512 7477668c0a61b4c282deb3eb9105cf06e8f644c931e2860a9a60dc2f8ed6de1eaf1ab100a816de200a39db8b488bda6ad33472265eecca707360dcbc9d8fafee
-EBUILD snapshottest-0.6.0.ebuild 919 BLAKE2B 226dde939136888d45340adc6c6cc7b11fe6b938129bfd7cacb8a305a02ce0e104329ceab71bfa026f039e8db8f70ddab4bb8c9b634125f01f4864012cca8c28 SHA512 31b14487d7147b6754559ad68498969f8db858a29c88a5e3b2b166148cad50135eb91d79c5a8d2e277421b6bc225a45557f63cb7dc155f5a29fd4dc00f9925df
+EBUILD snapshottest-0.6.0.ebuild 957 BLAKE2B 3dd5a4137bab0269a7b6781195d2b2862f739e077d53018c97f95c4f1f51c369d2d5dbd707a14a53e069ae46c2b0c0eee45e4a6de2b9518f634fc8593a5fbbf9 SHA512 627be837d04d88cc1481ea0b03f3773724c4036764f624376c9f1a4137d02320a26555e99f7422b417cca56dcba18695f41b0ac55b7f5b39c603d0d8bf0f3d0f
 MISC metadata.xml 380 BLAKE2B af864f451c424be42fda967811c0754d246ff7399a14d7344c967e695dd33ed060f9db19823f7f7c3a78f90f45b2817b843dff1832cae24a5c6c3bb6b183c63e SHA512 a755150b8fd1cfae3e016e97cceb9d9e32e58750a7fd01665087fa82ebba1124b38566bf6869898338319532956869a472c50dce9f4ad53f6329e4691197d7b5
diff --git a/dev-python/snapshottest/files/snapshottest-0.6.0-py3.12-imp.patch b/dev-python/snapshottest/files/snapshottest-0.6.0-py3.12-imp.patch
new file mode 100644
index 000000000000..64c1bf69bfe8
--- /dev/null
+++ b/dev-python/snapshottest/files/snapshottest-0.6.0-py3.12-imp.patch
@@ -0,0 +1,41 @@
+https://github.com/syrusakbary/snapshottest/pull/168
+From: MarcellPerger1 <102254594+MarcellPerger1@users.noreply.github.com>
+Date: Tue, 18 Jul 2023 19:28:22 +0100
+Subject: [PATCH] Use importlib instead of imp
+
+--- a/snapshottest/module.py
++++ b/snapshottest/module.py
+@@ -1,7 +1,8 @@
+ import codecs
+ import errno
+ import os
+-import imp
++import sys
++import importlib.util
+ from collections import defaultdict
+ import logging
+
+@@ -17,6 +18,14 @@ def _escape_quotes(text):
+     return text.replace("'", "\\'")
+
+
++def _load_source(module_name, filepath):
++    spec = importlib.util.spec_from_file_location(module_name, filepath)
++    module = importlib.util.module_from_spec(spec)
++    sys.modules[module_name] = module
++    spec.loader.exec_module(module)
++    return module
++
++
+ class SnapshotModule(object):
+     _snapshot_modules = {}
+
+@@ -33,7 +42,7 @@ def __init__(self, module, filepath):
+
+     def load_snapshots(self):
+         try:
+-            source = imp.load_source(self.module, self.filepath)
++            source = _load_source(self.module, self.filepath)
+         # except FileNotFoundError:  # Python 3
+         except (IOError, OSError) as err:
+             if err.errno == errno.ENOENT:
diff --git a/dev-python/snapshottest/snapshottest-0.6.0.ebuild b/dev-python/snapshottest/snapshottest-0.6.0.ebuild
index 939e60178153..d01d038c7f3c 100644
--- a/dev-python/snapshottest/snapshottest-0.6.0.ebuild
+++ b/dev-python/snapshottest/snapshottest-0.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -30,7 +30,8 @@ RDEPEND="
 distutils_enable_tests pytest
 
 PATCHES=(
-	"${FILESDIR}/snapshottest-0.6.0-remove-fastdiff.patch"
+	"${FILESDIR}/${PN}-0.6.0-remove-fastdiff.patch"
+	"${FILESDIR}/${PN}-0.6.0-py3.12-imp.patch"
 )
 
 python_prepare_all() {
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 234e795ac330..7e515dba21d8 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,5 +1,3 @@
-DIST ujson-5.7.0.tar.gz 7152625 BLAKE2B 363fd77be3e2f8fb42a70db744ab4da12c0c8383103983b3555cee237497837abfcef102b19a51c0fa118fedd7847c568607c058f1d2cea76858a6bd89a226da SHA512 e18a1608a7fe79030e3ff307c9e95a0e238cd5049ee791eddbc07efa55853475d053268b80a8765023639ae8ff39f82b4ae2c04e82fc7dc5f3192a5134ec0757
 DIST ujson-5.8.0.tar.gz 7154530 BLAKE2B 8eef1b2e03fa4a99dccc9d5fba8c1436d8e11b419e7f4c8d382bf5a2250477c99a1f0ff7f9e548ca5a50217a5964dafc953ab3cdb66b784ef1dea129ec1c2b6a SHA512 258e5527bda8b9fb3bea03f97d5db752ae06183337610975fc28f928817b430ae7a1867932ee7b0a0ccd6b825e2c5a104d7ce78c1e3405ed5679a2a70a5804c3
-EBUILD ujson-5.7.0.ebuild 870 BLAKE2B be432902027c94b24be183abb5c1d3f634a30dc2a5b472aeaa85f076ed776cf86b879a41abdce13232d8f2cb1939a72657a98b0868278596ac894bfc49e08358 SHA512 67f96e466cfecbb96e780106c28d047ba2ee4c945eaff611651ec0622688bf4756c262420191590913b45a985a15b3f74c5d8b49268377056688c7d9258526a8
 EBUILD ujson-5.8.0.ebuild 870 BLAKE2B be432902027c94b24be183abb5c1d3f634a30dc2a5b472aeaa85f076ed776cf86b879a41abdce13232d8f2cb1939a72657a98b0868278596ac894bfc49e08358 SHA512 67f96e466cfecbb96e780106c28d047ba2ee4c945eaff611651ec0622688bf4756c262420191590913b45a985a15b3f74c5d8b49268377056688c7d9258526a8
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.7.0.ebuild b/dev-python/ujson/ujson-5.7.0.ebuild
deleted file mode 100644
index 5b398600743f..000000000000
--- a/dev-python/ujson/ujson-5.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="
-	https://github.com/ultrajson/ultrajson/
-	https://pypi.org/project/ujson/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-libs/double-conversion:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export UJSON_BUILD_DC_INCLUDES="${EPREFIX}/usr/include/double-conversion"
-	export UJSON_BUILD_DC_LIBS="-ldouble-conversion"
-	export UJSON_BUILD_NO_STRIP=1
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1e27511ca051..3f5d337f34ce 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 7439e0ea1c93..30c0ad299c30 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,5 +1,7 @@
 DIST hoe-3.26.0.gem 194560 BLAKE2B a47ebe54374c04e739112c99c3eaa968c6048df639e5ee8a4cad60659a50a4a4ea85e9a11a77ad824ae511d28634241255ec323938a4b9da6a8dd38aec022ac5 SHA512 0b069b0b2b181b81770568186f9d81b0f8fe48644a4b29bb2dd8084dc60886c7a06fa0e7be81854b5b653afc38c908622f08066656d9b625ab595615ef2918c3
 DIST hoe-4.0.4.gem 190976 BLAKE2B 82e017351700a376f7e497a2e65b5e3e8331f25d5b083934f710272184016264e9b21ae4e2d25154affe901d6f426108ad29cb281cd68b30eba0910323a22544 SHA512 a7f03c171f77127d442070947193536421395a609536c45efb639c75f24605dfccb9bcf8ec6ec202956f888a3110cffa99c56bb924f7e1b982864d38673b6a4c
+DIST hoe-4.0.5.gem 190976 BLAKE2B 57622502f76a65a1d1e31bc717d125495c1f1d4e687ddf5a74c5335a58aa3a64bc0b0e2a66fe17e5b14ef92cdc72178299b2cfbb03bcb2a57d71c740d9628a6a SHA512 5f9e423dfe49d2b41ae4380a8b226a7c6efa939ba48022a0d872e9ccb4fb8aeed67ea2366034f61edc92a5be3f23014a0428ea64a48c644a2308621a0d417a23
 EBUILD hoe-3.26.0.ebuild 1482 BLAKE2B ad8807193303c9f3fcf00610b00428538d06bec03b6c271b94bb5891e69421b2e5b9fad1c94d5037a229e5ea37a4f622daab041e7c965922dec51853148b30ad SHA512 4f4df9f1a04920ee9fc06fe266e0a3a7a0ac0f21b7a5a0b57f45cb5337b22a04cc4e5f62d184e48aa6e72c6d53c70d76e1ed1311afbf1b63e7c8b02e0ec980f1
 EBUILD hoe-4.0.4.ebuild 1490 BLAKE2B 932e87448dfecbb9931839cbd1afc99340abf7b1b9fa8582ebe2965337d0ea1c397b4a60c45777052c42fae0ff622cc2197b2374a85e2ef70fef6eeb614310c0 SHA512 9958ddb77649a63c9cd15158eb9c3b716376bce7e46cfd4082e0aa038011eb3cdca6a9a7b7f409f909e8793255b1550710d4ccc3a8128cd798b688cb068c48bd
+EBUILD hoe-4.0.5.ebuild 1490 BLAKE2B 932e87448dfecbb9931839cbd1afc99340abf7b1b9fa8582ebe2965337d0ea1c397b4a60c45777052c42fae0ff622cc2197b2374a85e2ef70fef6eeb614310c0 SHA512 9958ddb77649a63c9cd15158eb9c3b716376bce7e46cfd4082e0aa038011eb3cdca6a9a7b7f409f909e8793255b1550710d4ccc3a8128cd798b688cb068c48bd
 MISC metadata.xml 330 BLAKE2B 400950b85e191fcbdf8fc9955d0cc65d48b125ba09bd3493a965788f6c3f3138db34b5925a8c064f6d453606b8567389c1d10b7449206119f3198ec4d53c62f5 SHA512 c13fc7b215ea215064a802a93f1ed23974f487aa94bf83d033b4bf65534d3cf9abafec3816bf12f544b2f2cd58e87dc5e38130aa25875287a50f88ae62d3fd0d
diff --git a/dev-ruby/hoe/hoe-4.0.5.ebuild b/dev-ruby/hoe/hoe-4.0.5.ebuild
new file mode 100644
index 000000000000..96f7c8c86067
--- /dev/null
+++ b/dev-ruby/hoe/hoe-4.0.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="template"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hoe extends rake to provide full project automation"
+HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
+
+ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-15.0"
+
+all_ruby_prepare() {
+	# Skip isolation
+	sed -i -e '/isolate/ s:^:#:' Rakefile || die
+
+	# Skip test depending on specifics of gem command name
+	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
+
+	# Avoid test with random sort order
+	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
+
+	# Avoid test that depends on specifics of merged packages
+	sed -i -e '/test_make_rdoc_cmd/askip "dependent on merged packages"' test/test_hoe_publish.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.rdoc \
+			 lib History.rdoc Manifest.txt README.doc || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	export -n A
+	each_fakegem_test
+}
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index fa75fda5d677..da04dcc557eb 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,5 +1,7 @@
 DIST rake-compiler-1.2.1.tar.gz 37723 BLAKE2B 685278cec10f9bd028ed7973446f8f164fd81567d5f390507321fd7fcd260b746e53ebde60fcee025ab20bcf248f274f1d8a0fac16d2f7ef13c0b8996c667037 SHA512 fd99c3a46a9a47f2fc70e59d2c33e6a68b849708cab35e6af46bafa0e9f3c843c20ec1287a463cda7d6237fc79e4cd4965cc78b309ac8b9519c0e7f44f2be8ce
 DIST rake-compiler-1.2.3.tar.gz 38603 BLAKE2B d6cb1714ec3983051d794307e0516c01379a1d2a59430fad9780cc4b037a159c924a4edc1abf6cfbfa1b245203e4cfd4ea7bf887dbf2ea02ca93138629012062 SHA512 3dd3374630dbf0ce9d31caf62d399481622ed55aa15184073836043b907d40994b3284c40945f89c604296cc0cd2b588245e2310cef80846da48883c0e6a2f34
+DIST rake-compiler-1.2.5.tar.gz 38723 BLAKE2B 9f619026574467e6abd31a449f1825c49e0df691b1f139c7a8829a9361df3401bab65312303ab7a566eaf73f4a3a6b78674c73abe6f1cc72d1f1bbb6f619e51a SHA512 843b9286f874b487f23a3558b0a7565eea5e2a22144a8ece944b4b69d40945eee16cca8341e2ea3678418df7f36637574c6832899215676ca3294ae61b24ff5a
 EBUILD rake-compiler-1.2.1.ebuild 1607 BLAKE2B b38cc6d15b208e6a7fdb7b00bf37652a5944518abde8cdae723d44aaaab9d3987100265d6b76474389e32bb6506b527506b23ce9ca8e1493f94ea889039a2593 SHA512 c22225e4d1b5a66ee4ffd74160e8c99e9d1648a8d38473b3db7338b3e50e40d42b2d4a078bf047abe20bc7e9006e3c2bdd7b704dd1a47840d458c8a00bac3c09
 EBUILD rake-compiler-1.2.3.ebuild 1601 BLAKE2B 6b0d41d659285170f7b7be74735a3c1d5898a1fd5cc9c47c62479ac80ed87562e315943f58771751fc06014f4a89ec543950ffd8b522328121818d951ca8b5d6 SHA512 f8331e00190206a359d8765278cb472db0b5acd698af14eebc5fed6a75ec1e7e66d443523fb863eb9ee29ae0facab0c92d637d54c16380b482bede51871d862c
-MISC metadata.xml 351 BLAKE2B 244d52aa29c9cdaa264cc545994ba23b012d8fa075fe3c173e28958c3af17b11e32216ce686d5117d8cdfc31c2761e3cc5e79801019bc5f2b36725405d085d16 SHA512 74631c371f303715421c6a61ed98889d8a898d761c8216cfe9bbed422eea27e29c4ddd344da4e49f11c4bb31c8ac5fd5df3c5d36a7ab187e80e005276c027bd5
+EBUILD rake-compiler-1.2.5.ebuild 1613 BLAKE2B 618ae1a9e6a435e9c857fdb9bf4ce765b94d0d5336c71bee9430182a0d10a2c5fbc3b5792367e60b5812cd973f85837d334bb811d0b09d6f72afa4c38c6b37e3 SHA512 7de433c44a730b5db1c0d6bc5cbf823476e2f0d6b078c81cab3b3cacf0cd15413c860fcd5f5b0487ac8cd660df98f0ae7870f5a76054703bde855f1134bebdb3
+MISC metadata.xml 354 BLAKE2B c711f59f42d530160f707aa7d99563e3274e791698b85925a58e92ca36ca0c49026ae7e13ef42946f07709020f2113c5f6bd2a2f5cadfe86b142c7d4f31cf077 SHA512 7a1a4e0edc58403cdcaa2cdd0e9e5ae7d7642d5c961f9d673bb62ef2f94c95677d79686cf246f24e103985504a2e6d10fb0bddc76d2763553d5fb6808d3f989d
diff --git a/dev-ruby/rake-compiler/metadata.xml b/dev-ruby/rake-compiler/metadata.xml
index 1f0fcedcc36e..499364daa9ff 100644
--- a/dev-ruby/rake-compiler/metadata.xml
+++ b/dev-ruby/rake-compiler/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">luislavena/rake-compiler</remote-id>
+    <remote-id type="github">rake-compiler/rake-compiler</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.2.5.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.2.5.ebuild
new file mode 100644
index 000000000000..7d80307e353a
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-1.2.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/rake-compiler/rake-compiler"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/rake-compiler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rake"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+USE_RUBY="ruby27 ruby30 ruby31" ruby_add_bdepend "test? ( dev-util/cucumber )"
+
+all_ruby_prepare() {
+	# Avoid failing features for native gems, this also fails with rubygems
+	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
+
+	# Fix compatibility with newer cucumber versions. The not syntax has
+	# been supported since cucumber 3.x.
+	sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
+
+	# Fix compatibility with newer rspec versions.
+	sed -i -e 's/be_true/be true/ ; s/be_false/be false/' features/step_definitions/*.rb || die
+}
+
+each_ruby_test() {
+	# Skip cucumber for new ruby versions (not ready yet due to rspec 2 usage)
+	case ${RUBY} in
+		*ruby27|*ruby30|*ruby31)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			ruby-ng_cucumber
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			;;
+	esac
+}
diff --git a/dev-ruby/stringio/Manifest b/dev-ruby/stringio/Manifest
index 28287611f2e5..7f4e27c7f9d0 100644
--- a/dev-ruby/stringio/Manifest
+++ b/dev-ruby/stringio/Manifest
@@ -2,6 +2,6 @@ DIST stringio-3.0.5.tar.gz 43822 BLAKE2B 5b79def3cb154f4bb1f4a50b8eeb95e0841279d
 DIST stringio-3.0.6.tar.gz 44971 BLAKE2B a143fc01e7b9434db3b444f6049b002549a4149b9573ceeab4bf8955555290b1f41ef6ff012c7f58d1bc0559ca864e83aeb34f0cb75c3133ea91ac51f55008ff SHA512 118e7672fb347b111f90f4380e49ad01aac617fdf6afc9317f2242e942e68fa55ef5d71782c15156ed7b4c91d1eff75ac68d870885650ac4505d6a17b368afab
 DIST stringio-3.0.7.tar.gz 44797 BLAKE2B 2772028015b6eb5e5a45e9c86551e62e91e24a627b7280530a10b1d343f08eb19b53d4fbeaf791ed23a239e0609775e8eb4c0550dadc282f690ecc9abef7930b SHA512 fcea0a32bb70c6f1d8a3b237e8a8dbb2677b00c077f0d6ddfa72e1e382c832277ee592dd2e17abdc12003b0494665853eab18fa90bf6f34f51efa0f62f7ea1b9
 EBUILD stringio-3.0.5.ebuild 885 BLAKE2B da206baee7882de22f5074d43f52c23b6ae3fb91820ce3153687825642f079b3793bb8a5afe4f252870c29a33a60912685db575f5833beea8d975226736b59ca SHA512 5d7e1540d5e72d15f12f511fbe75d47ee3b2685cc89c0e7ea804a40181b24002878957e1aaf6f5d07764e076cdc03132a2b991789d88eab49848d30fa57eba2c
-EBUILD stringio-3.0.6.ebuild 892 BLAKE2B de83992688f932fb1cbca22d1892b80a3ece9179b6c7b7bde6d9a71c77020b7a3cf84bb093aeda6b1e414e0a3f0f0d109023070da2b80d1049482bbe294f0d54 SHA512 fcc0380f817b1658863c9d91a89ecad4d8f3315643172e0b54f27ec55ee63e8eb40460b1db829aa8aa26a6a342f860c23345bc63eb04fd7f694a77fb0bd5624c
+EBUILD stringio-3.0.6.ebuild 891 BLAKE2B 37e28a01838e9130a2e5ecb2b3d0b20cef0f1c93b18f36766c28fef6143ab736f3dd91e92bc618a5a4dca5f471dfda25ba1ebd82ea2cb91e000ad1484d4687b6 SHA512 fa680fdca08c4f7bced353bf3be66359b8753923aeb6272a2bff7769a0b854d542adedf5721d7847ec9e5a539fcda48d30e0d721a63ee2c191b2fdfb0cbfa906
 EBUILD stringio-3.0.7.ebuild 899 BLAKE2B f0322e509577080edb008ac2c4e44ec48fb189fd759c84e8eb22a3770c6d19e6a009061b9f84ca841c61e4968aaa97639b006ff5a179fef23c76b23b9981e630 SHA512 c1d081ecd8a2b990c6115caeb1a73e271a518c40917640b139f64a41ca8c98e9b3f101cd1e06f297ad90d45bde53bea11dd34f6f9c0a034bdd576cb7a15f84e3
 MISC metadata.xml 340 BLAKE2B bd5f8222a43eb391d2d14a1b878fadefd9f8a322e87b5058d482df79d95d70f7ef19c54e7ae12dc29e7ffc84c72e630f0ca46ac095059263cdcf6047cb4fa4d9 SHA512 f1f32d2c4c13e19500a7ff23b684b180d3dba8a79e49b8cb57b80e265d09e06cb8b7a9e6b743158a140967b7ccbb991fdf51cb3a6e95be4e24378a5f85efcbb2
diff --git a/dev-ruby/stringio/stringio-3.0.6.ebuild b/dev-ruby/stringio/stringio-3.0.6.ebuild
index 34dcd0dceae0..db9c0bd6dc1d 100644
--- a/dev-ruby/stringio/stringio-3.0.6.ebuild
+++ b/dev-ruby/stringio/stringio-3.0.6.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/stringio"
 SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9041221fcead..74c11c272375 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 155987247af5..6a37b707526c 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -3,4 +3,4 @@ DIST pkgconf-2.0.0.tar.xz 310204 BLAKE2B c3c35724fddce349702e86046be5ddf359d8e12
 EBUILD pkgconf-1.8.1.ebuild 1557 BLAKE2B 713707b02b74f5abbee292446c94ee2dff2040b01bae387f541a610aa9332f8bd4b094932f1f4e806c8db3da0ad2e7a8f8f1328fcacf7801de6f6c5d5cb2d331 SHA512 fe9f9aedf8f38686d5d83a9f17355955d1da48e0e3eed4176a37b36f8417b5b0d2c8d84ee2d3e98f9484b3a5a2f82e2d6a87f1aeb4dece86a7ad938fa3e944cc
 EBUILD pkgconf-2.0.0.ebuild 1506 BLAKE2B 53529ae196f486988c3f5a9eeb1c81106e78f40b58121857c9b6cebcdb2c3540f770d3a55be00e262cfd7ec735a9009f11f4478f66e84e04b94e5572e9455d31 SHA512 6844fc0c703848e2f84edccee1fdf0f4fe13c4114928cccb7fcb479e1c119704525ad5c3085bdd48b7dac416f1e63df7dc6f2dcc4fb558a3e9e9e93db686a4ce
 EBUILD pkgconf-9999.ebuild 1506 BLAKE2B 53529ae196f486988c3f5a9eeb1c81106e78f40b58121857c9b6cebcdb2c3540f770d3a55be00e262cfd7ec735a9009f11f4478f66e84e04b94e5572e9455d31 SHA512 6844fc0c703848e2f84edccee1fdf0f4fe13c4114928cccb7fcb479e1c119704525ad5c3085bdd48b7dac416f1e63df7dc6f2dcc4fb558a3e9e9e93db686a4ce
-MISC metadata.xml 482 BLAKE2B 3bf8c3349711340133d9e7d81ca94172ce16e607b4fe9135cb7145d0214c0e9753bc884d248d89e2f5d2ab83368b07a95713b2b2a26ad5aaaffe10086a70a9b7 SHA512 6c372c1bc8e8794015838ad7646a503dd19f06890c8a425ce1ed12f3e5211ff01b1c8cc7ee1685b7ffe10c3b1fb89b81a80152f114be72861c27e5bcc6f17653
+MISC metadata.xml 375 BLAKE2B 068421081109c9b0ae560b84f92dd8d68b0c8e1675fc7675a324e4629ce3047b5d9ac43d255734fa12b4584c0e62d5c60aa1ddc5989f1e156d60a708cf99267d SHA512 44affcb6779b704b6062e283d19a4b5b9b8eee41f4a2aaea864ab93c74d86166abbbb71b042988cdb1cd58636443b3878001402fa3d9c876ab01dc612015a6e7
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 53180d5fbbb0..f29f620472e8 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 	</maintainer>
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 3a2ecaaa5ec4..9f1c5339be42 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index cb39cd46d326..b8f57a72b649 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-calculator-44.0.tar.xz 1075480 BLAKE2B a4e7af52e06a59a1a07baf3e34dbfc90dc8852cab3f44fe2018e3279cf7dab7c9cffe23bff2d7cc8b9b3708b652b9b8ae2fa65ff403c559fc1bfd060e4645575 SHA512 7c1428873c00a2052b966a0687f2a944dce67e889c8e113a794a7d5f0bafe9ff52562e2b1985bcf48d05a5a0a2f4ff97e490a43810b5243367fce9c6ada79fa6
 DIST gnome-calculator-45.alpha.tar.xz 1090752 BLAKE2B 7db9b24e74b193333b1c12ad404a11565685d4f7eddd2659cd0705b328ac8f3de477baab094be4d1b592899beb9d1f5069e18c702df22d630b464db47f4b47fe SHA512 51b6e09921b80121493a5597742965555243452e780a794d2a8b50f391879fcf13cea458ce34e8a2f6e90c0edfd8e8a553b73b5e17a9b4ab735b4d12ce059e7d
+DIST gnome-calculator-45.beta.tar.xz 1094460 BLAKE2B dda75a6e1d0e1e6d4053f0e151477e1705b4a9a8ebd08a2e3df73c9c475317f47ea08da14f1a1baef5ece1925b2e04ce98d145f834dba6e3a51224a9a2bbfa32 SHA512 217b2acbd30fc80e625bb0e656ddec24c182e02f195db31c07cd7603962a0c7b63fdf1b86eeb4b51e8b7bed15a16ac52ccef941b74b464a4e9440b659880be40
 EBUILD gnome-calculator-44.0.ebuild 1601 BLAKE2B 765fc33d23367f2547ba1ec9bc4882bbfd21c92adebb301735c0ac3f9a5864153a5d60c2b597a57150db15849457edd503622dacf88b46253e5464eaa35fbe03 SHA512 4cf8a24e3bd48f320a22c652f75b2eaa1325f5fbdea5d4374d12a771ffc0fc668ef6b23c27a09a579408dd25d67de387c15bde8b9ca712da5d9c4c07d11fc747
 EBUILD gnome-calculator-45_alpha.ebuild 1641 BLAKE2B 20ae75a864bbe32a3ae962feaaca13c2133f9bb13412a81247fa1ca025f550767bf626d9acafef3f99cf3a4918cbca57c6c2c49763322d4fd8ba95f2a94ae5e9 SHA512 b99b689e1dea146ad7e942bf489b77fedbf35598e846f94b6a0db6371a01b1bf50e9b19a61a93e2c2ee037e0cef5a52b19eebebf777f0ec13c3315e93b38baf2
+EBUILD gnome-calculator-45_beta.ebuild 1641 BLAKE2B 20ae75a864bbe32a3ae962feaaca13c2133f9bb13412a81247fa1ca025f550767bf626d9acafef3f99cf3a4918cbca57c6c2c49763322d4fd8ba95f2a94ae5e9 SHA512 b99b689e1dea146ad7e942bf489b77fedbf35598e846f94b6a0db6371a01b1bf50e9b19a61a93e2c2ee037e0cef5a52b19eebebf777f0ec13c3315e93b38baf2
 MISC metadata.xml 553 BLAKE2B adbc4947ab50307c4bf5fca7e9b6cf2db5394b9e3a335d2de56a0678af3f1674d0641835179d2ffad62050292e02874add35125918f922b66fddb64c7e949941 SHA512 960975bcb5b0bdecc83cd80eb8d0d70845a1080a9c2490aa674cf775a44925b9196953a20c88a4197feaf8e8107f98acb6843164292cafb92bde5d1de18242ee
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-45_beta.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-45_beta.ebuild
new file mode 100644
index 000000000000..d2baf4a89433
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-45_beta.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+introspection test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
+# altogether, thus we need them installed by gtksourceview[vala]
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	net-libs/libsoup:3.0
+	>=dev-libs/libgee-0.20.0:0.8
+	dev-libs/mpc:=
+	dev-libs/mpfr:0=
+	>=gui-libs/gtk-4.4.1:4
+	>=gui-libs/libadwaita-1.2.0:1
+	>=gui-libs/gtksourceview-5.3.0:5
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	net-libs/libsoup:3.0[vala]
+	gui-libs/gtksourceview:5[vala]
+	gui-libs/libhandy:1[vala]
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddisable-ui=false
+		#-Dvala-version # doesn't do anything in 3.34
+		$(meson_use !introspection disable-introspection)
+		$(meson_use test ui-tests)
+		-Dgcalc=true
+		-Dgci=true
+		-Dapp=true
+		-Ddoc=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	XDG_SESSION_TYPE=x11 virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 21eba629822e..3425184bba8b 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-system-monitor-44.0.tar.xz 1012688 BLAKE2B b9e537ac865c31e0aa05958f067181bf3ef73e4997e818ec4d5d61da65954e910c908901ed55cceac447798d092944a01999fc37f38c7ce51590efedf7f12a85 SHA512 052dcdc927ad53ea601f1f3da6a921fe21b04f69aaa8b75a5096fdcdac5706391180c476b5c87a98012fa7b5dc6c5c43b8c88c30a38b12868c4188020e8ec3b8
 DIST gnome-system-monitor-45.alpha.tar.xz 1013176 BLAKE2B f900ce7d82777b8ce8b0d5ee6b35590f4ac277f0d7b2e125622ea89aaf639138782ecaabedb310cf705d5331a4be5e01d22a08bb9bf20f5cae6d7d687961ce41 SHA512 7bf4f37ac207d2c04f66eb54d6ef36c971d8667bf1cded9e34aa46f203acd7516e4406b4d100a3aa99ddb39d52a17be88e8d4463355b72e2a36a9459f87c7b75
+DIST gnome-system-monitor-45.beta.tar.xz 1015144 BLAKE2B 77f1a731685802055732265fbb3570b5d34d03dcfa290e9f631c8e72b5c5a8a978a040d3de12244404cf2936887c75dbd1533c6e260548865400bb838698bfb2 SHA512 8c50335af30eae6364c3dcf03a8f0f5468f2c049d1c5466fe6c106819d933587a78cf77a47fe55fb66a30b519dbbb4187e3bc34f8665ace3824080d1b9f2d80d
 EBUILD gnome-system-monitor-44.0.ebuild 1225 BLAKE2B 5aca66e0fae8c986b59b494b6efa246715f12bca5d209b45db26958fcc5dd41e54d995860dd0c9e37ae5a2b50a8a5812925f809c27c700660df6704aaa981b6e SHA512 9040ab31fa7c9e841aed5e3660b2eb57b765e3c4b75e553aedbd00a78329d33b46905ce20f613290e9c7247d424783a7f093b2cf1e8e9ea580aa164a0f092bc8
 EBUILD gnome-system-monitor-45_alpha.ebuild 1221 BLAKE2B 6c2c8e551f0e8ca441ba213f31bfa881660a002d7406ca73737c30e1334b8cd5fc7dfb72de9f758d295584783ac86ba26b0dc698c9c6e4edf1193c6d729888f4 SHA512 66a7b3df8f647af5d98bbcbda0ef24de555b0d16620eaf1baf466ba1405d38637359123a347dfc5a520526ca91fc246e44657fe3e4254c8ee7c39fc76cb9990f
+EBUILD gnome-system-monitor-45_beta.ebuild 1221 BLAKE2B 6c2c8e551f0e8ca441ba213f31bfa881660a002d7406ca73737c30e1334b8cd5fc7dfb72de9f758d295584783ac86ba26b0dc698c9c6e4edf1193c6d729888f4 SHA512 66a7b3df8f647af5d98bbcbda0ef24de555b0d16620eaf1baf466ba1405d38637359123a347dfc5a520526ca91fc246e44657fe3e4254c8ee7c39fc76cb9990f
 MISC metadata.xml 495 BLAKE2B 56ac029a06b0bc1f2b240c372426b6002c411005109f12c166227f3689bf0470326f810bdcfa62d5e34077710156e085d7f933bdcb1b26acbb8670cb46362d94 SHA512 0936f40a28b66e92a2468c926b05000aefb7e55cd724ec24f69e9c5ff517aa4604bbb03899fe104600218617e881e45f72bd0ab9c668313b6545cc931fd6b981
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-45_beta.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-45_beta.ebuild
new file mode 100644
index 000000000000..d9c9360329f7
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-45_beta.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="systemd X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.22:3[X(+)?]
+	>=dev-cpp/gtkmm-3.3.18:3.0
+	>=dev-cpp/atkmm-2.28:0
+	>=gnome-base/libgtop-2.37.2:2=
+	>=gui-libs/libhandy-1.5.0:1
+	>=gnome-base/librsvg-2.35:2
+	>=dev-libs/libxml2-2.0:2
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+	systemd? ( >=sys-apps/systemd-44:0= )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=sys-auth/polkit-0.114
+" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use X wnck)
+		$(meson_use systemd)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e4cf38cc1119..f963fd661018 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2a8b0e59e8bf..b2091ada5606 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Aug 2023 13:40:13 +0000
+Fri, 04 Aug 2023 19:40:11 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 66af193ba7f8..081d7280293a 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-08-04T13:40:16Z
+TIMESTAMP 2023-08-04T19:40:14Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTM/8BfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTNVB5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDpuRAAkNPLPeQGn8N2YdpyWJ9zmh7/Le8n6IcAADW2Hb9LxAdoGjedNeMnI8Qt
-wEoVhUiTRzHKSRGn1fxE71noQoZBxdSNPQKzy26b+qjJ/bKC9EcyvHd8+S8KqEnP
-1jYGRQh9CT4MGg6OaaxXCSpNb8s9Z66erpiamshdx2sOvJmDe2sb5AGLbMQ/UcO0
-u/caWlaCXi2nF/7aypO5QjendEecXTMLmQyLgGFJJhrWQtapRR8UG+oVyAdaaIDQ
-I6mztdF8SRXCFhoKaaQLMM6Fd995kGnNGF036amjMkG2Ryrd6f0A9MuaM/5K5uIW
-7oCN2HfGR1ELgOs+dnGxtAX3/Y/acoot0RhJHlls4RXU0lWskhsVh5zCl8qmJiG8
-XAPD0YBfVV2YD0Ys2eoyPmdlbA8b6p21CtFjMWl2hvXpYPUY5LlwR4MLP1k1ClBZ
-FVBdbtcwyiJQTrIwLaqlaNYqcStj+Tyei+C3XOivx82hIjjNf0Z/Oxn89voMD0tK
-ruYiYEpDmzchDfua9zRCv7dB2zpGDhx/d3/OzhKKj5b4VhZa3JpVVG653+ikMf/O
-kR6tjL5Wpj8yEY5DNZSp0u+JeR/0GkzOaXw6U2ptBhlqUlzSEFZKK37Ahe7adCq1
-I1FTXe1zZdHl/xjTMuzDsv1QHHiCqJ8WxuHQdkl2zPZbJ+QSAHo=
-=r4zB
+klCY5A//eBTzNe3n9VBv9mmhtWTAoeN/zazHOa/bNs6jvuFba0IPd5/VAcPdaCKx
+9uaW2CSZSXT/UXMRaO91o/glYi1ABt+//r0w0DfFOYLYGQERWgatU/XQ9k9cqe8t
+zrQbkPt+B1zQIupfeZGVZVQOiwc0tVcSGpSeKaJU0qFSMUj2MGyaY8HaaqxI8hkV
+I9D7/rN3p4d0tYYz588FqwJBtNjqXN1swWMK1MuNKg4ejKZm5BoKzGF2FUl06iHI
+FUvJb09ibxLDrM23T6NF5i77bDozirL/E8dAdI/YaeqM7XFKDUaeA6cE6yP/A0os
+l9nj8ZYnsdiMeg4OH2qPI6d93uCL2ixL5kuyUpoQM+m1uRS9qenUGN2G6+ur5g2E
+lcYx6QE1wmGdKEZv09sciOHnsPUpgsNf/heMi+haKUpCryR45Rp2zS7Y8JHNn//e
+7bq/2zjExFmnvqHi5SSqzfwprAlgycVx8nV36zIp4Kimd+Tb993DC4Pdn5OWF7B2
+Eu+RnUlqzHtwtwlb8N6YanxETeYQR7kQo5PSJf0Q0l3C5H0RlYSBTYJTZqSxTvIW
+kyGlPhKF94bcd0zMMol7QkrMxvaEO37dQZfVKwgvAu2YdAaMuM5mqz88ACp/KKJG
+Bo/SquJl33YaO9X63/bfsq1N/KcjLCZsmo6aHjjlkgrbui8PeuA=
+=MXG9
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2a8b0e59e8bf..b2091ada5606 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Aug 2023 13:40:13 +0000
+Fri, 04 Aug 2023 19:40:11 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index df7fece8bfa8..932236803968 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 8b90855e933f..6b4528737bee 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/lynis-3.0.8-r1 b/metadata/md5-cache/app-forensics/lynis-3.0.9
index 2dfc6b962e16..6951a71ea5e9 100644
--- a/metadata/md5-cache/app-forensics/lynis-3.0.8-r1
+++ b/metadata/md5-cache/app-forensics/lynis-3.0.9
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-shells/bash cron? ( !systemd? ( virtual/cron ) )
 SLOT=0
-SRC_URI=https://cisofy.com/files/lynis-3.0.8.tar.gz
+SRC_URI=https://cisofy.com/files/lynis-3.0.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=9de4eac5fef519b7b3e7a50c4e71c4b6
+_md5_=e3ade954ba6cf8f590a7051787325c86
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 50fae73128b0..939c03835096 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.71.1 b/metadata/md5-cache/dev-lang/rust-bin-1.71.1
index ef6d6e0c3f70..a850d130b614 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.71.1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.71.1
@@ -11,6 +11,6 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-releas
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 RESTRICT=strip
 SLOT=stable
-SRC_URI=abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.71.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-i686-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.71.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.71.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.71.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( abi_mips_o32? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-mips-unknown-linux-gnu.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-mipsel-unknown-linux-gnu.tar.xz.asc ) ) ) abi_mips_n64? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-mips64el-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc ) ) ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.71.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) loong? ( https://static.rust-lang.org/dist/rust-1.71.1-loongarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-loongarch64-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-07-13/rust-src-1.71.1.tar.xz )
+SRC_URI=abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.71.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-i686-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.71.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.71.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.71.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( abi_mips_o32? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-mips-unknown-linux-gnu.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-mipsel-unknown-linux-gnu.tar.xz.asc ) ) ) abi_mips_n64? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-mips64el-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc ) ) ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.71.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) loong? ( https://static.rust-lang.org/dist/rust-1.71.1-loongarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.71.1-loongarch64-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-08-03/rust-src-1.71.1.tar.xz )
 _eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	5240c941287da6157cbaccd40b91a53c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=9e04902c9ab96a0aee03af9bebe0e950
+_md5_=dbce8dc5523542c9820bde22f11d72b2
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 34450ff09f16..c66686544580 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/iminuit-2.23.0 b/metadata/md5-cache/dev-python/iminuit-2.23.0
index f33b17a57265..e562c1c18927 100644
--- a/metadata/md5-cache/dev-python/iminuit-2.23.0
+++ b/metadata/md5-cache/dev-python/iminuit-2.23.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/ipython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-core-0.4.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+DEPEND=dev-python/pybind11[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 DESCRIPTION=Minuit numerical function minimization in Python
 EAPI=8
 HOMEPAGE=https://github.com/scikit-hep/iminuit/ https://pypi.org/project/iminuit/
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/i/iminuit/iminuit-2.23.0.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b245f66fb11aea2498e771b0ef988629
+_md5_=451ff66bdb0b6dee2deec06f69032459
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.38.0 b/metadata/md5-cache/dev-python/m2crypto-0.38.0
deleted file mode 100644
index a29120d2a1c5..000000000000
--- a/metadata/md5-cache/dev-python/m2crypto-0.38.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/swig-2.0.9 test? ( dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-libs/openssl:0= ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0= python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] )
-DESCRIPTION=A Python crypto and SSL toolkit
-EAPI=7
-HOMEPAGE=https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/
-INHERIT=distutils-r1 toolchain-funcs pypi
-IUSE=test abi_mips_n32 abi_mips_n64 abi_mips_o32 test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-libs/openssl:0= python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/M/M2Crypto/M2Crypto-0.38.0.tar.gz
-_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=0e40ab450bf8c61d2fbd55a7c306d92e
diff --git a/metadata/md5-cache/dev-python/snapshottest-0.6.0 b/metadata/md5-cache/dev-python/snapshottest-0.6.0
index 5c4511831bfb..a0edaf28a652 100644
--- a/metadata/md5-cache/dev-python/snapshottest-0.6.0
+++ b/metadata/md5-cache/dev-python/snapshottest-0.6.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/termcolor[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 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/termcolor[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=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 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Snapshot Testing utils for Python
 EAPI=8
 HOMEPAGE=https://github.com/syrusakbary/snapshottest/ https://pypi.org/project/snapshottest/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/termcolor[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/termcolor[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python: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/syrusakbary/snapshottest/archive/0.6.0.tar.gz -> snapshottest-0.6.0.gh.tar.gz
 _eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=0e42433d2a6ea42b7a5351b73bb88f0b
+_md5_=d1928fb530a0a4873e188a32824dbf16
diff --git a/metadata/md5-cache/dev-python/ujson-5.7.0 b/metadata/md5-cache/dev-python/ujson-5.7.0
deleted file mode 100644
index b5dd38020d67..000000000000
--- a/metadata/md5-cache/dev-python/ujson-5.7.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-libs/double-conversion:= >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python: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.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/double-conversion:= python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-DESCRIPTION=Ultra fast JSON encoder and decoder for Python
-EAPI=8
-HOMEPAGE=https://github.com/ultrajson/ultrajson/ https://pypi.org/project/ujson/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-libs/double-conversion:= python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python: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://files.pythonhosted.org/packages/source/u/ujson/ujson-5.7.0.tar.gz
-_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=ba865c7b54acfd8510c3a77638d9d6d4
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 371e94abf73e..496fe16b6cac 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/hoe-4.0.5 b/metadata/md5-cache/dev-ruby/hoe-4.0.5
new file mode 100644
index 000000000000..9cb1677768c6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hoe-4.0.5
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby32(-)] ) ) test? ( ruby_targets_ruby30? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] <dev-ruby/rake-15.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby31(-)] <dev-ruby/rake-15.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby32(-)] <dev-ruby/rake-15.0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Hoe extends rake to provide full project automation
+EAPI=8
+HOMEPAGE=https://www.zenspider.com/projects/hoe.html
+INHERIT=ruby-fakegem
+IUSE=doc test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] <dev-ruby/rake-15.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby31(-)] <dev-ruby/rake-15.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby32(-)] <dev-ruby/rake-15.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/hoe-4.0.5.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=1d0f133ed6358a9067ead794af3a5c6a
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.2.5 b/metadata/md5-cache/dev-ruby/rake-compiler-1.2.5
new file mode 100644
index 000000000000..e3bf20835003
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.2.5
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-util/cucumber[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-util/cucumber[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Provide a standard and simplified way to build and package Ruby extensions
+EAPI=8
+HOMEPAGE=https://github.com/rake-compiler/rake-compiler
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rake-compiler/rake-compiler/archive/v1.2.5.tar.gz -> rake-compiler-1.2.5.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=5d02fd69acd5094402061a2a7eddd45a
diff --git a/metadata/md5-cache/dev-ruby/stringio-3.0.6 b/metadata/md5-cache/dev-ruby/stringio-3.0.6
index 104ecfbfa886..592f7eb31189 100644
--- a/metadata/md5-cache/dev-ruby/stringio-3.0.6
+++ b/metadata/md5-cache/dev-ruby/stringio-3.0.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/stringio
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/stringio/archive/v3.0.6.tar.gz -> stringio-3.0.6.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=98b9a48ea318c0cf66ead09d1463062f
+_md5_=e245993e88da60d021fc9eb72de1e7bb
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 63d5f7a34967..633744df0cc1 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-45_beta b/metadata/md5-cache/gnome-extra/gnome-calculator-45_beta
new file mode 100644
index 000000000000..30afb190ca6e
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-45_beta
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.56 ) net-libs/libsoup:3.0[vala] gui-libs/gtksourceview:5[vala] gui-libs/libhandy:1[vala] app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 net-libs/libsoup:3.0 >=dev-libs/libgee-0.20.0:0.8 dev-libs/mpc:= dev-libs/mpfr:0= >=gui-libs/gtk-4.4.1:4 >=gui-libs/libadwaita-1.2.0:1 >=gui-libs/gtksourceview-5.3.0:5 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+DESCRIPTION=A calculator application for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson vala virtualx xdg
+IUSE=+introspection test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 net-libs/libsoup:3.0 >=dev-libs/libgee-0.20.0:0.8 dev-libs/mpc:= dev-libs/mpfr:0= >=gui-libs/gtk-4.4.1:4 >=gui-libs/libadwaita-1.2.0:1 >=gui-libs/gtksourceview-5.3.0:5 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calculator/45/gnome-calculator-45.beta.tar.xz
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	vala	db97951caa799e73a831a5f48e717da8	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ffdd4bba850978c6bc34a93aeaee29a9
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-45_beta b/metadata/md5-cache/gnome-extra/gnome-system-monitor-45_beta
new file mode 100644
index 000000000000..9b6e6ccec4b3
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-45_beta
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=sys-auth/polkit-0.114 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X(+)?] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/atkmm-2.28:0 >=gnome-base/libgtop-2.37.2:2= >=gui-libs/libhandy-1.5.0:1 >=gnome-base/librsvg-2.35:2 >=dev-libs/libxml2-2.0:2 X? ( >=x11-libs/libwnck-2.91.0:3 ) systemd? ( >=sys-apps/systemd-44:0= )
+DESCRIPTION=The Gnome System Monitor
+EAPI=8
+HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/stable/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=systemd X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X(+)?] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/atkmm-2.28:0 >=gnome-base/libgtop-2.37.2:2= >=gui-libs/libhandy-1.5.0:1 >=gnome-base/librsvg-2.35:2 >=dev-libs/libxml2-2.0:2 X? ( >=x11-libs/libwnck-2.91.0:3 ) systemd? ( >=sys-apps/systemd-44:0= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-system-monitor/45/gnome-system-monitor-45.beta.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=127ac9dd185d99a395fb2a57e92745e6
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index b0cf81ed1eed..fb4d020c9789 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.2.4 b/metadata/md5-cache/net-libs/miniupnpc-2.2.4
deleted file mode 100644
index abdb8dfdb79b..000000000000
--- a/metadata/md5-cache/net-libs/miniupnpc-2.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=kernel_linux? ( sys-apps/lsb-release ) verify-sig? ( sec-keys/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install prepare test unpack
-DESCRIPTION=UPnP client library and a simple UPnP client
-EAPI=8
-HOMEPAGE=http://miniupnp.free.fr/ https://miniupnp.tuxfamily.org/ https://github.com/miniupnp/miniupnp/
-INHERIT=toolchain-funcs verify-sig
-IUSE=ipv6 verify-sig
-KEYWORDS=amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-SLOT=0/17
-SRC_URI=https://miniupnp.tuxfamily.org/files/miniupnpc-2.2.4.tar.gz verify-sig? ( https://miniupnp.tuxfamily.org/files/miniupnpc-2.2.4.tar.gz.sig )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=d45a945bacfaa5afb40712500e37f206
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 3896c5f140fe..21011ea3b5ea 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20230804 b/metadata/md5-cache/sys-kernel/linux-firmware-20230804
new file mode 100644
index 000000000000..82ff2dbe2ee6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20230804
@@ -0,0 +1,16 @@
+BDEPEND=initramfs? ( app-arch/cpio ) compress-xz? ( app-arch/xz-utils ) compress-zstd? ( app-arch/zstd )
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup unpack
+DESCRIPTION=Linux firmware files
+EAPI=7
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+INHERIT=linux-info mount-boot savedconfig multiprocessing
+IUSE=compress-xz compress-zstd initramfs +redistributable savedconfig unknown-license savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT ) unknown-license? ( all-rights-reserved )
+RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+REQUIRED_USE=initramfs? ( redistributable ) ?? ( compress-xz compress-zstd )
+RESTRICT=binchecks strip test unknown-license? ( bindist )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20230804.tar.xz
+_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=459b7523843a61bd0615339026fee586
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index eb7fb2e6d0ee..308b4f7ac3e5 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.41-r1 b/metadata/md5-cache/sys-libs/binutils-libs-2.41-r2
index 4392d1f08ff9..70daa5f4578a 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.41-r1
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.41-r2
@@ -10,7 +10,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
 RESTRICT=!test? ( test )
-SLOT=0/2.41
+SLOT=0/2.41.0
 SRC_URI=mirror://gnu/binutils/binutils-2.41.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.41.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.41-patches-2.tar.xz
 _eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=c127c5999d848846b01a528f5994f91a
+_md5_=141305b70a214be0313f4f735eab1a71
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index a033fb790d46..2925f4c513f9 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.3 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.3
deleted file mode 100644
index 041855801093..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/intltool sys-apps/help2man virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 >=net-libs/libsoup-3.0.0:3.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.16.0:= >=xfce-base/libxfce4util-4.16.0:= >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/xfconf-4.16.0:=
-DESCRIPTION=Xfce4 screenshooter application and panel plugin
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/apps/xfce4-screenshooter/start https://gitlab.xfce.org/apps/xfce4-screenshooter/
-INHERIT=xdg-utils
-KEYWORDS=amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 >=net-libs/libsoup-3.0.0:3.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.16.0:= >=xfce-base/libxfce4util-4.16.0:= >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/xfconf-4.16.0:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.10/xfce4-screenshooter-1.10.3.tar.bz2
-_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a3d27509720a95ad209240dfabb59b35
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 4d377ec2ea0c..b7f45f79518b 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-08-04T13:40:16Z
+TIMESTAMP 2023-08-04T19:40:14Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTM/8BfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTNVB5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCcdA//dy/yqA4/g7q1lyHgciviv8JWZjNwMe+mAGMoEjsEkoJlr9qfY1AJjWWB
-MAlxXX47smk0okRWLWXldb2CFo1Q+IMZchUpIntlMAUWnyv7/P/9fLf2odClFGIO
-6ez1qXkdJGEGAH1KqCGw8VkkSbW2Iguge69OUPmKHVZqc5R90dcy7X67UZIoe178
-t4Y3aayJw72qaf/1S7kWHDYws35H8tHn9DvofoscWIab9It+wmlphB8rug4r6yTo
-DDwNOSTIIbgZW0Vp2O+QmBhXeGxCo9pqYBCuNpQDlCVow+3hqQUo96mpdZqO8XH0
-X+siuOmR8vtgw3+sn3uLpMiZxzCKR7vraz5dNxH8fnKqzjFP9B8PipxYWxfDJeWg
-88KdxVbU+BSxfInZ/n+yotugTK8ilS4XQk28qbdmbibO9i7tkZEhw/ZdTIGmVoMc
-L0FLpB6bxFFZGst06J2rzRVw6b8nM/06RCRRjwrzf76QY84aCMecST26lCvk+C0S
-JFHaNPcswuWd0lxJcLPxlO9mjVQKA1k/AugKPVgVG7wJie/J8iFm671BtDnQ6ohO
-Hren/X9/qE1v+0zkA/thoE910d2n5Xnbz2Cbqn751UwovT7FYjzDR5sxeU0g6VxF
-KRE0upj6r4tAsbhPK8FM1Z9db4L1cSkST6HaOV/owBKJbuQIicw=
-=d/WN
+klADUQ//WTrMUStGskPHimbac4T0RLs+uK+ss/hVZPZSn7l3MBmjurma2L4X2CGq
+fypsGuqK5GZUg/FLPb0Dx40rCkKheoLC9+qWJLgPgBjlWoduRtt2uizzHYBVaPk4
+VAS491g0aPIOBQUQnpPGRNn9hDxvWO5KnaLlCdfnfByqy8FxUSx+LCHtxm7DpI9n
+IvkTFfWnKltV21eK7rAbNKE26Swnp5SQfccT2CM3gg4Dq++VHeqGhOVDaXOeb1P/
+12yPulCaflLPeyOA2mvd050kI1NnXYlmAaEKgpHjHEXLgYR1tHUFK15aUoBt2Icn
+Gx25OxSyP1u/zaESvywZlufzY7ChIRLeX2YxhpqDHlwfRIGQt7jy9jZDzxAKRQKj
+Mj3O6+Jyv2cyvoJfS/tekjrQ7uerOvBfidKnBmHXI80PQ2cL+iloCU3jXYqkMpLN
+Iei80k1r6ORvQ13RdaCzXg+KyyFxArq52qnwIQKVZ+MAFgWUeL9F+XC2YGXmYHHG
+dB15LW9Btj59+yFWTv1BeMWt7udobyQXmKh86l5Lef7ndkPJ+zcQ9c9qmPNeOMd4
+FLg3yGuo4hFVjBm3GLcjPeCvencb55ZVcu6mNMUniwj5ryeymeDRM7xlYO5IUvzS
+D0aaERv4sMPe8QK8BXI8ZQeaxIJym1Lgqh8BXEgUyvgnmDlkGLs=
+=ZtZ6
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2a8b0e59e8bf..b2091ada5606 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Aug 2023 13:40:13 +0000
+Fri, 04 Aug 2023 19:40:11 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 0488479c41b6..f56a9e17b18c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Aug  4 01:40:13 PM UTC 2023
+Fri Aug  4 07:40:11 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7adf0100b18e..9ba92f06fbfa 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Aug 2023 13:45:01 +0000
+Fri, 04 Aug 2023 19:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 36d7b3ce7367..b21639d5c0bc 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1e49ef432d39dbb2265475d03352e3f206a2aab0 1691154236 2023-08-04T13:03:56+00:00
+001cb6e02938700b2d4a90b8b4332f5260690a96 1691177698 2023-08-04T19:34:58+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 11ef4491cb42..094d0b95227c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1691156401 Fri 04 Aug 2023 01:40:01 PM UTC
+1691178001 Fri 04 Aug 2023 07:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2a8b0e59e8bf..b2091ada5606 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Aug 2023 13:40:13 +0000
+Fri, 04 Aug 2023 19:40:11 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 0b69c2a429a3..b48d7a66115d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 94fd2b018703..a10caad585f4 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,8 +1,5 @@
 AUX miniupnpc-2.2.3-drop-which.patch 1209 BLAKE2B 32ae4d0eee181cc428bc8afe6aee0ea6097527461c868b7133e1f1ab70c3aeb5c816b2297b8027db06fd9751e6ebf68e8bb560070e75987e72f7c3c60f61b7a6 SHA512 1e8d93c14d5b7f103782a15e007abd0e1223da60b98177d455ceb1a2c6fe5b7c3c22f2fe79da0b4dce54542ac6b3e8ec225d09a0b8bdf8742b07a14cd160b5dc
-DIST miniupnpc-2.2.4.tar.gz 102932 BLAKE2B ebfea3fe978280825b7beefb8fe799685a72b0a74c589f5f55c7fde3d8c0d4bbb3d50fa0ff3aed554fa1e24ada0a1ab578328373f0295020415998fe35cde0a0 SHA512 f6515bda86405114016474fef6332c0c09a56b9293cf4391113f549444bab67e7d031af7b94dacff5e7c96d6508527204498c00fb67d6067685ef606b2152595
-DIST miniupnpc-2.2.4.tar.gz.sig 543 BLAKE2B 14a1a1979e2d248bb721c66db3e28c1d6f970477e94235bdfa77763d5f9d4c0da42b23d026e861f48cc34a17e009bf8c57aacc648435ec9e31c3c4b6c3347ffb SHA512 476d1a6cfc519f82461bf4d516f73d40cc3ef27886da68d2e805a24d9c4609c53566e258bd2b622e7716f43c81c14bc0f01b189d23b46b87afc3c76d4e6fa23e
 DIST miniupnpc-2.2.5.tar.gz 103654 BLAKE2B 9cd3fee7bb4934610d57340d29ef61bbca8a94e230a0d35a26cfe4eec347f6807f7d5ab6edb38354ec82aa11bb7a83869169b3c322931f96a1e3a4dd6eec123c SHA512 32d362c43cf5c9f6c1546d85c2dd780f9701f3137bc78471b3670c4c0862b7fc4f081e6cb6fd14e5c0d3ec0602714756959491688998335c8a7b324e6c53aa2f
 DIST miniupnpc-2.2.5.tar.gz.sig 543 BLAKE2B ea7b5c254684f52485bc18ad4820c41e7c70a4eb5e552cb5f9d937a4927c9655a4fb959d32930299f1f863d4dbb5894ce76d693ce5a9996a44180038a02a0d5a SHA512 b23d35610d41c9dfc5af78de5329e9c28976685435bdff041759ab6e9f54154e7a082bcd313c682141fda8ba1e1c3b246e49109ad9a5323f003528d0ba71f880
-EBUILD miniupnpc-2.2.4.ebuild 1604 BLAKE2B 02ecd9ded80f1b5784d48b1afb832aa9450dba4752a30b4d46e52526c7feeddc7909f938a970db6921a3fe6fdadcb06e49ac80152188e34b500295a0b1089ee5 SHA512 a66bcc2fc2479a95fcebcefc781662016ea75db9fb1445324a2bef160ea6236567b8bd17af9d696e7babcf78f6fccd3895679cf00fdf08fac65c187a40ebbe0c
 EBUILD miniupnpc-2.2.5.ebuild 1604 BLAKE2B 4bdca64b363d6ebdbd8a2f648b1109d32836bc9c6e2bcc1e8a904d9ab0c8a9394aa0363c4fbbf4b0efa2e8422451b52607f70d55e2e3ad7f5257b0b6988123fb SHA512 d24141476e4ad027519f00e888d99e2d951da980216f7a69907311b95e63edce7b8e7bdac2ac88b664e47c9e98d3d4e1e9b99644a5331da0e47fc09e41029357
 MISC metadata.xml 330 BLAKE2B 02b7193f99aee0f3cad145954d1a6f7f9b2f63e21cc23d02ae3048d89618050a5a8df2e206d771a3d0853664d4a0de9a09f44660b108eb280618d9136d1c86be SHA512 6a395c2a579f4ce8c891261da25c031284904a8d6366733c14a201a948e6744ae0037067f178f799d6134e4be670f1be3582f257414e067de654e8050963b972
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.4.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.4.ebuild
deleted file mode 100644
index ca55d005013d..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.2.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="
-	http://miniupnp.free.fr/
-	https://miniupnp.tuxfamily.org/
-	https://github.com/miniupnp/miniupnp/
-"
-SRC_URI="
-	https://miniupnp.tuxfamily.org/files/${P}.tar.gz
-	verify-sig? (
-		https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig
-	)
-"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="ipv6"
-
-BDEPEND="
-	kernel_linux? ( sys-apps/lsb-release )
-	verify-sig? ( sec-keys/openpgp-keys-miniupnp )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/miniupnpc-2.2.3-drop-which.patch
-	)
-	default
-
-	local exprs=(
-		# These bins are not installed, upnpc-static requires building static lib
-		-e '/EXECUTABLES =/s/ upnpc-static listdevices//'
-		# Prevent gzipping manpage.
-		-e '/gzip/d'
-		# Disable installing the static library
-		-e '/FILESTOINSTALL =/s/ $(LIBRARY)//'
-		-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d'
-	)
-	sed -i "${exprs[@]}" Makefile || die
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake build/upnpc-shared
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index d529a11fca7f..57355caad563 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 317e8f36fde7..3d1072e6f63c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2023-08-04)
+# Stricter behavior which causes some packages to fail, see bug #911721.
+=dev-util/pkgconf-2.0.0
+
 # David Seifert <soap@gentoo.org> (2023-07-29)
 # EAPI 6, fetch restrictions require annoying registration, no other
 # distro packages this, over 10 years old. Removal on 2023-08-28.
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 7c30464fdd62..ff3f81799c0e 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 08a63b66bd1a..bdd5db54c815 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -2,9 +2,11 @@ DIST linux-firmware-20230404.tar.xz 273105092 BLAKE2B 3bf6c4d5e501362613bdcb01c4
 DIST linux-firmware-20230515.tar.xz 274489272 BLAKE2B 5563a89d39e127433f726f0b67b656e46d7ed00f2ff10e3e075d85cbfda25ba5c48fc688df3466b7910a599764faa7eb49b7565b5feeaeca9d40516d9ef59880 SHA512 9060dde164203516fb01d4920ce245acf17f33b5e707093bd5cfbc18193fd6e91e4a9b721fe46d12420c499254d287d5c1e211ae7c576e450820e8e085d646bd
 DIST linux-firmware-20230625_p20230707.tar.gz 441416528 BLAKE2B f964377c4ebfc232e3ed11120a68fd419506bad077fb1082a57f5103e0e974ef047c2dc00053029d26eefe23344c02a3bcafeef3057d9787a192f5b8b5be056f SHA512 02c6b6440e33c6fbc857b82c3193affd7ca772ac635c3e987f03073ae6460150f980e9cd438230fce0f0f9f7c5f964e87d424c2d3ea240d735b553c5783226c4
 DIST linux-firmware-20230625_p20230724.tar.gz 441906566 BLAKE2B 5bed31d9ad78440bb12feeacb1ba27a07ad30b0eb8c7bfd03a4e7a7590012af1f9535a49fbf031abf79dd05ca90be79566f06db6f955910edfdca61281831c67 SHA512 daaf07422eb6f3e1b50f8a5dba5bfff747fe6750c0210ab798745f61d774eef7642ab45b9b404c668cf017d6b7fcf89c34bce9e6c77053b1b81f1a3498c5be18
+DIST linux-firmware-20230804.tar.xz 295170972 BLAKE2B 48eca78ab97ef5ac335dd2bfd043cf3e67c52c68cb8b3eb152725e04838a7662dafa9745add6fc786bf87d275809b51a07496fbdaf4607a89e2787388fe1d1cd SHA512 b7fdffd49530223394a0896608a746395cbe9d1a3ca7e4e744bc8381e937845e085f08e2b56854a233426164072f4c365b281db2f0dbb47192a97a94ada8fae6
 EBUILD linux-firmware-20230404.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
 EBUILD linux-firmware-20230515.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
 EBUILD linux-firmware-20230625_p20230707.ebuild 11236 BLAKE2B e51ae25a65c40a6cfbdcfe02a0e28542791d240c2a8b8e2e318a3583f55c4e3e41ec0bb51167bda82bf952e17fa24a964edab7db7dd6e24ed3caba4a1324901c SHA512 0ab1e3d994f6a6ac901e2370f86119fd26d08a034b0e4dccf788a7cd52534bd46a884b8e56705192d877942f540e7437e3e378ba1b8633d206534e777fbe9e82
 EBUILD linux-firmware-20230625_p20230724.ebuild 11236 BLAKE2B b8c589d73300df9b6ecb415abffdb2feea665bbefab66de5b0ead1ec38773ed8f1770747ff99b98dccf35faf603102f8a7a557245cb8b1549e38b4f55b72a5bb SHA512 ea77fb1cbb89246c9ddef62ff3aac3fdcdd61d8a3af6b6acd18805b67111395ab7f7415c16b2547a19d4d928100d1c73cfbc4c818d95cc0db018876c6b1f53fd
+EBUILD linux-firmware-20230804.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
 EBUILD linux-firmware-99999999.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
 MISC metadata.xml 1192 BLAKE2B 52efc1e40ffdac04c33fd2c50a1b7a03f775e16c6aaac19f1a7c9c54f853f7f3dd37fd52e4cf7fcc05bf17d45e4d7956deff7b552b1b568005feca60d967fa23 SHA512 e1214670c10573aee4e272b45bb9c21c85b15d520e77f57fa1decf8c7bb1dd765bdf6b878b6c52a8455f9569735b806caf053dc7934ce74c7088b991ebb705a2
diff --git a/sys-kernel/linux-firmware/linux-firmware-20230804.ebuild b/sys-kernel/linux-firmware/linux-firmware-20230804.ebuild
new file mode 100644
index 000000000000..feed015c3e3e
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20230804.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit linux-info mount-boot savedconfig multiprocessing
+
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=""
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${MY_COMMIT}"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
+	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
+	unknown-license? ( all-rights-reserved )"
+SLOT="0"
+IUSE="compress-xz compress-zstd initramfs +redistributable savedconfig unknown-license"
+REQUIRED_USE="initramfs? ( redistributable )
+	?? ( compress-xz compress-zstd )"
+
+RESTRICT="binchecks strip test
+	unknown-license? ( bindist )"
+
+BDEPEND="initramfs? ( app-arch/cpio )
+	compress-xz? ( app-arch/xz-utils )
+	compress-zstd? ( app-arch/zstd )"
+
+#add anything else that collides to this
+RDEPEND="!savedconfig? (
+		redistributable? (
+			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+			!sys-block/qla-fc-firmware
+			!sys-firmware/iwl1000-ucode
+			!sys-firmware/iwl6005-ucode
+			!sys-firmware/iwl6030-ucode
+			!sys-firmware/iwl3160-ucode
+			!sys-firmware/iwl7260-ucode
+			!sys-firmware/iwl3160-7260-bt-ucode
+			!sys-firmware/raspberrypi-wifi-ucode
+		)
+		unknown-license? (
+			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+			!sys-firmware/alsa-firmware[alsa_cards_sb16]
+			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		)
+	)"
+
+QA_PREBUILT="*"
+
+pkg_setup() {
+	if use compress-xz || use compress-zstd ; then
+		local CONFIG_CHECK
+
+		if kernel_is -ge 5 19; then
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
+			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
+		else
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
+			if use compress-zstd; then
+				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
+			fi
+		fi
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_pretend() {
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
+			mv ${PN}-*/ ${P} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	find . -type f -not -perm 0644 -print0 \
+		| xargs --null --no-run-if-empty chmod 0644 \
+		|| die
+
+	chmod +x copy-firmware.sh || die
+
+	if use initramfs; then
+		if [[ -d "${S}/amd-ucode" ]]; then
+			local UCODETMP="${T}/ucode_tmp"
+			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
+			mkdir -p "${UCODEDIR}" || die
+			echo 1 > "${UCODETMP}/early_cpio"
+
+			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
+			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
+
+			if [[ ! -s "${amd_ucode_file}" ]]; then
+				die "Sanity check failed: '${amd_ucode_file}' is empty!"
+			fi
+
+			pushd "${UCODETMP}" &>/dev/null || die
+			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
+			popd &>/dev/null || die
+			if [[ ! -s "${S}/amd-uc.img" ]]; then
+				die "Failed to create '${S}/amd-uc.img'!"
+			fi
+		else
+			# If this will ever happen something has changed which
+			# must be reviewed
+			die "'${S}/amd-ucode' not found!"
+		fi
+	fi
+
+	# whitelist of misc files
+	local misc_files=(
+		copy-firmware.sh
+		WHENCE
+		README
+	)
+
+	# whitelist of images with a free software license
+	local free_software=(
+		# keyspan_pda (GPL-2+)
+		keyspan_pda/keyspan_pda.fw
+		keyspan_pda/xircom_pgs.fw
+		# dsp56k (GPL-2+)
+		dsp56k/bootstrap.bin
+		# ath9k_htc (BSD GPL-2+ MIT)
+		ath9k_htc/htc_7010-1.4.0.fw
+		ath9k_htc/htc_9271-1.4.0.fw
+		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
+		cis/LA-PCM.cis
+		cis/PCMLM28.cis
+		cis/DP83903.cis
+		cis/NE2K.cis
+		cis/tamarack.cis
+		cis/PE-200.cis
+		cis/PE520.cis
+		cis/3CXEM556.cis
+		cis/3CCFEM556.cis
+		cis/MT5634ZLX.cis
+		cis/RS-COM-2P.cis
+		cis/COMpad2.cis
+		cis/COMpad4.cis
+		# serial_cs (GPL-3)
+		cis/SW_555_SER.cis
+		cis/SW_7xx_SER.cis
+		cis/SW_8xx_SER.cis
+		# dvb-ttpci (GPL-2+)
+		av7110/bootcode.bin
+		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
+		usbdux_firmware.bin
+		usbduxfast_firmware.bin
+		usbduxsigma_firmware.bin
+		# brcmfmac (GPL-2+)
+		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
+		brcm/brcmfmac43340-sdio.meegopad-t08.txt
+		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
+		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
+		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
+		brcm/brcmfmac43430-sdio.AP6212.txt
+		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+		brcm/brcmfmac43430-sdio.MUR1DX.txt
+		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+		# isci (GPL-2)
+		isci/isci_firmware.bin
+		# carl9170 (GPL-2+)
+		carl9170-1.fw
+		# atusb (GPL-2+)
+		atusb/atusb-0.2.dfu
+		atusb/atusb-0.3.dfu
+		atusb/rzusb-0.3.bin
+		# mlxsw_spectrum (dual BSD/GPL-2)
+		mellanox/mlxsw_spectrum-13.1420.122.mfa2
+		mellanox/mlxsw_spectrum-13.1530.152.mfa2
+		mellanox/mlxsw_spectrum-13.1620.192.mfa2
+		mellanox/mlxsw_spectrum-13.1702.6.mfa2
+		mellanox/mlxsw_spectrum-13.1703.4.mfa2
+		mellanox/mlxsw_spectrum-13.1910.622.mfa2
+		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
+	)
+
+	# blacklist of images with unknown license
+	local unknown_license=(
+		korg/k1212.dsp
+		ess/maestro3_assp_kernel.fw
+		ess/maestro3_assp_minisrc.fw
+		yamaha/ds1_ctrl.fw
+		yamaha/ds1_dsp.fw
+		yamaha/ds1e_ctrl.fw
+		ttusb-budget/dspbootcode.bin
+		emi62/bitstream.fw
+		emi62/loader.fw
+		emi62/midi.fw
+		emi62/spdif.fw
+		ti_3410.fw
+		ti_5052.fw
+		mts_mt9234mu.fw
+		mts_mt9234zba.fw
+		whiteheat.fw
+		whiteheat_loader.fw
+		cpia2/stv0672_vp4.bin
+		vicam/firmware.fw
+		edgeport/boot.fw
+		edgeport/boot2.fw
+		edgeport/down.fw
+		edgeport/down2.fw
+		edgeport/down3.bin
+		sb16/mulaw_main.csp
+		sb16/alaw_main.csp
+		sb16/ima_adpcm_init.csp
+		sb16/ima_adpcm_playback.csp
+		sb16/ima_adpcm_capture.csp
+		sun/cassini.bin
+		acenic/tg1.bin
+		acenic/tg2.bin
+		adaptec/starfire_rx.bin
+		adaptec/starfire_tx.bin
+		yam/1200.bin
+		yam/9600.bin
+		ositech/Xilinx7OD.bin
+		qlogic/isp1000.bin
+		myricom/lanai.bin
+		yamaha/yss225_registers.bin
+		lgs8g75.fw
+	)
+
+	if use !unknown-license; then
+		einfo "Removing files with unknown license ..."
+		rm -v "${unknown_license[@]}" || die
+	fi
+
+	if use !redistributable; then
+		# remove files _not_ in the free_software or unknown_license lists
+		# everything else is confirmed (or assumed) to be redistributable
+		# based on upstream acceptance policy
+		einfo "Removing non-redistributable files ..."
+		local OLDIFS="${IFS}"
+		local IFS=$'\n'
+		set -o pipefail
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' --no-run-if-empty rm -v
+
+		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
+
+		IFS="${OLDIFS}"
+	fi
+
+	restore_config ${PN}.conf
+}
+
+src_install() {
+	./copy-firmware.sh -v "${ED}/lib/firmware" || die
+
+	pushd "${ED}/lib/firmware" &>/dev/null || die
+
+	# especially use !redistributable will cause some broken symlinks
+	einfo "Removing broken symlinks ..."
+	find * -xtype l -print -delete || die
+
+	if use savedconfig; then
+		if [[ -s "${S}/${PN}.conf" ]]; then
+			local files_to_keep="${T}/files_to_keep.lst"
+			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
+			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
+
+			einfo "Applying USE=savedconfig; Removing all files not listed in config ..."
+			find ! -type d -printf "%P\n" \
+				| grep -Fvx -f "${files_to_keep}" \
+				| xargs -d '\n' --no-run-if-empty rm -v
+
+			if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
+				die "Find failed to print installed files"
+			elif [[ ${PIPESTATUS[1]} -eq 2 ]]; then
+				# grep returns exit status 1 if no lines were selected
+				# which is the case when we want to keep all files
+				die "Grep failed to select files to keep"
+			elif [[ ${PIPESTATUS[2]} -ne 0 ]]; then
+				die "Failed to remove files not listed in config"
+			fi
+		fi
+	fi
+
+	# remove empty directories, bug #396073
+	find -type d -empty -delete || die
+
+	# sanity check
+	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
+		eerror "No files to install. Check your USE flag settings"
+		eerror "and the list of files in your saved configuration."
+		die "Refusing to install an empty package"
+	fi
+
+	# create config file
+	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
+	find * ! -type d >> "${S}"/${PN}.conf || die
+	save_config "${S}"/${PN}.conf
+
+	if use compress-xz || use compress-zstd; then
+		einfo "Compressing firmware ..."
+		local target
+		local ext
+		local compressor
+
+		if use compress-xz; then
+			ext=xz
+			compressor="xz -T1 -C crc32"
+		elif use compress-zstd; then
+			ext=zst
+			compressor="zstd -15 -T1 -C -q --rm"
+		fi
+
+		# rename symlinks
+		while IFS= read -r -d '' f; do
+			# skip symlinks pointing to directories
+			[[ -d ${f} ]] && continue
+
+			target=$(readlink "${f}")
+			[[ $? -eq 0 ]] || die
+			ln -sf "${target}".${ext} "${f}" || die
+			mv -T "${f}" "${f}".${ext} || die
+		done < <(find . -type l -print0) || die
+
+		find . -type f ! -path "./amd-ucode/*" -print0 | \
+			xargs -0 -P $(makeopts_jobs) -I'{}' ${compressor} '{}' || die
+
+	fi
+
+	popd &>/dev/null || die
+
+	if use initramfs ; then
+		insinto /boot
+		doins "${S}"/amd-uc.img
+	fi
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+
+	# Fix 'symlink is blocked by a directory' Bug #871315
+	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
+		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt 20190514; then
+			elog
+			elog 'Starting with version 20190514, installation of many firmware'
+			elog 'files is controlled by USE flags. Please review your USE flag'
+			elog 'and package.license settings if you are missing some files.'
+			break
+		fi
+	done
+
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postinst
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 8bb7e981c16b..e2a5d00eb406 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 1c8b96a4051f..349c6291209d 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -25,6 +25,6 @@ EBUILD binutils-libs-2.38-r2.ebuild 4758 BLAKE2B 9de4470b987db46dd9647023f5750c2
 EBUILD binutils-libs-2.39-r5.ebuild 4766 BLAKE2B ee4275f3555984c95e8063a6858e761bb19485c51f7f5f88dbdb36dcd4f0491f9ea3044d8b3a9aca79a079ab9c8374a2fd1ae64a706738720b740aa497b03995 SHA512 a595fc95ec0dc535d09f864ebda797085d3f3c81acca7671c9aafc9edc19b329bbcb7112df17f9a66a34fda98803ff989144b7f24091d0cb293859855ffdca08
 EBUILD binutils-libs-2.40-r5.ebuild 5007 BLAKE2B 3170efa253aa7e9ba4351593b344e3e9dc317fc70ed8f1c034bfe7142870e6a8866c9a75c4e494a5c0f00eb6c7debdb8448cb8f78d646642524684d26d372c49 SHA512 1d57e7404b41d31d6f7b4c4e9a7aedbf229b3e811bd34f46cbc953308d3f125a5563e7b59c392615737b3890b4b7568433d748b365399936b5e6476575704d53
 EBUILD binutils-libs-2.40-r7.ebuild 5012 BLAKE2B e158d44b4c9cfda0942e138dcd0a003dae67f8d00f81c99fc24de4f94380316c67692417357daf6547140fea2beca8d8fc09d3df622d357a6693844157fbeca5 SHA512 e952d4cc9ab96d1f143a2a9ecbdb7d52829f57f56cc755559132df1d796763342f10797c4562037ddc11ef240a1a3cd51ba05ca0c077ab6ada7ea3b122013445
-EBUILD binutils-libs-2.41-r1.ebuild 5177 BLAKE2B 46551f9b5f654d9dcccc33cf7dc03094cb083d3aaadbfcf0334dc09cc025d555c8ce0664073d0d00becdaf82b2ae5ca234c648338aadcdd5c7df65208f8e2f93 SHA512 d07fb07d34183febad77cf36568d25eeecbf931e4f85a549eecda7c231807ccbcecac21543bb3deda31f7bdf2e5f8a80364d9d10eb378fd0f4d1b6bb3a3f65ca
+EBUILD binutils-libs-2.41-r2.ebuild 5181 BLAKE2B b824e905debb708f120991e75baa70cbba46d039ecd93141be6ec29b89ec5e1b9eb168203c8932bc11e824ba62219818ba217df3a921761ef2732e42c9d67980 SHA512 7330f4e4e7b3009fd5d925a38712d9a13e8a0838685d2dba376f1041dd8cb7cd791f21df1eca28d84e9b79e4ed183aeb6681a885778dc7add70360f57e6b348c
 EBUILD binutils-libs-2.41.ebuild 5177 BLAKE2B edf72553cd7bd1d26d713619a3da3c6ed1416b29d662bf2c6ddc15553e089dea8c399f330a75beda3e77bf0dda1bfa629cba27be15778d9dbdb0793d45106359 SHA512 820e7fa73ea5e6d1145e12eb0ca4bbb602fb887bb24534f3a42026dfa2ab7d2174da811307ecb3a9ad208673fa51e0b1694b8cf8e3273479b2e7d5a57660f4d6
 MISC metadata.xml 612 BLAKE2B ceaafd9fd1421e9f3993e003d0029c92a78054c7a2b90bd78afc05370ad19c931c6a7c150545cfb7d57165168e0fdaf3a00dde1905b328826a91cbc70d9548a8 SHA512 c8d33bb8d1c62c7e95758624ed0febbc9d40e9f141bfd280837b3207bcd771412158d71c0cb5548d60be0b236f6fe103621daf7efa8875191982859b566ffa8d
diff --git a/sys-libs/binutils-libs/binutils-libs-2.41-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.41-r2.ebuild
index 16bac97b8d39..18e76e3fa553 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.41-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.41-r2.ebuild
@@ -20,7 +20,9 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0/${PV%_p?}"
+
+SLOT="0/${PV%_p?}.0"
+
 IUSE="64-bit-bfd cet multitarget nls static-libs test"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 RESTRICT="!test? ( test )"
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 2bb940a54049..0f9353210171 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 871499f983f2..f3ed3f23628a 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-screenshooter-1.10.3.tar.bz2 601717 BLAKE2B 825e939e56e8c11b42454fd14240209dd157b183525349c51979890ad544d69c9dd95264ffddb4956a0829598ebabd119ff01c0b9cd95115491b79cdd6168212 SHA512 c5bb43c7cbd15cdf276ff5dd16e0e102862b974cf32b725bbc0d33fa60c713e1891706f3a6e38150e76e9c876e5d0b1be277d3031a3ae47696056182ccac78f8
 DIST xfce4-screenshooter-1.10.4.tar.bz2 615583 BLAKE2B ef6b4db15320917b287604f8a32498c4ccd5eccd2df37ea67366b77a44d962ab2f6d97f6a23c75bfad7483129fd66dd5e8b3ea76acaa3738ba8edf52c2988026 SHA512 7d5eebf897aa2b45e92e4447052c58813c34aa437e10f61712ff50b96b3fa954849a4cb6bf0720659e4c2a596e9f09f79bde2ebdab98b4e8c35fde25a7839011
-EBUILD xfce4-screenshooter-1.10.3.ebuild 1249 BLAKE2B d221ded378807c008fc3a1f287859068ab3b57b120d291a867431cdf0e584f149627a8fe2344d7f8cac5301da43d5b9685727ed8125419906051754d29874028 SHA512 cd6f86df686e6ad3702a97259962384f08002cabedb85452dcf1671eaaa918a867cc56e7cd3ff8f4fb6166ed9aa23df2d22420aaed4fe60c132b86910e17caf2
 EBUILD xfce4-screenshooter-1.10.4.ebuild 1249 BLAKE2B d221ded378807c008fc3a1f287859068ab3b57b120d291a867431cdf0e584f149627a8fe2344d7f8cac5301da43d5b9685727ed8125419906051754d29874028 SHA512 cd6f86df686e6ad3702a97259962384f08002cabedb85452dcf1671eaaa918a867cc56e7cd3ff8f4fb6166ed9aa23df2d22420aaed4fe60c132b86910e17caf2
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.3.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.3.ebuild
deleted file mode 100644
index 6cee4f629361..000000000000
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce4 screenshooter application and panel plugin"
-HOMEPAGE="
-	https://docs.xfce.org/apps/xfce4-screenshooter/start
-	https://gitlab.xfce.org/apps/xfce4-screenshooter/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gdk-pixbuf-2.16
-	>=x11-libs/gtk+-3.24.0:3
-	>=x11-libs/pango-1.44.0
-	dev-libs/libxml2
-	>=net-libs/libsoup-3.0.0:3.0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libXi-1.7.8
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/xfce4-panel-4.16.0:=
-	>=xfce-base/libxfce4util-4.16.0:=
-	>=xfce-base/libxfce4ui-4.16.0:=
-	>=xfce-base/xfconf-4.16.0:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		--enable-xfixes
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}