gentoo auto-resync : 30:07:2023 - 10:41:38

author: V3n3RiX <venerix@koprulu.sector> 2023-07-30 10:41:39 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-07-30 10:41:39 +0100
commit: d97adbb13d8d4ce3f0521498a11e3d3af2154de2 (patch)
tree: a23f2eb147d7ff7bd988c4b80727987a5d1e2d54
parent: 332763613830233610011722737f7dbccdae4931 (diff)
97 files changed, 953 insertions, 913 deletions
diff --git a/Manifest b/Manifest
index 389f00c6a752..bb1def5dca82 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29319 BLAKE2B 325a2dd95277cf021d480cfda04b0e567be150f39f039c1ed0912f990b21e8ead54ec325f4f07a0c394d30d97a5051ef7eb8e75c0db714fd946dc60ea76b70de SHA512 fb8fd39ad7eaf6d66226bc66b44cef429bafc1c368e5631d97ba561b7b8e2510c8578db2dd81969bc1f788b3b679de693d1fbe4e6159fb464152a585ad6ed508
-TIMESTAMP 2023-07-30T03:10:10Z
+MANIFEST Manifest.files.gz 29334 BLAKE2B c4df13a38358c79f3ceb2341422a6983b40d1b1647a9ff1195dbd9c22beaa8268be4347b0d28b4c2cf8bafb7aacf75736b34aa046d5bc35894d4c294c0939cfa SHA512 6386888351fd32850e9803b63e638d1c8d010af7e5b53dd0f945d3e22bc2fc1d104746e41079f3e11e0089e0cd444936b20eee6d182dfe4f6038afe1eea1d682
+TIMESTAMP 2023-07-30T09:10:03Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTF1JJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTGKOtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klChBA//baOqC97QzFKmR4uarjECMt0vmmioqrDcph7eZ25Pug3DY5PHYzkQQd80
-mLRMuxbiu2hEnQvsz4AEkibBWt0C7kXGOLiFzFF/g9HgvXAWmLnlxfpOq7YN4JPR
-dOM86U35Th6yWsIIRP2MVGwZPfKewZguzrEd1zV5GJEcivkHh8TqwYhaO88416Do
-AzfDeEt6Ki8Jn/tQbRXoD9UDOY0OgYe4o1Z9vf7EkE9wlu4GrWOFxbHbphF8U8T/
-Zeqh0fR0OBm+G8JedlV0DDMKW3Z0aTvnFDzxRsRplZ8vKmGoMbkY4zHj920MPZHF
-lOZXU1BTjO/lXeAHZQ7uEA/hvwkeGqqFmpKJYe1fQ155H2qwL0Al4B34W3cUaHdV
-C+A92ODf1TDuX1quqh81tprY5IjXEDPCSg5dcPPf7/XjULotG7+fVQNExppJaZLd
-EA1dh/8VZu8LYVIGt0Ndki0SX6UDA3gtTApAXW52TOPGeFh8fw2L+6HlI5KUqG+Q
-tF8d4vmNW18npnIwDv8pcXLyWj6kpPMo0piFGyrEp/xCEnFjwY4CdCyqevWuD+1F
-P89WhOSc0jDnWB/QnVmnAj59/PAAgyj0y7XmSwQosa09P0xkXTPgxqI0neY2f/wP
-qDH6xTSOMPl4djG5YjiQcF9FbPfASaw7u/nifAhEreoPq8qHHQI=
-=84ka
+klAiFw/7B7z4PDhfJ0zofsgD7GFkzLSYXp4vMz/2kC+p69xadJDsoAAklHs1yPnD
+jPwegtrypaEQBIjw+J0Urvb/VHXKAb8Z8eLZO5zxA6qTy/+shAb6A3cXojrdldh1
+yJ+MBIrkGq+T8pdna85xlYXOrnwWwOYQrmQDtNZjzDvL3RNv+nYMR9FOdv86rK6T
+3fy1+aFzb/0sNAkusC9rM9Tjc/YyZ/FJeXHII3KOEZ3oooMbjrrfVN8vuGh00twI
+LkNKXXYJT05NZrCodvtzMFROQAHkHkjp4tK08wWDiK25PvV1urm/N5jHtBZr/4Qs
+a3nR2zi1kKbg+sYwXQemvBAklObEyI83L0p3S8UuUzFmSgrDMo907EHAC+lssaum
+BYgXWBTtqi7Er3czKF82LarNGA8uL1lLYkTzMK8CNmLrZ/2O/Gi7mhQhyeMVw62R
+mfe4afr1lzr3tknx3CjY9oHggnCLvslz+Ec0I48ptRF4ZgGCbwW62sgvS+lMv/ZN
+Fl1GtcNCXZNouDp/gTw/xoGjQy2tBpt2LANdxFCaJqJ1lHRdh/NwMj7pOKRgSHFI
+y5v0AIhoFjCCB2kzmVimhAbjRy0/bbdReXUhM398q0eZ0Gkuej1fg1X+s6pDuYDG
+esytsKyA7FZHs63HO1xgKht7LV0ERrl0YyOy9kO2s5f1IGjn2w8=
+=wFrc
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 66887c3bd56c..2ae4dcace775 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 8e831bbdf6c1..c9ffb981f80e 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 02af6541b30c..c515efe8c73d 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -3,6 +3,9 @@ DIST libarchive-3.6.2.tar.xz 5213196 BLAKE2B 355b5d402e352dee802513485ce7e047af5
 DIST libarchive-3.6.2.tar.xz.asc 659 BLAKE2B a4b0035ab2bda4129cdf0c99266cd1e5f4772d90de6e348c75958bc803f369d6abea85d9730c6c9a216466b35697faad8d265fb2c285545887eafde27d828887 SHA512 403e5f7dec14d8b1cc01fad5a249e7b7618a7b45bcb3361ea80d67d76b591b12ce97f2c88b23d5486505dd3b34c1f1643e02235a3e5fc5150ee5735946092efe
 DIST libarchive-3.7.0.tar.xz 5243356 BLAKE2B 8fb72a0504038c71584c0416c1d747b7f5c82266518704353e7fdf794bd9f9e2dc22b8fa2538fa8d12a3b9776581077040371d25647fe72c02a4ec5f3bb8d950 SHA512 f69ff7fbec7e909b6a03dd5b01c47316f95a277907409c8fba3930bb90d02cd9a329921eada59ca1afc9a19e34de7eb34e9d535bbc8cd98fb586f723bd0fdba8
 DIST libarchive-3.7.0.tar.xz.asc 659 BLAKE2B 5bbd535ce100fbfb7ed46f8d7a6957ebb590c07124de4192ae0b777ad3b3950e6406f1ccda97dde5b6e792be00a039621de21665df9989073ebd0a905299eda1 SHA512 eda3a4347fb8d7f78c8e0a73f621a4a731d46cafc2f46ac59cebe39f3ebd29b1c3db21772c2027b30c5c507f5f732c3876e94f319e62156d2a3146e412cad84d
+DIST libarchive-3.7.1.tar.xz 5254260 BLAKE2B 1a6fa4f5027effea3df1cfcd2d99b8b126fe03d727412b0a4529d6b2157c2c29490bcce206d0f771256c5ed6dec9612608c2c54c4861647f4e2892e0f5548adb SHA512 24380b9aa24434dfe39929ec85ede33580291023b20b7cdf03990ce62578eaeb389f5ca5680245a84c7aad51574c85a1fa3fad5254ec5395eadac1cb2130a936
+DIST libarchive-3.7.1.tar.xz.asc 659 BLAKE2B 5e72732d2e5a4f5f04f3510b3d81a148f23dffa10a3ebe709e816388c5a6e68c08ee2bbe36d81141d5ffa94ed64df3e4ca05994cda651c09589fda69a6a95e90 SHA512 6f6f6e5780c609bd9c6c359c210656f26afb585bda46988687e19d1e55f4f3260ea80bf11bfba1213fb3a3e1514c5c096692b4b9e96ffbadf06f85eb1227250a
 EBUILD libarchive-3.6.2-r1.ebuild 3842 BLAKE2B a50266df8498cdadbe66f1cf4b2ba0f8b697bca8ef1947581450be154609f39852c1128c417e2edccc0f9d015987ef202bb449af7c73bafdc6450564b662ec21 SHA512 356146837ea33ad2b5476b5676c1bc3d08d702c6c65f763472f67e939a671372420113ad9be986692c88984e2b274f5398eba66162a46d5619b46f696872faf8
 EBUILD libarchive-3.7.0.ebuild 4157 BLAKE2B 94e092769a55560e780c2691c518cec116c3dd5280a0a9e92b6e651847a331ef3309a9c8f347c4bff9b3f9b66babbd325597922c6e4e8404ca3924d670c5cb4e SHA512 002507e47c759a8c11be7773af5c4de58ad0433c0beac6d1544ea47d58c9377936ec69255fdad6015418cb9fbc65861294e5a6284eafd727eef2e058f4411edd
+EBUILD libarchive-3.7.1.ebuild 3988 BLAKE2B 619f7614c5318ddd5b9f02195546714b81adb04d44c33b5193d3f453b8abd5872015e23690f7235a71583de068165f08be5740af91547946ad73fa8d7e2b5234 SHA512 30bb60fee06bf17a2dd0bbb8f7a2826763680d9a13cd87c88d506bb831aa58a0ebe8049c68feeb1bac1fbdcc28d551196d2f75ed75f52f1c8ac382f0a6806251
 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
diff --git a/app-arch/libarchive/libarchive-3.7.1.ebuild b/app-arch/libarchive/libarchive-3.7.1.ebuild
new file mode 100644
index 000000000000..b647b4e474ac
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.7.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="
+	https://www.libarchive.org/
+	https://github.com/libarchive/libarchive/
+"
+SRC_URI="
+	https://www.libarchive.de/downloads/${P}.tar.xz
+	verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
+"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc
+
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
+	)
+"
+BDEPEND="
+	verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+# false positives (checks for libc-defined hash functions)
+QA_CONFIG_IMPL_DECL_SKIP=(
+	SHA256_Init SHA256_Update SHA256_Final
+	SHA384_Init SHA384_Update SHA384_Final
+	SHA512_Init SHA512_Update SHA512_Final
+)
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with blake2 libb2)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		--with-zlib
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdunzip="$(tc-is-static-only && echo static || echo shared)"
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+			--disable-bsdunzip
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+src_test() {
+	mkdir -p "${T}"/bin || die
+	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
+	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+	local -x PATH=${T}/bin:${PATH}
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	# sandbox is breaking long symlink behavior
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+	# some locales trigger different output that breaks tests
+	local -x LC_ALL=C
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+	# https://github.com/libarchive/libarchive/issues/1766
+	sed -e '/Requires\.private/s:iconv::' \
+		-i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 452d32d4a88c..40e5347a886a 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 371dfcb3e5d9..63bbd31299e2 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -1,5 +1,6 @@
 AUX signify-30-man_compress.patch 576 BLAKE2B b6c82f0737dcfd569bc781d84eaecad2c0130ce3397b12adc043cd65f8ff709b2a9021e2f0ed962d6a92e24e59fd04376fd55d38376e5bfa8caefd329fe23ee3 SHA512 23f01a3509912aa8a3ec8e77ec85cfa9f78df2ef11f15b9422fc1e8a93f13da800e333005e4e053ad8e586606eb151efd71983aca50834e89181a7b7b2862c07
+AUX signify-31-fix-build-clang-16.patch 848 BLAKE2B 5170271f72adc4bb3ab4e8bd90802976334956a966a3a1c1bf478ffd94b027f0d174969972e76400e9e9c7a9236172df6986e1552fcb3ccd284c7f6eab401e87 SHA512 f3f830b158aeea1ebecaab6cd4aee0e1f9d8ff2f3ff061af2a7af4415dfd7f58121a8ea0017c1fe054b87e2c7cfd85167683ed99c907a73a14b82df769c9f8b6
 DIST signify-31.sha.sig 246 BLAKE2B bb2dc91aeaa6dde10a1cc43f26385479509ade9d02ea6839b3305ae51623f60c281ca881097b66839b6e3297bdf25d4b2daa1e49b82ea0cdfbf628c7e21f7f28 SHA512 c83453a81382b8841054c749fdaef8d122edc9a96a0a92cead8f7141dcb57cfe18770e7777e7dcd1908ddc7d4c747088d5979537a3484b0859ce8d530db6d65c
 DIST signify-31.tar.xz 83480 BLAKE2B 090d0b326d549cd89f6f8fd86063455670d1d3915a8ab31ddc732cabb0b72b6ba8e00b3354b61369bde7caeec67eef41c012be66dd2e3212112f9a97cc63afbf SHA512 f39597ea278a7eb10b786909752fde59e16405f0bc76c9906f8014e9e7f6801b4733479eec765fb960b6062359954caf54a3460ff67258a9cff93fa978951962
-EBUILD signify-31.ebuild 1191 BLAKE2B 4d4c082642702cd30aeb8e77c587551a062603578be5382faaf8a02a24bfa1c4257b871aa747a000bad4b737e42fc8a50faa5d98ed1e6ee3afbb4bbf719f395f SHA512 a156daf506e87c92684ee78478e45ab6ada593740914bd3a55ee1433056f9d3fec53f72326956d88c67eb59eee5699d711ee20154963f5da812f986da906425e
+EBUILD signify-31.ebuild 1250 BLAKE2B d8117e37e49dc4ca13015665013c071853912e38a54f79340ddb62e1c57325c97648fd1770cd2039881528e86f5f8140ba8aa7f1db0795634e2929c2ce3787fc SHA512 42e54df5812af48fd94b2303dc8e00850cdb65909b50a35f71ce1c670943483fb98eb4fba7c1ba004f2beed04d1eb017d30e40392490a09241882b529cb987d5
 MISC metadata.xml 437 BLAKE2B 75f7f8a4b2475b052a41134e41ab274386c5f59847bad67ad3d8bd447984a2b42a119bbc60b13df0ebed9988f98ea5382c4aff4fa093cf44c7c8d2907d0db26a SHA512 ce3b623779a2b51556bb440df1b08f386f9fcdca641d1c0b06b3c2f0d1e98649ca8b45d8b32406f7b2b53a6f781c58121da09802c1fedb76e0c604c0a3627f44
diff --git a/app-crypt/signify/files/signify-31-fix-build-clang-16.patch b/app-crypt/signify/files/signify-31-fix-build-clang-16.patch
new file mode 100644
index 000000000000..6f03d5b5340d
--- /dev/null
+++ b/app-crypt/signify/files/signify-31-fix-build-clang-16.patch
@@ -0,0 +1,35 @@
+Upstream PR: https://github.com/aperezdc/signify/pull/43
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Sat, 29 Jul 2023 20:07:48 +0000
+Subject: [PATCH] Fix build with clang 16
+
+Bug: https://bugs.gentoo.org/894354
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/base64.c
++++ b/base64.c
+@@ -52,6 +52,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include "base64.h"
+ 
+ static const char Base64[] =
+ 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+--- /dev/null
++++ b/base64.h
+@@ -0,0 +1,2 @@
++int b64_pton(char const *, unsigned char *, size_t);
++int b64_ntop(unsigned char const *, size_t , char *, size_t);
+--- a/signify.c
++++ b/signify.c
+@@ -34,6 +34,7 @@
+ #include "sha2.h"
+ 
+ #include "crypto_api.h"
++#include "base64.h"
+ #include "signify.h"
+ 
+ #define SIGBYTES crypto_sign_ed25519_BYTES
+-- 
+2.41.0
+
diff --git a/app-crypt/signify/signify-31.ebuild b/app-crypt/signify/signify-31.ebuild
index 7f3e660468a9..294005cc7e9b 100644
--- a/app-crypt/signify/signify-31.ebuild
+++ b/app-crypt/signify/signify-31.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
@@ -16,18 +16,28 @@ SRC_URI="
 	verify-sig? (
 		https://github.com/aperezdc/${PN}/releases/download/v${PV}/SHA256.sig
 			-> ${P}.sha.sig
-	)"
+	)
+"
 
 LICENSE="BSD-1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
-RDEPEND="!net-mail/signify
-	>=dev-libs/libbsd-0.7"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/signify-keys-signify )"
+DEPEND="
+	>=dev-libs/libbsd-0.7
+"
+RDEPEND="
+	${DEPEND}
+	!net-mail/signify
+"
+BDEPEND="
+	verify-sig? ( sec-keys/signify-keys-signify )
+"
 
-PATCHES=( "${FILESDIR}"/${PN}-30-man_compress.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-30-man_compress.patch
+	"${FILESDIR}"/${PN}-31-fix-build-clang-16.patch
+)
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-30.pub"
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index b4ae88cd8443..5996b383a88d 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index f061b6c9e9b5..5b43dd581d32 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,16 +8,14 @@ DIST emacs-27.2-patches-6.tar.xz 11600 BLAKE2B ed8bfb8b2c086423e7bf9f8de5ffb929a
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 DIST emacs-28.2-patches-4.tar.xz 6168 BLAKE2B d2968c5f96dcf285f987d32aa8e2ad38c8c2cc7757f9dd83a1faa75efc20c1ac44d6944cf9bcbafbfaa34caae2e7ec24a28fa250d8f5206e4d27649cc2719cec SHA512 94be2c6f715b073ab76a1b3f36194ba6f9c299599b4ba4292a14970f1a2974634ed961d20f62b3939a18347d02fb8025628a7622910f64df0b9879f98dcf5c14
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
-DIST emacs-28.3-patches-2.tar.xz 3064 BLAKE2B 052ae1cbf0f04d4f2e99a7be91920bdbb7cd41b8c3a47ffc54523dd5d35800374db1c420a709e5ae4c102809887bebc8a32b2c4e4e96b91ed0965d3f1b800f5e SHA512 e448ab9ffe8d24773d9557262283d2fd3b79544bce8837df8b97729cee4f6c19d95bd3a7a6f0e3c6a477e4d7b6ec5215cf4d1911525f62fe0143f3990466864f
-DIST emacs-28.3-rc1.tar.xz 47896700 BLAKE2B 2d7da4a72cc1256c7b9d1157cd379a5373b6b55c01d94254d6aee25887991a8da694f3239a7f443adef0debbc300043ad4595b5934b6aa383daed10257bcbae0 SHA512 2cd4c5174a5ade6f928de3ff6aa1728fe0f18bd5b985d87b62f38aa083da14d9ae3db6372638548d33ef7bbb632823eabb051307d8fca6c78296bff3c79b2d2f
-DIST emacs-29.1-rc1.tar.xz 52073948 BLAKE2B 2267a0ce36412e327d592219a49aedbf487b0a4d01e40e2ea0f4bdec0a0bfbc673e6a0436773706e3c9e94a640d1a41917eb9e144cc1bed49c8b27513d1f4f82 SHA512 4e808831f973647dae2d72ec756e1d06ad5eb1b5e65c3360e7dbafc37115598c1ec1595eb037f2c2fcc0993e25b4864d5e2f83a34e57ed5830fa333d01360bd2
+DIST emacs-29.1-patches-1.tar.xz 1672 BLAKE2B c6852d5e653918b0a8fb2cfc2e25e9cc27b32564472410ac0ac76ec9c5350bd0a66b535327a8c2056b712cdaf046d12dab4cef232523a06436e7801d2516255d SHA512 947cd89502687fbac2849df5d0b0214f4a270a7b2da0458d402b2cbfefc2efac6902e693d64d1625efdcf3c0bb36967c1df47c391b8de2587839d2b7349279e6
+DIST emacs-29.1.tar.xz 52081008 BLAKE2B 5bec8fd7c63c04b93b2ad87c12c48373930c1b3c6984d139938ad1eb692af76417dc5494057225a04f77ce4797958056aa3522f50e3b0565ef5f060bb15f5402 SHA512 de10f2af462682019af680e6a82fd33feb05ce6d995bedf5756264fa06e29d90cab02c5884b0aeade1c5ab39cf064e0fb6ff9f78d9eedbd162f0a985945b9ec2
 EBUILD emacs-18.59-r15.ebuild 4342 BLAKE2B 08852c5c45cc4330fb7684be880272a3d2ebe71ad736226f6fb3300ea3a5ad615509ddec3f3f49cc9a563e12e37d3bce4c227f8778634a02a8e632c539877d13 SHA512 85e85041bdc5f509d874602602c7bf5a7ce220a8fbdb7af571570e50e37fba89ec07cfd312b555386aa82a87fa010737787cd829689a83506cc61f4eb84a3839
 EBUILD emacs-25.3-r18.ebuild 11103 BLAKE2B 64be034cea7fbe62eabf0765e137d8ec28c2d16f1e3b8ddc23568f0ea4ea7ea83622d9c64bc5fd2041520a488225a0cb8c9505c6738cf46ece0f0a8f46c0bfc3 SHA512 9d0c2da578e692cd37b7d1c2290764568292215bf29f82a4654900c545c26de509f762e062637f13c594e18feeb47823438db7b16003fdeca657c88468ea9d91
 EBUILD emacs-26.3-r15.ebuild 11832 BLAKE2B d180b093feefc98486bca2c449b9544248b0913a84ae4b6f635992011b93e68010809266c40c953a0c72670d40931ff86b3ef4f841dadf02cb9e2b197cbc54b2 SHA512 2163c3f58f6f3abe594665c1f21deb9d26485d5eac65b590e03a2294810eb4b0a1aec2244baefcdd3e321c019abd9d2290676af092b672c19ea46b0f24f69395
 EBUILD emacs-27.2-r13.ebuild 14364 BLAKE2B 79823cab6afa9f5e95372cc3b03a9f661905877e06071c9cc9eb39f88b820b14da78bcff24424f8e8d5ae694b192eda3a256c726b1b3c9caab079c5890d271b9 SHA512 6e41e07f80f2e10ef57ab38b4919183186bec58d0c26bff512e033afe5326a9dbb156db945ff90a3d9d9469c2e18828d82d37f4d47fbcd3cc3c04e2fcb1187fd
 EBUILD emacs-28.2-r9.ebuild 16873 BLAKE2B c91587269f004f8cb0f9b7e6650dc7a7c7db7f9e2f86a69546c0cee9bca244d1e7db7a7c476118b9e7c573fe7590c61844508449b34ddbe8d0809333d4aaf003 SHA512 666a920b2d84be00a4046ec61b5ba6a6f554270a38db8241eda14edee2f0dac6308ae4de0aeb64c6764aac4e7f40ba3e1ade39e7095930ec4ec2db323af3a043
-EBUILD emacs-28.3_rc1-r4.ebuild 17190 BLAKE2B 28216769ea035377a0c39fc92faad72f9ce7564eb2ca0df4cd23f676fb951f5b5d99a67598d46b79a782db44bdbd20140e0764ba24e1e7a18c455e44343530cd SHA512 4d198306776ab3e95e42beda2490cb265d41dde0edc8d54fb954bba07b50e544927796924897ef7f1770de4f5b987c6e90222ea56a542a33352017f6d16e182d
 EBUILD emacs-29.1.9999.ebuild 18407 BLAKE2B 0c39dd1a18854294f9935b3ff47ef890a8d67d1961ed3acce20d3f1505dd461207f9fc8538c04525cd28160e668584d6ce4bce1a8c9d7354e05e12a462945dda SHA512 df08259014851ef5c2c0f51a3dc586dbf67b407597fb6e35515779bed6f9f4653c849197334981d880fa2e741733c10584b36b9d1e73a1bab54d1a31b137a48c
-EBUILD emacs-29.1_rc1-r1.ebuild 18407 BLAKE2B 0c39dd1a18854294f9935b3ff47ef890a8d67d1961ed3acce20d3f1505dd461207f9fc8538c04525cd28160e668584d6ce4bce1a8c9d7354e05e12a462945dda SHA512 df08259014851ef5c2c0f51a3dc586dbf67b407597fb6e35515779bed6f9f4653c849197334981d880fa2e741733c10584b36b9d1e73a1bab54d1a31b137a48c
+EBUILD emacs-29.1.ebuild 18546 BLAKE2B 50cb0fb13d2c65a73fa09d50e7e42479058c5ae231981652f3dae6f51f392636b9a9af20d57e125072144fac9d4ed5baad24c0ca5523622dd9c0012cebd06f63 SHA512 8d04be880f979094f173faa36749375a06f97fc02d74604f4c379addffd360a660990a02933381993a482cd18f2ebb26a76da02d392987d40b8cf037ddfd34ef
 EBUILD emacs-30.0.9999.ebuild 18405 BLAKE2B 6c5e0c6391d5d96af061eadc5816c8a040fb981954a592643f80c23e9973854ac510f0234160ea4108e8e8075fa72f2d334bcdfffcd407828dc8a91345686ab6 SHA512 9b402f3999647c00aa3ad3031720c3681695c475bd3224804868288d106ae7557687c7339da2532d166a65dcc5d89b61d03799657feeef5020e34bdd16850297
 MISC metadata.xml 3265 BLAKE2B e4f61b7e8859672fe9798ebaae20d8fb490d4677db7be8a856f313f4dfd5f02b38623250ddc45cdab1f0d0b64b941b4874b95252c796e893d5a28e5a318277bc SHA512 4b79a448076ddee7de95dc2f1a999fb86295d04a20d016a9bb2fe8a038ee5424517ca8f1991a884a08ca52847191c83becb06fb7cb8d4bb2a609cf4b2e25d020
diff --git a/app-editors/emacs/emacs-28.3_rc1-r4.ebuild b/app-editors/emacs/emacs-28.3_rc1-r4.ebuild
deleted file mode 100644
index a53ea1f1c3f6..000000000000
--- a/app-editors/emacs/emacs-28.3_rc1-r4.ebuild
+++ /dev/null
@@ -1,531 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-28"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${PN}-28.3-patches-2.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	jit? (
-		sys-devel/gcc:=[jit(-)]
-		sys-libs/zlib
-	)
-	json? ( dev-libs/jansson:= )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	valgrind? ( dev-util/valgrind )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18[X] )
-			!cairo? ( x11-libs/libXft )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			x11-libs/gtk+:3
-			xwidgets? (
-				net-libs/webkit-gtk:4.1=
-				x11-libs/libXcomposite
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	if use jit; then
-		export NATIVE_FULL_AOT=1
-		find lisp -type f -name "*.elc" -delete || die
-
-		# These files ignore LDFLAGS. We assign the variable here, because
-		# for live ebuilds FULL_VERSION doesn't exist in global scope
-		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
-
-		# gccjit doesn't play well with ccache or distcc #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
-			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Prevents e.g. tests interfering with running Emacs.
-	unset EMACS_SOCKET_NAME
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use jit; then
-		use zlib || ewarn \
-			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
-		myconf+=" --with-zlib"
-	else
-		myconf+=" $(use_with zlib)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=" --with-dumping=none"
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=" --with-dumping=unexec"
-	else
-		myconf+=" --with-dumping=pdumper"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		--with-pdumper \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with jit native-compilation) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		${myconf}
-}
-
-src_compile() {
-	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
-
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_test() {
-	# List .el test files with a comment above listing the exact
-	# subtests which caused failure. Elements should begin with a %.
-	# e.g. %lisp/gnus/mml-sec-tests.el.
-	local exclude_tests=(
-		# Reason: not yet known
-		# mml-secure-en-decrypt-{1,2,3,4}
-		# mml-secure-find-usable-keys-{1,2}
-		# mml-secure-key-checks
-		# mml-secure-select-preferred-keys-4
-		# mml-secure-sign-verify-1
-		%lisp/gnus/mml-sec-tests.el
-
-		# Reason: race condition
-		# Looks like it should be fixed in 29.x at least:
-		# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706
-		# files-tests-file-name-non-special-file-in-directory-p
-		%lisp/files-tests.el
-
-		# Reason: permission denied on /nonexistent
-		# (vc-*-bzr only fails if breezy is installed, as they
-		# try to access cache dirs under /nonexistent)
-		#
-		# rmail-undigest-test-multipart-mixed-digest
-		# rmail-undigest-test-rfc1153-less-strict-digest
-		# rmail-undigest-test-rfc1153-sloppy-digest
-		# rmail-undigest-test-rfc934-digest
-		# vc-test-bzr02-state
-		# vc-test-bzr05-rename-file
-		# vc-test-bzr06-version-diff
-		# vc-bzr-test-bug9781
-		%lisp/mail/undigest-tests.el
-		%lisp/vc/vc-tests.el
-		%lisp/vc/vc-bzr-tests.el
-
-		# Reason: fails if bubblewrap (bwrap) is installed
-		# "bwrap: setting up uid map: Permission denied"
-		#
-		# bytecomp-tests--dest-mountpoint
-		%lisp/emacs-lisp/bytecomp-tests.el
-
-		# The following tests fail with USE=jit #874681
-		# ert-test-record-backtrace
-		# loadhist-tests-file-dependents
-		# loadhist-tests-file-provides
-		%lisp/emacs-lisp/ert-tests.el
-		%lisp/loadhist-tests.el
-
-		# Reason: hangs in gpg #907839
-		# epg-roundtrip-1
-		# epg-roundtrip-2
-		#%lisp/epg-tests.el
-	)
-
-	# See test/README for possible options
-	emake \
-		EMACS_TEST_VERBOSE=1 \
-		EXCLUDE_TESTS="${exclude_tests[*]}" \
-		TEST_BACKTRACE_LINE_LENGTH=nil \
-		check
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
-
-	# dissuade Portage from removing our dir file #257260
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# verify that the PM hasn't removed our Info directory index #257260
-	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
-	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-29.1_rc1-r1.ebuild b/app-editors/emacs/emacs-29.1.ebuild
index 8d9600940ff3..3e3f1aa9b774 100644
--- a/app-editors/emacs/emacs-29.1_rc1-r1.ebuild
+++ b/app-editors/emacs/emacs-29.1.ebuild
@@ -31,6 +31,9 @@ else
 	elif [[ ${PV//[0-9]} != "." ]]; then
 		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d42aec6f153b..e27103e8ac99 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 15ee22f0d294..9cc6405c56b0 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -2,8 +2,10 @@ DIST pikepdf-7.2.0.tar.gz 2913496 BLAKE2B 6992b9e64e7bd718fb09c5cd3eb77937c802bb
 DIST pikepdf-8.1.1.tar.gz 1804397 BLAKE2B c9e990558e761f8597b5519b935a96503ae685747de26b987c91db44b5c3772af993691c4ea0696b0eb54a4ea8d02395724153a0f714738c446049f2b664394e SHA512 7152137e9c11d402095d6aa06e8aa99eade71b35aeb85c9bd5d5811bd3aa785e51792e9ede08110e101893daabbace6d6aef68fa475f2a89e98b5d4de5d2f5bb
 DIST pikepdf-8.2.0.tar.gz 1804342 BLAKE2B 4df7b873833b854291808176cca10844934d6ed475dbc330c6beca0fb7a31d4db0b2a6fd6dca10ef6f5345c49cb49980c2d46247d3efd16423209953b345f6ee SHA512 196ec76b3dc81dfcb51b4dab5be7c3598c33616f94bd4bc1d10fbfd6b46a1d761a530c3ed076e4f7cb37ea55e9c27f079e294be15222b99fca0525bd3a462ccc
 DIST pikepdf-8.2.1.tar.gz 1804043 BLAKE2B c8c80dd61cb2703eb7454b2a006a14760da538e0fef75053a75bd49aeb6a5233e9f72ac3d0acad9c02afe1973b90e4a9bed3af8482d34e9e3274aadac5d35cd0 SHA512 f4850f55897af0177bfbb492dffd5250378d01ef721c30b931ecf6c9f79808bcfad20d5335089f73677396737c4e98441e98c235b38539fe50f5200d14222988
+DIST pikepdf-8.2.2.tar.gz 2847110 BLAKE2B 084c09f92f1ca133a6b39e14782c355369c714a17040c41c0dd13afe28577b9f6bcc10ed980b69acbe7c9e73dc85f11625669539d5b2e18991a86f5fa400ba16 SHA512 19dfabe0df425a3a519659f54e65ae6afdfea0df6f1b104ac2807d3cab49ac1b7dbf1c589b41dfabec4ffb95db593c788da7ed7c4dca76a515d90453e082f371
 EBUILD pikepdf-7.2.0.ebuild 1509 BLAKE2B 3731ec955033cb1ac2af6204f8b88480758e61a0c6a519a3de50e40079dbaff18e166123b6c8d40190a51568c637fc4f299247f7447cc03baba51486bddc161f SHA512 e17e00c2b0c471eade4b1d2806dac4a73c213fdf71c795d85d5910e7614a318c32e77eb162fcdfb517e38ad0805ad4930315502bde99065230dc20c09a1e405a
 EBUILD pikepdf-8.1.1.ebuild 1564 BLAKE2B fb357aacb6948b3ee7094e6797f7bae872979b12b01811571b4c069cf669df7d7c3ad4c3b02177c03ccac1e71ba8a79efab8ca9c9fb8abfc8179845b559d3223 SHA512 57b2b82fb6fdbbe24dd39b6653e4510aee17baa1ef206ff559016cf600dae4c3be5b4adbbe598ab2fcb7061d2814b605c66b58b3fa8d3d54ae5c54281caff531
 EBUILD pikepdf-8.2.0.ebuild 1564 BLAKE2B fb357aacb6948b3ee7094e6797f7bae872979b12b01811571b4c069cf669df7d7c3ad4c3b02177c03ccac1e71ba8a79efab8ca9c9fb8abfc8179845b559d3223 SHA512 57b2b82fb6fdbbe24dd39b6653e4510aee17baa1ef206ff559016cf600dae4c3be5b4adbbe598ab2fcb7061d2814b605c66b58b3fa8d3d54ae5c54281caff531
 EBUILD pikepdf-8.2.1.ebuild 1564 BLAKE2B fb357aacb6948b3ee7094e6797f7bae872979b12b01811571b4c069cf669df7d7c3ad4c3b02177c03ccac1e71ba8a79efab8ca9c9fb8abfc8179845b559d3223 SHA512 57b2b82fb6fdbbe24dd39b6653e4510aee17baa1ef206ff559016cf600dae4c3be5b4adbbe598ab2fcb7061d2814b605c66b58b3fa8d3d54ae5c54281caff531
+EBUILD pikepdf-8.2.2.ebuild 1564 BLAKE2B fb357aacb6948b3ee7094e6797f7bae872979b12b01811571b4c069cf669df7d7c3ad4c3b02177c03ccac1e71ba8a79efab8ca9c9fb8abfc8179845b559d3223 SHA512 57b2b82fb6fdbbe24dd39b6653e4510aee17baa1ef206ff559016cf600dae4c3be5b4adbbe598ab2fcb7061d2814b605c66b58b3fa8d3d54ae5c54281caff531
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-8.2.2.ebuild b/dev-python/pikepdf/pikepdf-8.2.2.ebuild
new file mode 100644
index 000000000000..7cd819dbbf60
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-8.2.2.ebuild
@@ -0,0 +1,60 @@
+# 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..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="
+	https://github.com/pikepdf/pikepdf/
+	https://pypi.org/project/pikepdf/
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=app-text/qpdf-11.1.1:0=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pillow-9.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.36[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.{8..10})
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fragile to system load
+	tests/test_image_access.py::test_random_image
+)
+
+src_prepare() {
+	sed -e '/-n auto/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 24c5fbf1b1d2..54a21b376379 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,4 +1,4 @@
-AUX pybind11-2.10.4_macOS-GCC.patch 900 BLAKE2B 22d2e59db7d9c26064cb65ba8a6847986a2c4224bb7507b5fcf8f5deb48e65976bea717d3dd1876652429c2c6e9e41875480aa182ddd0bb039799e957554d04c SHA512 d71dee88b061b48e8c707e3a67062e297ff68f7ac3b6af8fdbc0cabd278a678af1e3376193e9507ef0368ecf9572b4cf6390cc7743d17551581dd5e4acbdf699
+AUX pybind11-2.10.4_macOS-GCC.patch 867 BLAKE2B e74c330552e5c1c842d557a37cc6de7ae460d80baf933dc486745b492ae0faba532c6ce12a907c317e8ec15608b59f7441d66757522a5acb1b575f1d13bc515f SHA512 05ef16cfa228c1ea7ca28d432ad5e1680990e9bfd2095c88d0aad3b3a27b158a45f9b18517171310f56bd5076306d49d0221310c6b9d6914648f76b20a3e4fe4
 DIST pybind11-2.10.4.gh.tar.gz 740622 BLAKE2B 7b2d86e8262581b2cc6dd720b83336206e242ef8ca99b257b01a11141ed8b127d7f35d7d573bc763dd36f2fe8c8ac91766089deb63a76e9c10029c34eec2d6d3 SHA512 7970defbb6d057a44468ed707c80bfa6ef8c9578528fbc084b03aeea20a52dbd681581f82d55ff90af11ee89693379bd79e2ab6603239ba05b0aa8da29dd93c7
 DIST pybind11-2.11.1.gh.tar.gz 756445 BLAKE2B 66ad933ffcd7fd475121f0b7488e13b914cb090d0ed511b96070e2849dcc537fb55e865b72fe06da6c5d1e3ed8e438799c5b0b60cbdc71e5713530174bff3be9 SHA512 ed1512ff0bca3bc0a45edc2eb8c77f8286ab9389f6ff1d5cb309be24bc608abbe0df6a7f5cb18c8f80a3bfa509058547c13551c3cd6a759af708fd0cdcdd9e95
 EBUILD pybind11-2.10.4.ebuild 1363 BLAKE2B 3eb66771750d56d7acee9208fd6dac13d95a83dbe81dd3a5e59f23d4323d1dee7eace4cb8925607843533a34aecf42fe0a6eae2c827879348265fece46fefee0 SHA512 9260291f7e30f4d0360bff665b29f76f5f99707e2ebdacd8f71a5c83007b5f18237fedb169bb0d13a8d22930be8fbda5d4ee3f6e961fc17d9f0d5ac916687774
diff --git a/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch b/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch
index 5bfa88348110..cbfcff84a684 100644
--- a/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch
+++ b/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch
@@ -2,8 +2,7 @@ Break the toolchain assumption of LLVM on Prefix/macOS.
 
 At Prefix/macOS, the system compiler is GCC with libstdc++.
 
-This patch is only useful to Gentoo Prefix.  We don't have plans to
-forward it upstream.
+Reference: https://github.com/pybind/pybind11/pull/4639
 
 Signed-off-by: Benda Xu <heroxbd@gentoo.org>
 
diff --git a/dev-python/scikit-build-core/Manifest b/dev-python/scikit-build-core/Manifest
index b4a4341d728d..7f7798b1bcb7 100644
--- a/dev-python/scikit-build-core/Manifest
+++ b/dev-python/scikit-build-core/Manifest
@@ -1,4 +1,6 @@
 AUX scikit-build-core-0.4.7-setuptools-hooks.patch 1289 BLAKE2B 628510dd9638190ca4dae89c3b2dced2a2986a43bc556aa078162f22da5e4976064ee3058b220d3ab2f4f9fe8f7d26f51287b08e1af97504eb15c97f83313e75 SHA512 ea5c0837e363d0a62bd492056f4efee5abbfbc234ea32049c411dd794f3cbf6bb4c6d7dc77cb4337c6a164342d99b4e0de0bd96209512dd01ac1626a76e1980d
 DIST scikit_build_core-0.4.7.tar.gz 161024 BLAKE2B a06136ca6144305290dcebacd33690556ce30c28793572adfd7b42b043d4bb7f2e6e8000fcb543608d33a130f7094683a31870aa40067fb24fbb453fed884ccf SHA512 39f99facc920e3a46a3592d15ce9f3ceb90cf92dca8a010546a9cc15d50ea7737951286b6474f2f3f68f206f4fa7d157931fcfa831e122f51266df56ec5f043e
+DIST scikit_build_core-0.4.8.tar.gz 163396 BLAKE2B f432d144babd6be45a730e0566cf6fe8bea051b85364b0af26655e0679a0d458f3fd106e816f09557110a6e4e1fed056d1c6454c044ab34dfcc6530cad6020e3 SHA512 55ded022de13bbc60e5abed7b39466751abda3d66a0fa1c094ccd3ab28a93ac3437db2fb8e53381bbe0f7da9985ea5a6fd129af24e6654d3df48c704fb4612f1
 EBUILD scikit-build-core-0.4.7-r1.ebuild 1252 BLAKE2B 5a37c30fce41b4db4c357d54ec3891edbd248593cdee06ad2af5f870a3ea6f37293b5b3c5aaf8b636c37550bbccaa568e6641c350c7d18b45c65b037ac4ce9ab SHA512 56bab5fde5d23e58fbf4b8f0ce45734c4d1674586e40dfef1f5c52a4640c1147f229776c4376f9958bcf2f3fd27c588c6e5ad64697eecc2c3ce61d6e38d6cfba
+EBUILD scikit-build-core-0.4.8.ebuild 1196 BLAKE2B cc7aa554ac04d64b84c59c81f11aa07c503a740e57955adb142b79efca1797ccecab104af2a9664f368cea60512e9c26815637b7fe16a4367453c15b457fd3e4 SHA512 3f2a3d7ff1df60b2214a88e54820f7da0a7fcfef4f75514d9c14e206c2fa3fce6100ba17e06aae1aa5449f2b9884ce98bd69ef9db13f2896cc75014081c479d3
 MISC metadata.xml 393 BLAKE2B 25bdc0bc295ed4bd7cd76a5a6952cb7fa5d5a404d3260562f2ed322d80f2466add0373a2a6b10a41c4dc2211e82e0a680735301d8844e70a54760301b4ab190f SHA512 176537f2027aedb3bc8bd16bbbcde8bfed246d621763e22a979f2942c016e1bafa5ef2d11d8d078e5d59970ea115864a8501185343bc3d4b9fd8493adbd16aab
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.4.8.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.4.8.ebuild
new file mode 100644
index 000000000000..9cf9fc3a704b
--- /dev/null
+++ b/dev-python/scikit-build-core/scikit-build-core-0.4.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Build backend for CMake based projects"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build-core/
+	https://pypi.org/project/scikit-build-core/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# we always want [pyproject] extra
+RDEPEND="
+	>=dev-python/packaging-20.9[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+		>=dev-python/tomli-1.1[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		>=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -m "not isolated and not network"
+}
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
index 85ee03da6fd3..ba2fa7b6b25f 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -1,5 +1,7 @@
 DIST typeguard-4.0.0.tar.gz 66064 BLAKE2B 250ef359fedb83df7573c9acb97f80fbf1d5b949505deb3d3757422aedadda65a106bf9533d858e13e2c49e0212a40a8604fa2edc8b24903e374a678985f4c85 SHA512 2acf8b9aabaa8d4cce75e1ff23aeae4d1445bdfc28044c74b8e96127b1e740287e5da89bd49bea92229ba5c02c7cec3b0e25126fa35eb5163b798b2087b1df6a
 DIST typeguard-4.0.1.tar.gz 67242 BLAKE2B bf0b092402e4044675f1252a1ad4657fa8ec316bfda5e0afcce609f616e8d86998c059544ebbeea73eb5fa627eeae9371d46581b33891319f7b2385faa359310 SHA512 2e93086309550d6b98f2087a8900797ab9486c1a969da649d1a6cb508f6154b57b6807762e87df43088f80b69bcc11f87c71d83b38ca205d3ad8878a2cd4eb0e
+DIST typeguard-4.1.0.tar.gz 67584 BLAKE2B d2f6777cad306410d4a536312a981600371e0e0cae224eee286e3b6bd48a0777ca587eb44b4f48fd9a2c7fe5e35d274f5d1c2eb508ed9708b25b686b395976fb SHA512 5a1a374c1b9679cf1d840a750698caea47deae0fcec8eda3312773fd8eee8ccc533030b78c8e1c8bfae6bee79c323ba421176b2c8d2e85a87444ba767891ede7
 EBUILD typeguard-4.0.0.ebuild 935 BLAKE2B bf19f1cd2d294e04bc1d82a50b6267b2ba17d7eeaf661d48c255870faa107cc36c67bb42bc867710ed6b1a490b41d9e96fcdd19fbbb7fc6d30727a14d2f161dc SHA512 e8859fc93d549d256688d4c24232103656a83f506f46bb3eb2ba2164f08ce438ecec0045ff871d2bec15c8237a978fc4736dbfbbd43bc7ad4583168cf19b2cfa
 EBUILD typeguard-4.0.1.ebuild 950 BLAKE2B 2b2d2fa0e9280109e759a645654171a5c0ad33f833d34723a0a4d3b789db33a1f9a941a8978757b5a77219422b0539589e6ce70bb1d4ca977bcd7641a9b0d21f SHA512 d85725b17e1e1ccfdfb586d6c3a453822684f15697977e6795c75bf786283c5c22f224d5cb7b4deb1ef2fc70d00a3b5cb8cedb3f555f1695af0f3ba019b13b9c
+EBUILD typeguard-4.1.0.ebuild 950 BLAKE2B 2b2d2fa0e9280109e759a645654171a5c0ad33f833d34723a0a4d3b789db33a1f9a941a8978757b5a77219422b0539589e6ce70bb1d4ca977bcd7641a9b0d21f SHA512 d85725b17e1e1ccfdfb586d6c3a453822684f15697977e6795c75bf786283c5c22f224d5cb7b4deb1ef2fc70d00a3b5cb8cedb3f555f1695af0f3ba019b13b9c
 MISC metadata.xml 350 BLAKE2B 78dc7293e08dae7974b38d84ce457ceddc5888a7278c1b149b8ba3057f07130b2e002dd78a9df91fd09d85b7ebc26272b4c78dd96c6cdd3938cff67b9c451366 SHA512 1fe4c4164b0732bd294815dacdd46a70ace6e8886343491232fb59b6b3697316c3eac5dd72e2e4758d87fd093d845f4453b8f278009be640ca1555413f47e869
diff --git a/dev-python/typeguard/typeguard-4.1.0.ebuild b/dev-python/typeguard/typeguard-4.1.0.ebuild
new file mode 100644
index 000000000000..2d5d1842fcbf
--- /dev/null
+++ b/dev-python/typeguard/typeguard-4.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Run-time type checker for Python"
+HOMEPAGE="
+	https://pypi.org/project/typeguard/
+	https://github.com/agronholm/typeguard/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.7.0[${PYTHON_USEDEP}]
+	' 3.{10..11})
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# mypy changes results from version to version
+		tests/mypy
+	)
+
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# the XFAIL test pass due to some package being installed
+	epytest -o xfail_strict=False
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index cd62b8270e2e..48a5c71cee93 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/optimist/Manifest b/dev-ruby/optimist/Manifest
index 09a9e529ce40..dfcb172de4a7 100644
--- a/dev-ruby/optimist/Manifest
+++ b/dev-ruby/optimist/Manifest
@@ -1,4 +1,6 @@
 DIST optimist-3.0.1.gem 30208 BLAKE2B 66778029b9e2ac2eb38beaab5cb73a4fe58b123c401fdfc00d924073a6dd97dca05bbf8ab3a88e47ca5f94ed920a583196d901c6a2a4962e93c8a2ef905173ba SHA512 209fbb355a7ba75208cef314ccaa188955463551d1c914f10409cac189375b5be40fbcdf0d88a5ce825c527bca7138528fafd6f37cf73f5e68f3b453f3ef8485
+DIST optimist-3.1.0.gem 31744 BLAKE2B 0fc27447a6263e2e7acde502f4b4a23d891f08f57c70655ac1057b0e2c3e33c54c215d6d27079d09305771028347473f39e4d0f547ad002237fa8808e0a8cf63 SHA512 adadc1722d970cc4c002a0983d0ab2dbb3683777310c7085950e07fa18c94e4ab788bd10bca9e1d076cf77637d09e2d6bb969f5d5b35f0b648881e744f42c785
 EBUILD optimist-3.0.1-r1.ebuild 668 BLAKE2B 8a6cde08c4f795be7318378c86d5455a32d20935675a79861fe47ac4e4345f6844960131c3249c537e331407e83d8eaa3d0d596e4c896a04810a62ed841c20f3 SHA512 d0fc9d71280b1bbefacb59215c1c1c86edeba8ce902ff450ba1fb685ee31532d4ec872265fd5bc67e57a1435e915e5625e902796b9430e9be1948a28c6bd0f9a
 EBUILD optimist-3.0.1.ebuild 677 BLAKE2B cb0ec44b7e22ea289dffb420515702241a24dcea0cc2e10af818371f2253c9482867b9eb1b271a0c44f3bbe4d6b1414a25c053d09759c19d9e849916b19f8ec5 SHA512 8c712bd5e16c40dcb8db2cb1c400902de366b44357c0913d909d6f14f1aa8b1a963547d32a77884b606632d32a81ff2db0dc248481fd94c8ee719f7fa682bfb8
+EBUILD optimist-3.1.0.ebuild 668 BLAKE2B 8a6cde08c4f795be7318378c86d5455a32d20935675a79861fe47ac4e4345f6844960131c3249c537e331407e83d8eaa3d0d596e4c896a04810a62ed841c20f3 SHA512 d0fc9d71280b1bbefacb59215c1c1c86edeba8ce902ff450ba1fb685ee31532d4ec872265fd5bc67e57a1435e915e5625e902796b9430e9be1948a28c6bd0f9a
 MISC metadata.xml 616 BLAKE2B 8d6758c96e9cc64b4e24ea5b3888dc012f4bcd3c43d7eb807834a56f10684ad8d1fbc4db9158aa4b171545488f381daad7faf3fa1bda0cc07fc222d4a9d20518 SHA512 9d7a4cbee9874bb23414c348c0f7809f09a770accea4f5c1af0fcb6e6447510af7840c39567969c38607bc6434b6398332f6e21311c752e8428acac4e826564f
diff --git a/dev-ruby/optimist/optimist-3.1.0.ebuild b/dev-ruby/optimist/optimist-3.1.0.ebuild
new file mode 100644
index 000000000000..1abe03c9e1f4
--- /dev/null
+++ b/dev-ruby/optimist/optimist-3.1.0.ebuild
@@ -0,0 +1,28 @@
+# 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_EXTRADOC="FAQ.txt History.txt README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A commandline option parser for Ruby that just gets out of your way"
+HOMEPAGE="https://www.manageiq.org/optimist/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="3"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/chronic )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundle/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	MUTANT=true ${RUBY} -S rake test || die "Tests failed."
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1fd3e9b64a0e..47cc1b0864fe 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index 1b2216612a2a..530acea9a1b8 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -1,9 +1,4 @@
 AUX rocm-cmake-5.0.2-license.patch 631 BLAKE2B f3beee352aa6dba1d8b30e9e4193915d8b97d3aac3143f79b12c7b6f438a3557d6ee3eabb7835764cb5b2470f6f6f20ef82757356bd8e2f43eeeb8e20966d4c2 SHA512 818a019b93cfa0712fdb8faba32e7415aafa68b337cc147f3259165ffc028ec2e0353cfb0680053cdc8e8069c75df07356939eb7adb5b1295010e4d501a59546
-DIST rocm-cmake-5.1.3.tar.gz 39781 BLAKE2B 9ffe9ce6390889b651ffbb8019dc8f0274f8aa3ac7cf14da05f828ab952c575ff34e120f0cef3b3fd46bff208f47a3d293feff2c77a1104e942c5d9f4303f61c SHA512 31dfbfd822a9b6f817ef459df171e4a2ba16556d00ad8b3b5be3ebebffe03cbbd815d394cc6452509e47424a3cac50e523e31923b2b9c48d586163ead2338c74
-DIST rocm-cmake-5.3.3.tar.gz 45846 BLAKE2B d2560c28505b43bba242e02c79faebef6f9a87b6175825c1fe9c98f1a55804286a3d417f7eb325b0d56ffc9b081617046ba212fcb399c788cc41479da508d5c9 SHA512 0d2f06eb68fec297db0001529bf0780bec3f25a7e915f30713736068075bf13445faea3f47c811002cd2fdf0cab4baefd69420497391e27bee466744eafd46ce
 DIST rocm-cmake-5.4.3.tar.gz 46215 BLAKE2B ecdf93829ae77c1046157e4c8f219b74ebd30798e11be5fd270fe8dd568cbe5bbf25abdafbe18b0dcb185d97ca535a9aa2a1dfb7d973d17f167776b120f553d3 SHA512 fe039ea5bcab142c8cd3723aa570253f13f03fe5c500b0828275cc246a034ed52b9b7a47994e4caf72ae0402acf4e73e80b28224cc7874d85f94fd8e0e42947c
-EBUILD rocm-cmake-5.1.3.ebuild 775 BLAKE2B 2e5d016a04ac4837e1740f2961870943617bc447f8dca2fd024cfd3f25dbdbef8ad26a981b681a2feb840900824da832a75db73cfa3c53246b3b1cf31813c193 SHA512 a5c69b0d930960f560eb2fca33a39bd627c99528f052d85a94f3c5e951d47bb7e927d1a5e29e0f8804eb96900e339136cbbb500a2f4b5f794698742ce44c5673
-EBUILD rocm-cmake-5.3.3.ebuild 775 BLAKE2B 2e5d016a04ac4837e1740f2961870943617bc447f8dca2fd024cfd3f25dbdbef8ad26a981b681a2feb840900824da832a75db73cfa3c53246b3b1cf31813c193 SHA512 a5c69b0d930960f560eb2fca33a39bd627c99528f052d85a94f3c5e951d47bb7e927d1a5e29e0f8804eb96900e339136cbbb500a2f4b5f794698742ce44c5673
 EBUILD rocm-cmake-5.4.3.ebuild 775 BLAKE2B 773763137654d178de9f0e0f5077d5b5da2ad8a02d72791eebab1aa9c66081fc743fc99791d7c048aa0c88a15c2b2c140cc614d8fd63815bc37c32386c7d462c SHA512 d775c6c36ad9625e23356a12e2f6a94441262214b80e5625001a3691f3e150744a33fcdf71408e0dc3ea0b02f427f5bfb0a8c61030ad24842b4def9d3239c1b8
-EBUILD rocm-cmake-9999.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
-MISC metadata.xml 372 BLAKE2B d476bc60c5fdfc14c214db2fa6cdb09e97a99ee4a6320e51db7332afea9ded612e54e44680474e662810fdcf70d01457f582bb9495ef20fd98fd1b008f636e4c SHA512 2ae528e0cb9221b053295cd2eca87988905b08429e81b911f21163770164d27444f5227d2bb26174d46cde2c054a1bc8c3a120c8e0f404cfa92f98c64253a481
+MISC metadata.xml 504 BLAKE2B 5b7976e66353bfe9bec6d7c7ebb318d4f3922f4128e0a5f224fb983b876d9fd328c0d3dea68f4d92f3d740555eaaf5ef99de610957f0375076a3e8f5df04eb99 SHA512 32299ceb61b177b44e8117c5e2d249df25f75ddb5398bc1bd62bcb0462347a183fcdac6f9c14d6e2fd076d860dab401d9e6f7714ac3492adea7268edd953421f
diff --git a/dev-util/rocm-cmake/metadata.xml b/dev-util/rocm-cmake/metadata.xml
index 35af674e4e15..e13f2f7b5728 100644
--- a/dev-util/rocm-cmake/metadata.xml
+++ b/dev-util/rocm-cmake/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+    <maintainer type="project">
+        <email>sci@gentoo.org</email>
+        <name>Gentoo Science Project</name>
+    </maintainer>
     <maintainer type="person">
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
diff --git a/dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild b/dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild
deleted file mode 100644
index ac9cb2351f34..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute CMake Modules"
-HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.2-license.patch
-)
-
-src_prepare() {
-	sed -e "/ROCM_INSTALL_LIBDIR/s:lib:$(get_libdir):" \
-		-i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
-	cmake_src_prepare
-}
diff --git a/dev-util/rocm-cmake/rocm-cmake-5.3.3.ebuild b/dev-util/rocm-cmake/rocm-cmake-5.3.3.ebuild
deleted file mode 100644
index ac9cb2351f34..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-5.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute CMake Modules"
-HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.2-license.patch
-)
-
-src_prepare() {
-	sed -e "/ROCM_INSTALL_LIBDIR/s:lib:$(get_libdir):" \
-		-i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
-	cmake_src_prepare
-}
diff --git a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
deleted file mode 100644
index a8e68baa5599..000000000000
--- a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute CMake Modules"
-HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="test"
-
-src_prepare() {
-	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
-	cmake_src_prepare
-}
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index b32269406b69..61bc296d306f 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -3,7 +3,7 @@ AUX rocm-smi-5.1.3-detect-builtin-amdgpu.patch 983 BLAKE2B c1d926ce5ce1bef272f71
 AUX rocm-smi-5.4.2-detect-builtin-amdgpu.patch 1071 BLAKE2B 1957d49b0c3c1f9db24add59b8dd464c6ce8571ded2601cb259a0686938e4fb718b6affd99c366f6e8aa360f53034c0e7c231dd3518bcab84bb8d5a755c4ebb5 SHA512 a531b3ae4b73dcd03e6f3de3da4dbf1250e6a6d05ec052fa8ff412f65233b5fcd418a7128f9b913aa71e1bbf970ba5b74c7b407a0654e1030f695e7f13ebd5dc
 DIST rocm-smi-5.1.3.tar.gz 1701386 BLAKE2B c5e779f5c33fec0b1b39b09c758dfadd3c24e28f15381593f2959e5c2fb9f49af3a7ca1f9ab7d6bf34c5af4fbe3f0c0ae20c6c049cbf9421a9184735bb4a64a2 SHA512 7bf7af2b42a035c298c2f9009b6123671af41f9ca1a50607cfa362f39dbd82ff88f8c13ece6c4edab585edadd9072ed096a400dd3850851e1beef3633a8eb14e
 DIST rocm-smi-5.4.2.tar.gz 1553259 BLAKE2B 0560e115028caafb1d5dd8892cfa677431b792714ecd8c75f31451fa7685d1c7070cbd687c894d7eefd112de5e2df9aa7895aa57821db207dffc4e8890898638 SHA512 0fd651593df0ebbcb2c2327d030d2674efacdb6e883daa5a8adf733db2bde3e5d16dc304856221f4bb07a3cd834944ffcc7ebd689624f7ba24ffd6c262ba74b8
-EBUILD rocm-smi-5.1.3-r1.ebuild 1850 BLAKE2B ca355e03af98c2af6426ba44e7282d346a5b668c8b9139d2e574bc87e8c2e2641227be849398d956cc9fa12d094016d6c6979849a6ef1c4fa0379c5b8839b3e9 SHA512 b3617a2c4bbfe9287b399d9bbbca898ac0b2fd977fd624f5357e74212a30915c28c7b3b8d656b02743a197d9ec5541e684a6aef24cd84815d12651adc46cc4a4
+EBUILD rocm-smi-5.1.3-r1.ebuild 1850 BLAKE2B 9f7cbf7d5ec55ac112980609f8a924b5678aa4fa5cf75cdda3d80ad90c15ecb5f1d129a21c0248985d7f4e792abbcd3f0d822e8e10e76314ebaa5fc240632ae9 SHA512 30181897335c17d81a9d9dce8c4417c62fe66a20d557251158bf2a8ffe6fc075e51878a4bd42708ef47a89022fd03a97b4dccca1f5ee450d098cf66af1095158
 EBUILD rocm-smi-5.4.2.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
 EBUILD rocm-smi-9999.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
 MISC metadata.xml 661 BLAKE2B ed6ec563956132012b44907f348091135c7a463fc47a51ac0726e7749da9a4c33811df87442e576fb510799a50c14949cd20c8ca10a5850ee941a8794b70ef7d SHA512 c047963068b4ccefb73539ecd91b4c3310f0863a674acb15e9843dda7f0c917616dc8cbfe5f859e42d9ee25323bf1b66b1ce7fbe9a2e8292963ac38aa0bd72f3
diff --git a/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild b/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild
index f2b4fc660707..71783873843a 100644
--- a/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild
+++ b/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake python-r1
 
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 39f16317e253..a1eb0e4875de 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -11,6 +11,6 @@ DIST hsa-class-f8b3870.tar.gz 37432 BLAKE2B c2a09e4a4c3708e8db432378874c63b9cefe
 DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b
 DIST rocm-tracer-5.3.3.tar.gz 353041 BLAKE2B b7614707ae3af2f5a46d058dacadfb0ef3b980963ac49face66a80c8396e66cf13e0430ab41737ba15e163f5da03697376b13238ea1decfe7ee4a7f31c7664a5 SHA512 95a202f76f6b68a35942750233bd09d372a9be843150d7ec02824da13c6b9a7c8da7a752ac69f66776e7ccfb6176473745dc46a7baadfe77c99c0596fbc2ffeb
 DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce
-EBUILD roctracer-5.1.3-r1.ebuild 2414 BLAKE2B ba248280604a8403f8f37bb1795fe71b446badbb14ca5deb110de39103c014ee14965ed378718b881e0b4fddafe021da3a46de83720eb5ed09d816f92a309fcc SHA512 65d672add20f247160d94ea366f676d774ce3b9cae3d05c73a71f47768b308137da5e74fe846d2d4510421b9a5b06b378458d2d5359b01a65b3e5882c9375977
+EBUILD roctracer-5.1.3-r1.ebuild 2414 BLAKE2B 177f01dc1079d29a764541b00b1df66763691cf42a6115c6c7f76a525605c928852d485271f5812efeb5b9aaa752c83213db6d874386e2a8e6796d32a01ea443 SHA512 2860674405c36b699c633737549a03382acd113be07371dbde78c25ec965208618218f85e940aba6280676918f34c7e6d3a8181c71f9b1f57ff976406e46f75a
 EBUILD roctracer-5.3.3-r1.ebuild 1659 BLAKE2B d8b729531db35650b674f30e2c9aeb2c494d82705bd46c784365dbe7d6396dfdba9339af5e378a4eec35a40f93fded8b2df4c0d583b976bc689d51d087d6900f SHA512 7efbf7deaf110325d6df22f1180609f7ffa54bf3b34ca50a9c2fa2b4c4b0359ff2c4aa881e4c36d8a11db3946bf6cc8746f9c384811635beed945b35565cc1ae
 MISC metadata.xml 620 BLAKE2B 305256592e98101accc2200175ee94af58ac66f529fc01978972b9daeb33c1588751e242fc72a69860e5aada7a94f641c71d60d4b2ae48daca8f606f1336e8d9 SHA512 10b5b9a17a3696915eefc0602ff21b160ddd9c45390ae2bb35472c213f1b3d67b5f650c962218b6300d51284ca5086a439c8f5fea52272f81ef014025c48f4f7
diff --git a/dev-util/roctracer/roctracer-5.1.3-r1.ebuild b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild
index f70bf95675a4..22befb0d4430 100644
--- a/dev-util/roctracer/roctracer-5.1.3-r1.ebuild
+++ b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake prefix python-any-r1
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0efa6e649016..34a7c0f96085 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 3090c073f8f0..4fcd51ae9546 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,3 @@
-DIST hamlib-4.5.4.tar.gz 2598483 BLAKE2B 7f9654d6aa8c241e58dfdcd4d1967cb0d2415f9cd7a06de68f0ec0e837442db4fd373cfcd08406afca6d6c6c71435358bc5d31969fb0569dea5853b4f3d4f38e SHA512 882fb517a3e5854cdaad506520e96c7736214fe27d1ac053f0510e3c5c08e1bf40217442f519d1c4be92e3d05135c7bd90bc0d60f334f52994e69b2ce9d3f442
 DIST hamlib-4.5.5.tar.gz 2603846 BLAKE2B ad4a286a7aa1e972707cb9ed15a4268909a7d252a64b98b01d35c9d9e42c605cd600e819e195e49d501c1e135191fda585581e27801fa217c9141236a81ad770 SHA512 2cdff2630e89fa95c7ac40e998492e8a04e000fcca18b9491ddcb967927ffaa771ed2e6ac3232a060947883533a6ae7405042a2f8fdb1de157d71f74381f5899
-EBUILD hamlib-4.5.4.ebuild 2145 BLAKE2B 5d5d3932673d5a10d002fe1c6d8b1af5aac6417eb0b71742b4e25b4685d4559150a3f628fdc6f0fa38e77dd077be523fd935a6085855cc5a8586b2dbe9ff2fd5 SHA512 6056f08cb4156e5465642f7397d1eede36ac0f8343581b5f98f598a74b0c0b4fb2b8c1ad736397425584a061015936744000d74f44b3f9859239e3f6d73ef3c4
 EBUILD hamlib-4.5.5.ebuild 2145 BLAKE2B 5d5d3932673d5a10d002fe1c6d8b1af5aac6417eb0b71742b4e25b4685d4559150a3f628fdc6f0fa38e77dd077be523fd935a6085855cc5a8586b2dbe9ff2fd5 SHA512 6056f08cb4156e5465642f7397d1eede36ac0f8343581b5f98f598a74b0c0b4fb2b8c1ad736397425584a061015936744000d74f44b3f9859239e3f6d73ef3c4
 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
diff --git a/media-libs/hamlib/hamlib-4.5.4.ebuild b/media-libs/hamlib/hamlib-4.5.4.ebuild
deleted file mode 100644
index 96af68a967fc..000000000000
--- a/media-libs/hamlib/hamlib-4.5.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0/4.2"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen
-		dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8ac2a2453e1f..36b09f6acde1 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3eba3da8693b..e0cfab1dde92 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 30 Jul 2023 03:10:06 +0000
+Sun, 30 Jul 2023 09:09:59 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fece18073fec..700dda674ea4 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-07-30T03:10:09Z
+TIMESTAMP 2023-07-30T09:10:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTF1JFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTGKOpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCQaA//dihTkaXjT7urrrJlo3cEPbI7BOPyxxfm/ECw2OoaXVUdWesaFVOkh1KV
-hyQcFN6ddHl2phmdEtfzt8umSFp4nVBgP+c5iPWT0KKifk6tZULcBE8U2rmIVj9E
-Y1epMcB+72kJ4T/4T6I4IsTMdgcSL/M+jzt8iM5qS87b8LJFu+L6ogkPN6wohhjL
-kRUF7ovzUN54W7Lz/WHJ+rUgxOi4nwcGdkE5IwWNJv2yPgxmn2mGdqZy6fsYSDss
-PgGCH+XFLyFZ3aY5OP7V/JIpGo9poyCyJDEDH0BBLDx16KQM9v+EciNx95v5iX2I
-xtnxDk2MDDUAG/dM1MvaBn0blh5wzrSTTDw7uvJcnQQaBDkRCEwGCr1Y1DIoOpWe
-sWGlRW/3mBnruPBNOU8aOxu32KpJ/Xay9ZTO9d2OS7uUz7Q4QD582gPB3pIyuT/z
-D3MxwO8QtEC/iD4FVZn1a7icyqIDZsqLMON1j+Ek0lkJyg4bUO5d0Syrvn8nuXm1
-EF3slNDV/oW++Y4PY2UNJ08eIXBlosHabyhGnQx76jJcCZFg1E4pYrm9liKsAwZc
-Ond44bCWw4LQrhyeUC7xjdcjM2zCREMIJoTqrL3tsNi83cceKqvG4eJ4NGvzJUYD
-giTJFPL4XY15vpsf1gHTKc49gh9FIXGAeIv5mQ8j68G6I3iuPfY=
-=4K0J
+klDEiw/+PFlH2Kg2lzO7RVDl3lj5EZXs2+8lATxRbMAuT+PSBSJ6uuW8/nuLW5Wn
+lPkDpiHZjH8HB3tv96AA7Rp5ayft0i2Rc8HEDCzgQcfFbISsDE7+Ykp7Ir1swTj7
+JKRYSDcSem5X3rv0TUVgc6g2FIfLQmkRBl5UUtBJbY1XN0poNS4kd23itXE3RKDS
+wkl53xOpT6udGLMf0bNvN/Jd8vHPZYnS/Nu0yAlNFP12LUH42Fp5KEPrp26B+PtZ
+CO7ImvmQQQvtFWRvf0YV4zGkB2RzluzvmP045CuM3jHU/OjZtHUbIqi6ydWTqkkN
+3N6Kp4KPbAU1MY7P0FArPX+K2QhnbOMVZPZL5dcbB5X/+dj1bCxXRCJlSwowiYR/
+b5Qw41A1JN7/ERl2xsHW3YK4L8o/v0CHZjQLrZPFFmENnFeJSkyIriiRzbnqRYaV
+Oh3Y6WkWLuvwwD95n5CwII7ju3HBvAUFTsQ+Ik3zT/ezY+qbTG8/B2RlN7F5aafF
+iHyEWP+6TEIT5z5IZJj8XTCtteB15XOldBp/h3oinQF2Cj86U9eHxawtgSDVx+iR
+WmQGhDdIdRzAbddjeOgRzHMOQ1QhDWqRGoK6Gd8JB/DjoOVdz/HNG6JAiEPHbIfL
+bYlnT5IHVTDtjiHEE0kPRpf1It3kmhA7yP/FhSzENy0faFVlols=
+=gLZH
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3eba3da8693b..c7345aa72ff4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 30 Jul 2023 03:10:06 +0000
+Sun, 30 Jul 2023 09:10:00 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index c033fce737be..1c39cb1ead97 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 090666034949..4963edd49b3d 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/libarchive-3.7.1 b/metadata/md5-cache/app-arch/libarchive-3.7.1
new file mode 100644
index 000000000000..aa6ef8726ba2
--- /dev/null
+++ b/metadata/md5-cache/app-arch/libarchive-3.7.1
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 ) elibc_musl? ( sys-libs/queue-standalone ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=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(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+DESCRIPTION=Multi-format archive and compression library
+EAPI=8
+HOMEPAGE=https://www.libarchive.org/ https://github.com/libarchive/libarchive/
+INHERIT=multilib-minimal toolchain-funcs verify-sig
+IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD BSD-2 BSD-4 public-domain
+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(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/13
+SRC_URI=https://www.libarchive.de/downloads/libarchive-3.7.1.tar.xz verify-sig? ( https://www.libarchive.de/downloads/libarchive-3.7.1.tar.xz.asc )
+_eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=c7c0a799f6c43f6f93fab9dfe24f775f
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 64b12067bf62..e494f3b3988d 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/signify-31 b/metadata/md5-cache/app-crypt/signify-31
index 146aa0a8a6b4..8ccd53555161 100644
--- a/metadata/md5-cache/app-crypt/signify-31
+++ b/metadata/md5-cache/app-crypt/signify-31
@@ -1,6 +1,6 @@
 BDEPEND=verify-sig? ( sec-keys/signify-keys-signify ) verify-sig? ( app-crypt/signify )
 DEFINED_PHASES=configure install unpack
-DEPEND=!net-mail/signify >=dev-libs/libbsd-0.7
+DEPEND=>=dev-libs/libbsd-0.7
 DESCRIPTION=Cryptographically sign and verify files
 EAPI=8
 HOMEPAGE=https://www.openbsd.org/ https://github.com/aperezdc/signify/
@@ -8,8 +8,8 @@ INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD-1
-RDEPEND=!net-mail/signify >=dev-libs/libbsd-0.7
+RDEPEND=>=dev-libs/libbsd-0.7 !net-mail/signify
 SLOT=0
 SRC_URI=https://github.com/aperezdc/signify/releases/download/v31/signify-31.tar.xz verify-sig? ( https://github.com/aperezdc/signify/releases/download/v31/SHA256.sig -> signify-31.sha.sig )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=50441e26ca06d7d47fe8a7d5fb8dacd2
+_md5_=f0730a7d09d3632dc9dd1ac98b994256
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 03086c812f17..99d1fbe4b793 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-28.3_rc1-r4 b/metadata/md5-cache/app-editors/emacs-28.3_rc1-r4
deleted file mode 100644
index 5ffd51b7fea8..000000000000
--- a/metadata/md5-cache/app-editors/emacs-28.3_rc1-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-SLOT=28
-SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-28.3-rc1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.3-patches-2.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	b3b15bdbe800c721e93b69b70cce2b67	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e
-_md5_=6d81b0605f89b67791e0483b8ea1764c
diff --git a/metadata/md5-cache/app-editors/emacs-29.1_rc1-r1 b/metadata/md5-cache/app-editors/emacs-29.1
index 4614774ca169..4041bcce3c4c 100644
--- a/metadata/md5-cache/app-editors/emacs-29.1_rc1-r1
+++ b/metadata/md5-cache/app-editors/emacs-29.1
@@ -11,6 +11,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=29
-SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-29.1-rc1.tar.xz
+SRC_URI=mirror://gnu/emacs/emacs-29.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-29.1-patches-1.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	b3b15bdbe800c721e93b69b70cce2b67	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e
-_md5_=95237059b9dd7ea6c80fd9915739eb11
+_md5_=90ed6dd0f4cde4b72781464e031a3d86
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 7fff0ad94f5b..5cf46ffb553e 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/pikepdf-8.2.2 b/metadata/md5-cache/dev-python/pikepdf-8.2.2
new file mode 100644
index 000000000000..a96cffc415d1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-8.2.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) ) test? ( >=app-text/qpdf-11.1.1:0= dev-python/deprecation[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-text/qpdf-11.1.1:0= python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+DESCRIPTION=Python library to work with pdf files based on qpdf
+EAPI=8
+HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=app-text/qpdf-11.1.1:0= dev-python/deprecation[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-8.2.2.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	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e
+_md5_=8b87d0d9bc14bbfa39fb3347a8f62217
diff --git a/metadata/md5-cache/dev-python/scikit-build-core-0.4.8 b/metadata/md5-cache/dev-python/scikit-build-core-0.4.8
new file mode 100644
index 000000000000..f7916b07a69d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scikit-build-core-0.4.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/build[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cattrs-22.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pybind11[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-subprocess-1.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-20.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.10.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-metadata-0.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/exceptiongroup[python_targets_python3_10(-)?] >=dev-python/tomli-1.1[python_targets_python3_10(-)?] ) >=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/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Build backend for CMake based projects
+EAPI=8
+HOMEPAGE=https://github.com/scikit-build/scikit-build-core/ https://pypi.org/project/scikit-build-core/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/packaging-20.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.10.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-metadata-0.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/exceptiongroup[python_targets_python3_10(-)?] >=dev-python/tomli-1.1[python_targets_python3_10(-)?] ) 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/scikit-build-core/scikit_build_core-0.4.8.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	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e
+_md5_=46823a80277322a3753810aa7ab571e5
diff --git a/metadata/md5-cache/dev-python/typeguard-4.1.0 b/metadata/md5-cache/dev-python/typeguard-4.1.0
new file mode 100644
index 000000000000..8994948cc11e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/typeguard-4.1.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-scm-6.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_python3_10? ( >=dev-python/typing-extensions-4.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/typing-extensions-4.7.0[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_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=Run-time type checker for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/typeguard/ https://github.com/agronholm/typeguard/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_10? ( >=dev-python/typing-extensions-4.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/typing-extensions-4.7.0[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 ) 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://files.pythonhosted.org/packages/source/t/typeguard/typeguard-4.1.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	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e
+_md5_=372dfdcc441dcde37bc468e16b6cd0af
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index b4d7fce49bdf..11d7163053a9 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/optimist-3.1.0 b/metadata/md5-cache/dev-ruby/optimist-3.1.0
new file mode 100644
index 000000000000..08255b403295
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/optimist-3.1.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/chronic[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/chronic[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/chronic[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=A commandline option parser for Ruby that just gets out of your way
+EAPI=8
+HOMEPAGE=https://www.manageiq.org/optimist/
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+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 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/optimist-3.1.0.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e
+_md5_=1be0b79427709defbc58355ecc7a84f3
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 3e72cdaf5903..fb0d1929e41d 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/rocm-cmake-5.1.3 b/metadata/md5-cache/dev-util/rocm-cmake-5.1.3
deleted file mode 100644
index 39ef68a09c3a..000000000000
--- a/metadata/md5-cache/dev-util/rocm-cmake-5.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Radeon Open Compute CMake Modules
-EAPI=7
-HOMEPAGE=https://github.com/RadeonOpenCompute/rocm-cmake
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0/5.1
-SRC_URI=https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-5.1.3.tar.gz -> rocm-cmake-5.1.3.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=525855bff7247b9752e1cd14af965464
diff --git a/metadata/md5-cache/dev-util/rocm-cmake-5.3.3 b/metadata/md5-cache/dev-util/rocm-cmake-5.3.3
deleted file mode 100644
index 43e2338f641d..000000000000
--- a/metadata/md5-cache/dev-util/rocm-cmake-5.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Radeon Open Compute CMake Modules
-EAPI=7
-HOMEPAGE=https://github.com/RadeonOpenCompute/rocm-cmake
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0/5.3
-SRC_URI=https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-5.3.3.tar.gz -> rocm-cmake-5.3.3.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=525855bff7247b9752e1cd14af965464
diff --git a/metadata/md5-cache/dev-util/rocm-cmake-9999 b/metadata/md5-cache/dev-util/rocm-cmake-9999
deleted file mode 100644
index 7520dbd8141e..000000000000
--- a/metadata/md5-cache/dev-util/rocm-cmake-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Radeon Open Compute CMake Modules
-EAPI=7
-HOMEPAGE=https://github.com/RadeonOpenCompute/rocm-cmake
-INHERIT=cmake git-r3
-LICENSE=MIT
-PROPERTIES=live
-RESTRICT=test
-SLOT=0
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c4afe92216ba4629086d6ee99cba7822
diff --git a/metadata/md5-cache/dev-util/rocm-smi-5.1.3-r1 b/metadata/md5-cache/dev-util/rocm-smi-5.1.3-r1
index 425a78dc05e5..702ea79f01fd 100644
--- a/metadata/md5-cache/dev-util/rocm-smi-5.1.3-r1
+++ b/metadata/md5-cache/dev-util/rocm-smi-5.1.3-r1
@@ -4,12 +4,12 @@ DESCRIPTION=ROCm System Management Interface Library
 EAPI=8
 HOMEPAGE=https://github.com/RadeonOpenCompute/rocm_smi_lib
 INHERIT=cmake python-r1
-IUSE=python_targets_python3_10
+IUSE=python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT NCSA-AMD
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_10 )
+RDEPEND=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 )
 SLOT=0/5.1
 SRC_URI=https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-5.1.3.tar.gz -> rocm-smi-5.1.3.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=61ec61fd40afe24d09637afd8250fea7
+_md5_=472cf2209ca36f91d52669b4c5a0d8b1
diff --git a/metadata/md5-cache/dev-util/roctracer-5.1.3-r1 b/metadata/md5-cache/dev-util/roctracer-5.1.3-r1
index 5cc39ab38d09..8f0d0a2f9317 100644
--- a/metadata/md5-cache/dev-util/roctracer-5.1.3-r1
+++ b/metadata/md5-cache/dev-util/roctracer-5.1.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.10 dev-python/CppHeaderParser[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( ( dev-lang/python:3.11 dev-python/CppHeaderParser[python_targets_python3_11(-)] dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/CppHeaderParser[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/rocr-runtime:0/5.1 dev-util/hip:0/5.1
 DESCRIPTION=Callback/Activity Library for Performance tracing AMD GPU's
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/rocr-runtime:0/5.1 dev-util/hip:0/5.1
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-5.1.3.tar.gz -> rocm-tracer-5.1.3.tar.gz https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-5.1.3.tar.gz -> rocprofiler-5.1.3.tar.gz https://github.com/ROCmSoftwarePlatform/hsa-class/archive/f8b387043b9f510afdf2e72e38a011900360d6ab.tar.gz -> hsa-class-f8b3870.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e2a6f9930ed689d154860953e2663623
+_md5_=c5a1bc25cb9f675a268db0a5f1541463
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 5cb62ff142b3..789531d1b10f 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/hamlib-4.5.4 b/metadata/md5-cache/media-libs/hamlib-4.5.4
deleted file mode 100644
index 81e5c2265e37..000000000000
--- a/metadata/md5-cache/media-libs/hamlib-4.5.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 doc? ( app-doc/doxygen dev-util/source-highlight )
-DESCRIPTION=Ham radio backend rig control libraries
-EAPI=8
-HOMEPAGE=http://www.hamlib.org
-INHERIT=autotools python-single-r1
-IUSE=doc perl python tcl python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test
-SLOT=0/4.2
-SRC_URI=mirror://sourceforge/hamlib/hamlib-4.5.4.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e
-_md5_=9d31d0741c80732d8f5b858f7adc3620
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 4803794d9a3a..2d694ba0e62a 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/hipFFT-5.1.3 b/metadata/md5-cache/sci-libs/hipFFT-5.1.3-r1
index e98bf9959a2f..546f92c3273c 100644
--- a/metadata/md5-cache/sci-libs/hipFFT-5.1.3
+++ b/metadata/md5-cache/sci-libs/hipFFT-5.1.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/hip:0/5.1 sci-libs/rocFFT:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?]
+DEPEND=dev-util/hip sci-libs/rocFFT:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?]
 DESCRIPTION=CU / ROCM agnostic hip FFT implementation
 EAPI=8
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/hipFFT
@@ -8,10 +8,10 @@ INHERIT=cmake rocm
 IUSE=+amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-util/hip:0/5.1 sci-libs/rocFFT:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?]
+RDEPEND=dev-util/hip sci-libs/rocFFT:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?]
 REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
 RESTRICT=test
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/hipFFT/archive/refs/tags/rocm-5.1.3.tar.gz -> hipFFT-rocm-5.1.3.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a82f3733f851d2413b5363534b761b20
+_md5_=85b5e453faf8347d46e8159e1f3f35a7
diff --git a/metadata/md5-cache/sci-libs/hipRAND-5.6.0 b/metadata/md5-cache/sci-libs/hipRAND-5.6.0
new file mode 100644
index 000000000000..ab8ff7af05b1
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipRAND-5.6.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocRAND:0/5.6[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?]
+DESCRIPTION=CU / ROCM agnostic hip RAND implementation
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/hipRAND
+INHERIT=cmake rocm
+IUSE=+amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip sci-libs/rocRAND:0/5.6[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?]
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=test
+SLOT=0/5.6
+SRC_URI=https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-5.6.0.tar.gz -> hipFFT-rocm-5.6.0.tar.gz
+_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fdc335c027738fa92936d3e85b2875dc
diff --git a/metadata/md5-cache/sci-libs/rocBLAS-5.1.3-r3 b/metadata/md5-cache/sci-libs/rocBLAS-5.1.3-r4
index ab49f8884fc1..c0ee8caf9695 100644
--- a/metadata/md5-cache/sci-libs/rocBLAS-5.1.3-r3
+++ b/metadata/md5-cache/sci-libs/rocBLAS-5.1.3-r4
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/rocm-cmake:0/5.1 dev-util/Tensile:0/5.1 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz )
+BDEPEND=dev-util/rocm-cmake dev-util/Tensile:0/5.1 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-cpp/msgpack-cxx-6.0.0 dev-util/hip test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
 DESCRIPTION=AMD's library for BLAS on ROCm
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.1.3.tar.gz -> rocm-rocBLAS-5.1.3.tar.gz https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	docs	f4e4c22139b7811a4dbdafaede74c229	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	prefix	eab3c99d77fe00506c109c8a736186f7	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4e5b86c03497c28154a91c073484c233
+_md5_=f6fe5e21da0696550574cfedfd57f043
diff --git a/metadata/md5-cache/sci-libs/rocFFT-5.1.3 b/metadata/md5-cache/sci-libs/rocFFT-5.1.3-r1
index 8e2355a33500..311268493b4b 100644
--- a/metadata/md5-cache/sci-libs/rocFFT-5.1.3
+++ b/metadata/md5-cache/sci-libs/rocFFT-5.1.3-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 sys-libs/libomp ) >=dev-util/cmake-3.22 dev-util/rocm-cmake:0/5.1 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 sys-libs/libomp ) >=dev-util/cmake-3.22 dev-util/rocm-cmake >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-util/hip python_targets_python3_10? ( dev-lang/python:3.10 )
+DEPEND=dev-util/hip python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 DESCRIPTION=Next generation FFT implementation for ROCm
 EAPI=8
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocFFT
 INHERIT=cmake check-reqs edo multiprocessing python-r1 rocm
-IUSE=benchmark perfscripts test python_targets_python3_10 +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+IUSE=benchmark perfscripts test python_targets_python3_10 python_targets_python3_11 +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=perfscripts? ( >=media-gfx/asymptote-2.61 dev-texlive/texlive-latex dev-tex/latexmk sys-apps/texinfo dev-python/sympy[python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 )
-REQUIRED_USE=perfscripts? ( benchmark ) || ( python_targets_python3_10 ) || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RDEPEND=perfscripts? ( >=media-gfx/asymptote-2.61 dev-texlive/texlive-latex dev-tex/latexmk sys-apps/texinfo dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[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=perfscripts? ( benchmark ) || ( python_targets_python3_10 python_targets_python3_11 ) || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
 RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-5.1.3.tar.gz -> rocFFT-5.1.3.tar.gz
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	aa1d1fa7be37663d48162ac963b22692	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b0c38a39dd1eb7bd992c2508dd711a6b
+_md5_=a6c2759ce6ec323901112f5eec44ccbf
diff --git a/metadata/md5-cache/sci-libs/rocRAND-5.1.3 b/metadata/md5-cache/sci-libs/rocRAND-5.1.3
index 9d7b5791c39a..cc2b8cbcc983 100644
--- a/metadata/md5-cache/sci-libs/rocRAND-5.1.3
+++ b/metadata/md5-cache/sci-libs/rocRAND-5.1.3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-5.1.3.tar.gz -> rocRAND-5.1.3.tar.gz https://github.com/ROCmSoftwarePlatform/hipRAND/archive/de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz -> hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2aa37a2c03bcb4fc678adce2eed2be42
+_md5_=da2e1fe2b036d59e7d1651584fa05c02
diff --git a/metadata/md5-cache/sci-libs/rocRAND-5.6.0 b/metadata/md5-cache/sci-libs/rocRAND-5.6.0
new file mode 100644
index 000000000000..802481b8f7d1
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocRAND-5.6.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/rocm-cmake >=dev-util/cmake-3.22 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip dev-util/rocm-cmake test? ( dev-cpp/gtest )
+DESCRIPTION=Generate pseudo-random and quasi-random numbers
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocRAND
+INHERIT=cmake rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=!test? ( test )
+SLOT=0/5.6
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-5.6.0.tar.gz -> rocRAND-5.6.0.tar.gz
+_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	8e3fb781f3258ae2757d1dfc2c7c170e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=56c503d7bca2ceffaab1e744f7f2ae45
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c5c66130fe20..91291371ed5d 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-07-30T03:10:09Z
+TIMESTAMP 2023-07-30T09:10:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTF1JFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTGKOpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDAMQ//Z1LOB0qNgUMR0Ztbof2UG6DG0/oKKTjAoXJXnKAhqsFm2Uxb9Oj/vck6
-+SKEDpdSV5V4Zr7VFREIWDUUSfIRTcnp3E3p2taDRptBX3/uaJv6TG7VDJWStLCy
-pYtABAIaAZZBrUJKK4xUhIf+arO58jcUx+GrJLrHW5ZzVvt56RfuyC9ASEhGn4Qy
-xBSmp7OsMEKtBdZrdPM+cQQMmrghcQ61gFl70ejs1nFm5vPb0PvzRLQk3Vy1n06c
-IhKJrDnVFO5Qq/iOKDxLuyIPk7b2GdoUJugfyFWigw2fkruzq8ejJU4XL/7fcSvp
-pg6yv2wwZ40bSUt/b+YV1hylxI2F/56QfsYm5aOM61ERY6vyVZseBqpQhVoHHiBj
-r6POsfso+nLCJ8gFrgyW6M++toay6Hu+mb905Mpo0hEKyxkRhrJEOjaK+jpUtXmI
-8FREoTugHsEf4ON8EDZ2vsVONryWBQZ8al3uhOGUR3kz5dX8hKZ5uWmU4e8Z9dIN
-Wd2C8MBujiTifcOtZqaAp9E/R8A8RzXkilvXuc9kQVvFCT5ymScwREsDeVmNDKxj
-2vkBL3iOKkke5uqea5ZtFII94/kmHAtJ3PjUlz4zRyJFJ/pyheYvQo8fDW0hRvIu
-oFkaK01FF13Q1dKW0eMIDcJ7+PXrkqN/nQBYrIYDQjymjKrqpUo=
-=n/3S
+klDnQA/9H6IdLPuvr/g89SMOYq3Km1o0645ljXuRYIKre7FOuE74ltAuZ9UPqCVD
+ihI9g69XwEkXMhlEu7bvb17N3gtt3/LnTgytB4+iRwenZ3SfGtzheci6sR0R0WXk
+EEKeEQpQBfpW8JVtwYetCjg2YGePxjZUvMXwUvHAVyPp4C/C3gQVpo2n2c0U9bts
+yvoJF5wqgNaEnAvEzIbFl15+O0joaBrZ52NRexEzPBM45fYD7WrcUpbOh4iEozZl
+MTur2InpamhXJUYO8CxNnPUjoihMBu7DzppV894j8/dFuS17kKVN34NcpDPHKbhW
+PKeThgZhh29Ay+0S3eUOuiSSgCNIU5iPiWa75lzZtH+oKJ/kvOaqeAz2tZF5NmgK
+jPzy1BAG/76RQGDvkPgFjVEyLPniSmWZo7mbThjKJfmf+rqiaI6UzT5g9WlxrHZ0
+E3UMnx8Znn6C31Fy285bgYstLsVaTNB+IQE/vBcmy/uMOpLLdZzoHM3ep6bLUGL0
+usx3kr0LBfqMbvH/vi9LBcUtoE8ruS+dg45mLiOvm6qO1BNs0cISj0vAf0kmDq/P
+eDNlscJsJ6ExWMsmfXayZkmXM9IJOQjTP1YKfWoJfGxBRl4LzLLu17BzHhJng0+u
+Q/XAx3YUzpt5PHcdr/49Y1xmi2HxUdhaUu21N3v++qJlmENBuM8=
+=Xjjh
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3eba3da8693b..c7345aa72ff4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 30 Jul 2023 03:10:06 +0000
+Sun, 30 Jul 2023 09:10:00 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7d126f9024db..c86c1e87a041 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jul 30 03:10:06 AM UTC 2023
+Sun Jul 30 09:09:59 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e569fd6c5409..f3fe128dcbc5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 30 Jul 2023 03:15:01 +0000
+Sun, 30 Jul 2023 09:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 23d92536c7a3..9eb8932f037f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-924ed4b2f16398e95ceb27a73306a4f2f2dc8f20 1690684722 2023-07-30T02:38:42+00:00
+09d04e2b52797fddeccc66726b5caad8a39bc9f9 1690707335 2023-07-30T08:55:35+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4d57c9102203..e36acc285dc6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1690686601 Sun 30 Jul 2023 03:10:01 AM UTC
+1690708201 Sun 30 Jul 2023 09:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3eba3da8693b..e0cfab1dde92 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 30 Jul 2023 03:10:06 +0000
+Sun, 30 Jul 2023 09:09:59 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 0df59141d13c..6cc761267878 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 80f6dd58c5fe..1bec4fb19236 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -273,7 +273,6 @@ dev-util/cucumber-html-formatter:17
 # Having scikit-build-core installed still breaks building setuptools
 # extensions in some scenarios.
 # https://github.com/scikit-build/scikit-build-core/issues/426
->=dev-python/iminuit-2.22
 =dev-python/scikit-build-core-0.4.7-r1
 
 # Hans de Graaff <graaff@gentoo.org> (2023-07-08)
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index cdbd8e7ab00b..c7ad2b902fa1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index 769ee7600f8a..5e0501fd7a38 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -1,6 +1,7 @@
 AUX hipFFT-4.3.0-add-complex-header.patch 381 BLAKE2B 962865d4dd1a38bbc4e70756d614c92a287029e5bd6d987e8adbabb4b33a83e616cc1156bfc5dc415124d25373e146178a99854972d957039654007d5d3d5122 SHA512 8dfda0eb470005b9ed4701dbf0a1022040ce6bc90f0e04ca16704083074047b5170396257c1aa8c5d0855c055e491249c63516f4f1ba7583d5214f39705433fa
 AUX hipFFT-5.0.2-remove-git-dependency.patch 1489 BLAKE2B 800033e728c4871c9c8de797779f3c9ca0f3441e1946068e4d826aabf02d1e27145e0fc627ae583ac27eaa43abeafba271fda48c22d087eda3cdace18cd62af2 SHA512 4c0ca6282b3fccf99d7ae25c17f5961b10b0ff49e1d1e1a65055d7ff20fe4a17901b8c5e9ec78953a2de86ab9408f583eb85cc211db1e2dc339fb8e2217a9f10
 AUX hipFFT-5.1.3-gentoo-install-locations.patch 1003 BLAKE2B f41fecbfa3556767f59fe4c2516a070664fb105c2d9871640a2ea4679bd50c292ac329e81ba34557423f1e2445a8157630aba9e0d0a9eacd6b3778efbd67734b SHA512 e2cd361116c59215d5a1aa383fc6e9a3a4ea3c22348dfd83a6e5da13f3ab03833b149ba4a60939f41cb933276015b819aab4e4f9356ee6742f38b88598747d45
+AUX hipFFT-5.1.3_hip-config.patch 2792 BLAKE2B 275010cb9b4fe0b2f530bc1fe4fd027e774d1bb7bb035774fec24566ff513ae7a3ea63ecc6abef81b290b02235a3f45939f21c6b34268f72f1ca2a4e4265d81c SHA512 3307392bf43cfbfdd70973a87d2d67c63d94408e382b5db145aaf23e8572f3efa77e68c29ef168123960279da947a356fbadc0b2dc67163a6bf353694dd2a51f
 DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706
-EBUILD hipFFT-5.1.3.ebuild 1215 BLAKE2B c6247905b76257910c1c04beb4cac06d268184855061b9475d0caa981462497c6fe6ce6eb45de786dbafded3d59cef5f5ba561c3d5d7cdc8b9dfad02ad018871 SHA512 200e46991f56e3158c7c3520fc7a1642b4fcb2a7e622c6a124b0b336d64f62cb7c27798604f4a8fc81d387a9ecfc1cc1ba588d73576097147ff6e0007b6d9e16
+EBUILD hipFFT-5.1.3-r1.ebuild 1055 BLAKE2B 421cdf532e119730b6d3115b40d304b24156b0724f80188dd6059e0bcc017b66744bb66c52e520349e5423d80edd6c9c7eec57476a7553cfbef3965777c51caa SHA512 fe8dfd3e06dcec747dd182bd9eba449f5947d72214d2865c2789cfa0ded17e9394762d8e4a4b307de45169461cbbc6facaaa188f5f0c8b68a9b48be77c297a2e
 MISC metadata.xml 617 BLAKE2B d5ab7f2a7c98fdafe1e50bff4708e7a2bf58680e9ee2cadaa2eea018b81032b4e1d82849144684a1100acb9a4e2651fb07572c0e46cbda87ef585b290e4b865c SHA512 7859cff3011e71bb1e6a2668c6d1f035cdd47ad214aefe6c0c225a8ac7133081a9e2bad5a7bb7ea94b7a9c3761f131228e5da66b0190e35234cd10c626e01734
diff --git a/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch b/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch
new file mode 100644
index 000000000000..2f63a0f8e6f7
--- /dev/null
+++ b/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch
@@ -0,0 +1,90 @@
+reverts the following commit.
+
+Upstream: https://github.com/ROCmSoftwarePlatform/hipFFT/pull/67
+
+commit 41491c9a70f808ed74690a538ca7bd25ff1ae1ca
+Author: Steve Leung <Steve.Leung@amd.com>
+Date:   Wed Sep 1 11:25:26 2021 -0600
+
+    cmake: use HIP CONFIG on Windows
+
+diff --git a/clients/rider/CMakeLists.txt b/clients/rider/CMakeLists.txt
+index de1fc7d..8b88103 100644
+--- b/clients/rider/CMakeLists.txt
++++ a/clients/rider/CMakeLists.txt
+@@ -43,11 +43,7 @@
+   
+ if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
+   if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
+-    if( WIN32 )
+-      find_package( HIP CONFIG REQUIRED )
+-    else()
+-      find_package( HIP MODULE REQUIRED )
+-    endif()
++    find_package( HIP REQUIRED )
+     target_link_libraries( hipfft-rider PRIVATE hip::host )
+   else()
+ 
+diff --git a/clients/samples/CMakeLists.txt b/clients/samples/CMakeLists.txt
+index 5a882c6..37162ab 100644
+--- b/clients/samples/CMakeLists.txt
++++ a/clients/samples/CMakeLists.txt
+@@ -48,11 +48,7 @@
+   target_link_libraries( ${sample} PRIVATE hip::hipfft )
+   
+   if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
+-    if( WIN32 )
+-      find_package( HIP CONFIG REQUIRED )
+-    else()
+-      find_package( HIP MODULE REQUIRED )
+-    endif()
++    find_package( HIP REQUIRED )
+     if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
+       target_link_libraries( ${sample} PRIVATE hip::host )
+     else()
+diff --git a/clients/tests/CMakeLists.txt b/clients/tests/CMakeLists.txt
+index 2b965e2..0442a79 100644
+--- b/clients/tests/CMakeLists.txt
++++ a/clients/tests/CMakeLists.txt
+@@ -81,11 +81,7 @@
+ 
+ if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
+   if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
+-    if( WIN32 )
+-      find_package( HIP CONFIG REQUIRED )
+-    else()
+-      find_package( HIP MODULE REQUIRED )
+-    endif()
++    find_package( HIP REQUIRED )
+     target_link_libraries( hipfft-test PRIVATE hip::host )
+   else()
+     target_compile_definitions( hipfft-test PRIVATE __HIP_PLATFORM_NVIDIA__)
+diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
+index 022e3e4..0c8b3f8 100644
+--- b/cmake/dependencies.cmake
++++ a/cmake/dependencies.cmake
+@@ -27,22 +27,14 @@
+ # HIP
+ if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
+   if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
+-    if( WIN32 )
+-      find_package( HIP CONFIG REQUIRED )
+-    else()
+-      find_package( HIP MODULE REQUIRED )
+-    endif()
++    find_package( HIP REQUIRED )
+     list( APPEND HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include" )
+   endif()
+ else()
+   if( BUILD_WITH_LIB STREQUAL "CUDA" )
+     set(HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include")
+   else()
+-    if( WIN32 )
+-      find_package( HIP CONFIG REQUIRED )
+-    else()
+-      find_package( HIP MODULE REQUIRED )
+-    endif()
++    find_package( HIP REQUIRED )
+   endif()
+ endif()
+   
diff --git a/sci-libs/hipFFT/hipFFT-5.1.3.ebuild b/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild
index 216d15841546..79eb8052324f 100644
--- a/sci-libs/hipFFT/hipFFT-5.1.3.ebuild
+++ b/sci-libs/hipFFT/hipFFT-5.1.3-r1.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
@@ -18,7 +18,7 @@ SLOT="0/$(ver_cut 1-2)"
 
 RESTRICT="test"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND=""
@@ -26,25 +26,19 @@ BDEPEND=""
 S="${WORKDIR}/hipFFT-rocm-${PV}"
 
 PATCHES=(
+	"${FILESDIR}/${PN}-5.1.3_hip-config.patch"
 	"${FILESDIR}/${PN}-5.1.3-gentoo-install-locations.patch"
 	"${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch"
 	"${FILESDIR}/${PN}-4.3.0-add-complex-header.patch"
 )
 
-src_prepare() {
-	sed -e "/CMAKE_INSTALL_LIBDIR/d" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DCMAKE_INSTALL_INCLUDEDIR="include/hipfft"
-		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake"
-		-DHIP_ROOT_DIR="${EPREFIX}/usr"
+		-DROCM_SYMLINK_LIBS=OFF
 		-DBUILD_CLIENTS_TESTS=OFF
 		-DBUILD_CLIENTS_RIDER=OFF
 	)
 
-	cmake_src_configure
+	CXX=hipcc cmake_src_configure
 }
diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest
new file mode 100644
index 000000000000..38b697c3e519
--- /dev/null
+++ b/sci-libs/hipRAND/Manifest
@@ -0,0 +1,3 @@
+DIST hipFFT-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2
+EBUILD hipRAND-5.6.0.ebuild 825 BLAKE2B 0363d94ed0bb68ab437d62966e8c261fb8c5d31fa7ba4abc52325e28cc7d3b857ccdaf5158c03478b0f72ceb89545965452257ddb72d30d7a7c6a3776c788ced SHA512 16f97156691aaaf630e6c040b6ec6594a85c9420a16e2f6be2a37d6b21973d85130dd283801750986c8ae5ae47a1d2f396b010284ee6407d918b26d8c7068b92
+MISC metadata.xml 489 BLAKE2B 9dbd5a5d1c3d7deeb191eb70c48ec9f4abd11a6362a81f93fb54116a4687edf9cf1113179af884bd346b9bfb4c785437dd674251903b233589ba8556e5316644 SHA512 4f85aa13c08b7ccab6c1db816f805a987a3ee33991dacba683fabf7f40ff7288660f725296dfdda68d9ae9ff5d5150cde9b6e9303f481960665a2085b5f62ef0
diff --git a/sci-libs/hipRAND/hipRAND-5.6.0.ebuild b/sci-libs/hipRAND/hipRAND-5.6.0.ebuild
new file mode 100644
index 000000000000..d0bd5ace71e4
--- /dev/null
+++ b/sci-libs/hipRAND/hipRAND-5.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic hip RAND implementation"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipRAND"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+RESTRICT="test"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/hipRAND-rocm-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
diff --git a/sci-libs/hipRAND/metadata.xml b/sci-libs/hipRAND/metadata.xml
new file mode 100644
index 000000000000..27c8916b67d4
--- /dev/null
+++ b/sci-libs/hipRAND/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>xgreenlandforwyy@gmail.com</email>
+    <name>Yiyang Wu</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCmSoftwarePlatform/hipRAND</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index 674d93870e97..985271bde4d1 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -10,6 +10,6 @@ DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fc
 DIST rocBLAS-5.4.2-Tensile-asm_full-navi22.tar.gz 1057686 BLAKE2B aa755595bbcd48775713f1d94c18b9bfa6464cae97653dd5beda9e4ed600802b62c4159e6edef7fbd4c92e629bbda1c284e6c48e096c7eaf22bbaad86bdcdace SHA512 cdc928528e7ce5bcc3ae32ec18e3aee48533f24e77c1e42f6e0398858eefebd52b8812caabe01a0ef7fa552e00118b862e025f1675a9642b009f1e38efbcdd53
 DIST rocm-rocBLAS-5.1.3.tar.gz 13741546 BLAKE2B af10d8cb69bee44ef5aab2dc350e1d9f3b6fddb3a840c17230c4b55b2649a4724c9f2e58c1eafdb3e2716eea016a72a35c3ddb498881b1ce682d780baa8d8b07 SHA512 5ab71838fdd0e9c5848cbf28a19d113353b619a878d8c7d05f64feb32faae2054169c95ed6e9dd6b05a2e807b57229dd2c361c4d289b6e6f17c196558640890f
 DIST rocm-rocBLAS-5.4.2.tar.gz 15938434 BLAKE2B 14ebafa944fdac443800bb7f9b16f8ecf0f420b168d3c6534f68ad7d14bf058a4cc1673fce8f4b9be53e4a6c1cf05011e01853cd901bce0b59827d2aca4d029f SHA512 e62bb80457c1e89454885499bdce9d60beecd706806724418983c78c65c2ae303550f9670b5a6e71dae6a61c0e42b223ab01b36b8406430731ebcbff54c4a8f4
-EBUILD rocBLAS-5.1.3-r3.ebuild 3057 BLAKE2B ad53ba2724e736014a49a78ff0a8d326efe083d811f8084cc830ecce93bcc6c0203a23d2d9c2aa75577be57d2085e76390ca3340d9da8d1c33bf303a1e507c7f SHA512 134b52b04a32f91b9d8b4a20d90d5868b9aba255c411bcad5a6692108c98571c8e0ffcd57342a037126d6f8931dc297133a1b4545892d9df6cc427593d503644
+EBUILD rocBLAS-5.1.3-r4.ebuild 3049 BLAKE2B 815430fdd86ba2e7afabce58d0b2b0495f6faa4cd483695e40d1af67508898b52569a575494f5c99402c68ef5ce9854add762322ae71e9269f4a7bb5db316100 SHA512 88a76f6e9b6a759e4d49a3fcdeb6731dfef2d521a6d91380c7c8b13236c80ec847d450235b45af2cc7e2b950ebd673f386669f95908d51b28c8b8c52bd8dc8f0
 EBUILD rocBLAS-5.4.2-r3.ebuild 2688 BLAKE2B 08a03bdc96a5998ad04b42c2e86d6ec8fde2025f923ba5dfa5e34539cf2ea253018348afa4bed7fb25343b2801b40295f8486f4b3de39d07ddabd81b45cc05f1 SHA512 826ffb25f76c48cd044c54cdd6f318f8c6eba9bd03dc272391e3a3df7d5380f756459215b92879557da80afd149f32dac5af4f85316d91ce4372108eb300754a
 MISC metadata.xml 739 BLAKE2B 38ace9571ca717a5bf7251888b4537522326f34778be98cfe717a06dbbd3a04a2bf905ec1cabafe9bbd3fea90adfb5c25c8b41e46c034a7793363ea5fc0c7f29 SHA512 60f1d5aa2a6ebe17cfcf24780529e1eef521bb7c838e48d18180a52d580cf91430ac1f4fdd0e70b9804ec5f0b5957dbd431149f6e0b0b9033cf8ad683510c582
diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3-r3.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild
index 7027067623c7..94c7e5177af0 100644
--- a/sci-libs/rocBLAS/rocBLAS-5.1.3-r3.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="${ROCM_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	dev-util/rocm-cmake:${SLOT}
+	dev-util/rocm-cmake
 	dev-util/Tensile:${SLOT}
 "
 
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index 3fccc728922e..caf24d8f6cff 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -3,5 +3,5 @@ AUX rocFFT-5.0.2-add-math-header.patch 468 BLAKE2B 66cedbbc2b7aeaa2e42324e02325d
 AUX rocFFT-5.1.3-add-stdexcept-header.patch 340 BLAKE2B b21454151dd2c41948e00b50360b3adbc93c08e7e849b11c032ba0b8dc76d1159883349065d7c87bf3098d0e67d4da48db220b58934de39fcb3c4d006a902a5e SHA512 a49f2bad5ea87f67a7d5dc7adb820a42ab2b92b0f1436a564c3906dcc4598de154d18247d8b4e8f3e12c3947da05890a4a9ba6f76852bebd1fcf26928ee48e0c
 AUX rocFFT-5.1.3-unbundle-sqlite.patch 2326 BLAKE2B 5a08f2ec7486f0687c4af46e09a01678e8255254bb78ae864436353d10017f86f1b3b557527a32771de43fa24148c3be5d233639bdf3e6746b2d120623bf934d SHA512 c545053741c55abf1dbcda89e9ece1bccb42a5db86c0329499b332299c5c7b73150650634cc7506bef2ee7e16a25bf1aacd5477bf13884e2cb01c48a113b33ab
 DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43
-EBUILD rocFFT-5.1.3.ebuild 3900 BLAKE2B 0d309a54a713cc12642c37f9214675c76e31f8f4740a1c1d38aba1b639be98e8d89d48b088d426d75f70d068b3d9a1e678f1f596c99cbafcfcec51450ddd1321 SHA512 25b26c38acc498af9b83121da86c149a69b922e822937110d174471f41f5a7ca6d6c2b6509a97b8854b6dfc170f60d0deeddc0aee9547f487f9b7c126aa68546
+EBUILD rocFFT-5.1.3-r1.ebuild 3918 BLAKE2B 91899ac954ae093fe0f31437ca306085f2e14fcabfd1b89deb063cdfbf0219d5ec036a0c6a139148b494981518f2bfef660b67180ab9f1d838f0399073f8818e SHA512 a168e0fddf940b3ac0916063221dd8f61fd994bfe92bf41441fc2ac1841a8230aed5a241c06b2b4651da9492361eb9eca44761927ef69cc8c8468c7333d251ca
 MISC metadata.xml 676 BLAKE2B dbf1364ede458c08dde2ebd4a8ca7053a1dc00813f647fc09268ef5a97150945c19b2375f13cc74aec8ff0af831625221bfa675b5ded7769ff5e1a322ae8b5dc SHA512 352c744ece6202b976170615927c09b82513a73669cd5efc5ca626ac2b6929d18f8ecd0b8a91d87bef86aab17713158f1e7efaef0aee01b7ac6e7d6cd2a3a4f3
diff --git a/sci-libs/rocFFT/rocFFT-5.1.3.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
index af9d3e7fad22..8d4bed88c3a0 100644
--- a/sci-libs/rocFFT/rocFFT-5.1.3.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 ROCM_VERSION=${PV}
 
 inherit cmake check-reqs edo multiprocessing python-r1 rocm
@@ -36,7 +36,7 @@ BDEPEND="
 	test? ( dev-cpp/gtest dev-libs/boost
 	>=sci-libs/fftw-3 sys-libs/libomp )
 	>=dev-util/cmake-3.22
-	dev-util/rocm-cmake:${SLOT}
+	dev-util/rocm-cmake
 "
 
 CHECKREQS_DISK_BUILD="7G"
@@ -80,7 +80,7 @@ pkg_setup() {
 src_prepare() {
 	sed -e "s/PREFIX rocfft//" \
 		-e "/rocm_install_symlink_subdir/d" \
-		-e "/<INSTALL_INTERFACE/s,include,include/rocFFT," \
+		-e "/<INSTALL_INTERFACE/s,include,include/rocfft," \
 		-i library/src/CMakeLists.txt || die
 
 	sed -e "/rocm_install_symlink_subdir/d" \
@@ -107,7 +107,8 @@ src_configure() {
 		-DCMAKE_SKIP_RPATH=On
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-Wno-dev
-		-DCMAKE_INSTALL_INCLUDEDIR="include/rocFFT/"
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocfft/"
+		-DROCM_SYMLINK_LIBS=OFF
 		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
 		-DBUILD_CLIENTS_SELFTEST=$(usex test ON OFF)
 		-DPYTHON3_EXE=${EPYTHON}
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index d33a948753c0..3eb2d8794622 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -1,4 +1,9 @@
+AUX rocRAND-5.1.3_no-symlink.patch 1373 BLAKE2B a2909cb5c012c8a1b47ba543f2624195b6817fc1458c67a285994f379615698e36f52420868aacad7c9033e25072fb0f126f852a4285c768250387aadefbadcc SHA512 d055d5598e2e83846ff0383021b6107ab8762803744da588669ecc4f40b5b6fedec8598d39cd2626e6f9556be4292bad3b6263936746efb461f79e651a4aaae9
+AUX rocRAND-5.1.3_stdint-gcc13.patch 1025 BLAKE2B 96e4600eb83bb407c4590084a9cb3464dbeafc070584a40cd94ebd9c67d96b1a0cc5261ab0a7e0cc79f3f14d4af280dcbf320bbc857a6850cd581fbcf7a78688 SHA512 4711fc79ebc9c90db4213c729462a9d622e3eb81b000b1e432702151bb0a56cf693996b28037231d5f968020ec4be1fdb6f99a167a470ecb1253ad7799826b67
+AUX rocRAND-5.4.2_stdint-gcc13.patch 2025 BLAKE2B 373fcb39a4a10505ded1b97e1afde7191fcb94f56b34c6f0134a48199f038439a9911a9b5f8116b5051d331c765b96be7ffa2569892eec9312c3263ba547cdc7 SHA512 8d6cb0da359b27afdfe411fe84a7f6443e20c92753b825348932a407cffc24f8f4f239436ad1ed21966ec5cf4657c4033c821eae440f15737b63bed187023f15
 DIST hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz 80820 BLAKE2B f2894187455cf1da70c486e9efc336a01dc53589c56afe994858b2344c1e74e8d35260f70ad9cd80c5da1103dd9e98da6f5f2bf8e1ddf97023effc8a434a76ce SHA512 cdc70799ddca456c37c2a65875b98acff74800aa2b4f28d77b27c38c32428dd5edb2837bf88bfb6fcc32bdae7f2b27f1b547831bad98101b04959b7ba6b74a85
 DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88a7a0188a9d5a33f520af3b42235c0dca62495460fd5e7abbca5fe7acc01acfdc90e53ae9a6e45128df5da472f49 SHA512 12859e52b79e40fcd1fb97d0915c191bbbc24e31e00aac4dbeecb625f9978a00ece3d7a42d0f9d37516031c1fbeb66e14dcd476ea83fe32fb13e0dd5c3964a28
-EBUILD rocRAND-5.1.3.ebuild 1943 BLAKE2B 35e25904fea875e8e940c35679ec3fae6f4d1eb195de7a00674d3ca961331855d1170734c5b9bcf5b4a614487a4338d772c4954d0b8aa6f3b06ff715bdf02910 SHA512 1be4d70c30d9f6f575f755a5a94b4ecdc553d38abaad04830fc55f23b5885feb2568e37e8ab2be3b964f5159f98b8fda2115a5818c7865c958e5d4706359759c
+DIST rocRAND-5.6.0.tar.gz 23189913 BLAKE2B 2418a90c323f483d1f92630df7134bc060b9052f580259924e79680a7ec37857574973dda69dc3c28fdd5b88a5fc1d29757ed637fcde0730c53b9a5f09668aba SHA512 cccd26a6b80a7705644803a85dad3a43de3f4e2f73f964f2b5aa410f71d3782b68d6cc1ad60b7f7be5193a94098ed3fa25cad30c3acbc141522cdd738d3328a5
+EBUILD rocRAND-5.1.3.ebuild 1980 BLAKE2B 6280751e595cade52a2087da1080064cb5a827edc91a5679e1a3252f1dbe3f7ec35dc7f72d3a949c88c95fc44a18d054087b3d59b4d58614f9248045f59bf750 SHA512 2b788497096c4bd1ed83653d7bef0d73f362264f9cde01d421d1c12741fb397a1e96eb5fbbd84b13a55892e0538bb1648518fcaa4996774aa48acd20429df6d6
+EBUILD rocRAND-5.6.0.ebuild 1341 BLAKE2B 129b0f1175e2a9a4f0159241269c034d9b1a4a9f5f5700848177b3f5f68edce2301b08d7173eeac37cbca4ec0c8d4c81eb0c9cd3d2a6f7ecabb37e67956dcd03 SHA512 579522efd4bdb20cfce44b0321b9052b541300f47846ea4891bdc274ae8704a4f0f8cbb7599c0c090b5cc6033d79becc33da0dc8cbe8114e89755db1dae2566a
 MISC metadata.xml 583 BLAKE2B 5713db2187eb2c1c8f40e9f9774215a880b67ad90ffe943f66724619b90cff92ccc06e09e1f6d7092e4d6e374cd26300ca13c8654a3f2ca2cc65d796356b5a42 SHA512 a42e669f1ce6ed3a83a8648f7c43a85cc1223c2bf73fe14e2e06df5c6573dfa55751198b374f151ed36e75ada831406654d7f3d8429e3e05c14036e26057608c
diff --git a/sci-libs/rocRAND/files/rocRAND-5.1.3_no-symlink.patch b/sci-libs/rocRAND/files/rocRAND-5.1.3_no-symlink.patch
new file mode 100644
index 000000000000..e0a4b8d66ae1
--- /dev/null
+++ b/sci-libs/rocRAND/files/rocRAND-5.1.3_no-symlink.patch
@@ -0,0 +1,38 @@
+commit 3b24ff660f83e18cadd3da272f182aaf8f98a755
+Author: Liam Wrubleski <Liam.Wrubleski@amd.com>
+Date:   Mon Jan 24 13:49:52 2022 -0700
+
+    Revert symlinks
+
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 17a8c4c..89322d8 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -60,27 +60,6 @@ rocm_install(
+         "${CMAKE_BINARY_DIR}/library/include"
+ )
+ 
+-# Create symlinks
+-if(WIN32)
+-    set(SYMLINK_COMMAND "file(COPY \${SRC} DESTINATION \${DEST_DIR})" )
+-else()
+-    set(SYMLINK_COMMAND "execute_process(COMMAND ln -sf \${SRC_REL} \${DEST})" )
+-endif()
+-set(INSTALL_SYMLINK_COMMAND "
+-    set(SRC_DIR \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/include/rocrand)
+-    file(GLOB_RECURSE FILES RELATIVE \${SRC_DIR} \${SRC_DIR}/*)
+-    foreach(FILE \${FILES})
+-        set(SRC \${SRC_DIR}/\${FILE})
+-        set(DEST \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/rocrand/include/\${FILE})
+-        get_filename_component(DEST_DIR \${DEST} DIRECTORY)
+-        file(MAKE_DIRECTORY \${DEST_DIR})
+-        file(RELATIVE_PATH SRC_REL \${DEST_DIR} \${SRC})
+-        message(STATUS \"symlink: \${SRC_REL} -> \${DEST}\")
+-        ${SYMLINK_COMMAND}
+-    endforeach()
+-")
+-rocm_install(CODE "${INSTALL_SYMLINK_COMMAND}")
+-
+ set(FORTRAN_SRCS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/rocrand/src/fortran")
+ configure_file(
+     src/rocrand-fortran-config.cmake.in
diff --git a/sci-libs/rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch b/sci-libs/rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch
new file mode 100644
index 000000000000..e80155f24da7
--- /dev/null
+++ b/sci-libs/rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch
@@ -0,0 +1,33 @@
+commit d79e778080766cf359d6658367e1c7ce0668daa4
+Author: Benda Xu <orv@debian.org>
+Date:   Sat Jul 29 23:03:22 2023 +0800
+
+    sobol*_direction_vector_generator.cpp: include stdint.h for uint*_t
+    
+    Reference: https://gcc.gnu.org/gcc-13/porting_to.html
+    Signed-off-by: Benda Xu <heroxbd@gentoo.org>
+
+diff --git a/tools/sobol32_direction_vector_generator.cpp b/tools/sobol32_direction_vector_generator.cpp
+index 16c4354..eb316c7 100644
+--- a/tools/sobol32_direction_vector_generator.cpp
++++ b/tools/sobol32_direction_vector_generator.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <iostream>
+ #include <fstream>
++#include <cstdint>
+ #include <string>
+ #include <iomanip>
+ 
+diff --git a/tools/sobol64_direction_vector_generator.cpp b/tools/sobol64_direction_vector_generator.cpp
+index e520903..ecdbdc4 100644
+--- a/tools/sobol64_direction_vector_generator.cpp
++++ b/tools/sobol64_direction_vector_generator.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <iostream>
+ #include <fstream>
++#include <cstdint>
+ #include <string>
+ #include <iomanip>
+ 
diff --git a/sci-libs/rocRAND/files/rocRAND-5.4.2_stdint-gcc13.patch b/sci-libs/rocRAND/files/rocRAND-5.4.2_stdint-gcc13.patch
new file mode 100644
index 000000000000..566ef5a1c45a
--- /dev/null
+++ b/sci-libs/rocRAND/files/rocRAND-5.4.2_stdint-gcc13.patch
@@ -0,0 +1,59 @@
+Upstream: https://github.com/ROCmSoftwarePlatform/rocRAND/pull/372
+
+commit 78c5631acd58d218af0c61af5acc57e9f47bc9c7
+Author: Benda Xu <orv@debian.org>
+Date:   Sat Jul 29 23:03:22 2023 +0800
+
+    sobol*_direction_vector_generator.cpp: include stdint.h for uint*_t
+    
+    Reference: https://gcc.gnu.org/gcc-13/porting_to.html
+    Signed-off-by: Benda Xu <heroxbd@gentoo.org>
+
+diff --git a/tools/scrambled_sobol32_direction_vector_generator.cpp b/tools/scrambled_sobol32_direction_vector_generator.cpp
+index 5623704..7addf4d 100644
+--- a/tools/scrambled_sobol32_direction_vector_generator.cpp
++++ b/tools/scrambled_sobol32_direction_vector_generator.cpp
+@@ -21,6 +21,7 @@
+ #include "../library/include/rocrand/rocrand_sobol32_precomputed.h"
+ #include <fstream>
+ #include <iomanip>
++#include <cstdint>
+ #include <iostream>
+ #include <string>
+ 
+diff --git a/tools/scrambled_sobol64_direction_vector_generator.cpp b/tools/scrambled_sobol64_direction_vector_generator.cpp
+index 0aecd3e..4189006 100644
+--- a/tools/scrambled_sobol64_direction_vector_generator.cpp
++++ b/tools/scrambled_sobol64_direction_vector_generator.cpp
+@@ -21,6 +21,7 @@
+ #include "../library/include/rocrand/rocrand_sobol64_precomputed.h"
+ #include <fstream>
+ #include <iomanip>
++#include <cstdint>
+ #include <iostream>
+ #include <string>
+ 
+diff --git a/tools/sobol32_direction_vector_generator.cpp b/tools/sobol32_direction_vector_generator.cpp
+index 16c4354..eb316c7 100644
+--- a/tools/sobol32_direction_vector_generator.cpp
++++ b/tools/sobol32_direction_vector_generator.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <iostream>
+ #include <fstream>
++#include <cstdint>
+ #include <string>
+ #include <iomanip>
+ 
+diff --git a/tools/sobol64_direction_vector_generator.cpp b/tools/sobol64_direction_vector_generator.cpp
+index e520903..ecdbdc4 100644
+--- a/tools/sobol64_direction_vector_generator.cpp
++++ b/tools/sobol64_direction_vector_generator.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <iostream>
+ #include <fstream>
++#include <cstdint>
+ #include <string>
+ #include <iomanip>
+ 
diff --git a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild b/sci-libs/rocRAND/rocRAND-5.1.3.ebuild
index 26ca0c5042b1..f5f90b407482 100644
--- a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild
+++ b/sci-libs/rocRAND/rocRAND-5.1.3.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
@@ -20,6 +20,9 @@ IUSE="benchmark test"
 REQUIRED_USE="${ROCM_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
+PATCHES=( "${FILESDIR}"/${PN}-5.1.3_stdint-gcc13.patch
+	"${FILESDIR}"/${PN}-5.1.3_no-symlink.patch )
+
 RDEPEND="dev-util/hip"
 DEPEND="${RDEPEND}
 dev-util/rocm-cmake
@@ -35,8 +38,6 @@ src_prepare() {
 	# change installed include and lib dir, and avoid symlink overwrite the installed headers
 	# avoid setting RPATH
 	sed -r -e "s:(hip|roc)rand/lib:\${CMAKE_INSTALL_LIBDIR}:" \
-		-e "s:(hip|roc)rand/include:include/\1rand:" \
-		-e '/\$\{INSTALL_SYMLINK_COMMAND\}/d' \
 		-e "/INSTALL_RPATH/d" -i library/CMakeLists.txt || die
 
 	# remove GIT dependency
@@ -54,6 +55,7 @@ src_configure() {
 		-DCMAKE_SKIP_RPATH=On
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-DBUILD_HIPRAND=ON
+		-DROCM_SYMLINK_LIBS=OFF
 		-DBUILD_TEST=$(usex test ON OFF)
 		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
 	)
diff --git a/sci-libs/rocRAND/rocRAND-5.6.0.ebuild b/sci-libs/rocRAND/rocRAND-5.6.0.ebuild
new file mode 100644
index 000000000000..b7b4ac7cc950
--- /dev/null
+++ b/sci-libs/rocRAND/rocRAND-5.6.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="Generate pseudo-random and quasi-random numbers"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocRAND"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.4.2_stdint-gcc13.patch )
+
+RDEPEND="dev-util/hip"
+DEPEND="${RDEPEND}
+dev-util/rocm-cmake
+test? ( dev-cpp/gtest )"
+BDEPEND="dev-util/rocm-cmake
+>=dev-util/cmake-3.22"
+
+S="${WORKDIR}/rocRAND-rocm-${PV}"
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_HIPRAND=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	export LD_LIBRARY_PATH="${BUILD_DIR}/library"
+	MAKEOPTS="-j1" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/benchmark
+		dobin benchmark_rocrand_*
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-07-30 10:41:39 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-07-30 10:41:39 +0100
commit	d97adbb13d8d4ce3f0521498a11e3d3af2154de2 (patch)
tree	a23f2eb147d7ff7bd988c4b80727987a5d1e2d54
parent	332763613830233610011722737f7dbccdae4931 (diff)