gentoo auto-resync : 06:10:2023 - 05:56:26

88 files changed, 2141 insertions, 421 deletions

diff --git a/Manifest b/Manifest
index 859e4d67e79b..39ca841e72af 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29277 BLAKE2B d42ccd3f7440aa58b407f9cacb656b8b468f18f296c4ad7ea8dfd084e7c12f0e45ea9dfae935b742b9306521869fbb36e7a9b355125b91a0a27ee6ad5806ace0 SHA512 7b843e9aae6af9780e2215cb01869358cf2d94cb65426785ba529779ddc900215648f14101ee9aab26047eb86bd02ec6b20a6f1466f9dc5e29e098b84e84bb42
-TIMESTAMP 2023-10-05T22:10:14Z
+MANIFEST Manifest.files.gz 29291 BLAKE2B 742509b19ad5c6f6b94c1b11db2cf6720bde6716ebec5f83b34f4e88f5837c2a9680bd771544862d59be0e82ade059371e3cb5c59627399e9cb4c08b452acb27 SHA512 55531dcd321598cdf95fe63ea29e36d7420bf1c706198986559da5e7d1a2cc0eb383e02f21ca00190501c00d31e4dde8ddb2cd4c6bd789eae7fd342de8b60450
+TIMESTAMP 2023-10-06T04:10:19Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUfNEZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUfiKtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCSBg//S2GlXfJqZwru8/Uu73+70v7N2B2bBUmHdpAqU3uTsAKYA1gO+7nMqJlt
-3+k9M+rxcvAniq2f5pwgofUwYfYajPqj63FHcKznTGKhtjJVyO8nPpsOt5S4pJOH
-V9L6ZTZH1XoW2vNg7CI++QRSWYxVDYTerGcTf0bdSLl0f8AVUQqFcn4giuVUirb0
-47JPNnsLMm7my6C+jTUYVzb7X+8a3KYVvvS2jo431pmlIfDakwvOTX4MxSM0d9Fl
-HXS26OHkHtztgi+W/vHFBtfI/x6Sp1CYTATNUdemtXHHyGQ90EsoaDUndp/+5fQq
-fufIqluWpv9O9YnI+LYjnUF9lNHm5vmfWrzX15Fulv7SyvWou7qD9G9i548QFtfz
-C6gkghxHEdhbmLCWwMrQzBArSC6Qt2W9ObrFqnVE5z/a1QsqhonbZo3B1+d1wSwe
-kntnVymdDUioimjKAqvKM6tRQ3hDNCSkuMiPbYWZrNKm2IckA3TZVkLoOW3wjmLs
-dweCP0hNnvEdVg/VZxZG1t7wm27HRLg6URPBgw1nX8uUnLLscLbkoFRc6v44VHiu
-qBrSVu9xREwBjEZIFXeoJKEVWY8sTvFlBMNz5Xm05AXTKAh2xdzsdqn66lMTTjER
-K86tizO4IUMjTNHGW/t1MScOgrNE/0lPz+93G4nqwa8W5szjeQA=
-=eO9H
+klBgfBAAnwjvx/43HS6z/CIgFLNphprr0Bj0ysrtepjLrDJyvYyZaj3KTKX4CDsc
+xQUb/cFnOG2nalqA9kk3sw9sF/8unc+KW9pmzBX5NzJQEiWOf3K1wyZ3Kkimt9Ns
+gKKKtyq05x1nvOYIu9Oc/viXE+tDruYx8ViTWST+g4S9nB82Vjh1UBxPXjtnhB1f
+jg1FuLnTkTKXCeVN7iB4oQcg7eaXR4kLV1T0+SV5zTVYg1FM8nyhcKvMRLnWbokM
+dBgrifUjh80O03buVinV0dbw4hhXzK2MHk+3A8aKKfUBU8mQKxmJQCinQ++jpUga
+JP0gQO8W+/AmRlq5BA4uGsKvIw7Q+/dGIDPNb88Cd/TwkkmcfkGLOiaIKkb3EirO
+rsrGRFcZmxB47/kgYaRtnaEtWBPdDAPofxvhUGMxrPjPleJsD/QfbcEQa/byniyv
+CpyutERujbKq8Pw/YVmWbR0y5ODT6zLKrbxlI4B1gqzigGE6SL2oFMpTf4lrd4Qs
+552yNi0sLV6WRtACuS8rqCnyRrTuPZ3tHFeVVk0sosAUXwKH+bOqsilbi3uiDJgv
+QYRJaZwkx9awM0En3IjKFsAPx7c6nVxl9GQYEkzUVm/68tZkwyGaQL2FOtyjq4bg
+OqfJz5k8+kJTTO/qS11ZuGV/Wt5rc/7kURrE196U9bJ3Y94Syo0=
+=8ZHj
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 547aabee1ea2..b5b59f3f2527 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index eee9518e4986..98bd22d0397c 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 415f25dc9419..b7dba291b6c5 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -4,8 +4,10 @@ AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690ca
 AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f87803a9b9f0ddafc86a8b21df912589357adf054302e5a69d300155bdf8dcd8b77c18c1ddf8a4042ae1f05de5faf46d SHA512 e507e3a52d2f5f48b65fdb77ceaa095f13fda3e834dafc976bcd291cb35755da879c9c99b7950b2905399dedf4ac3370bd70462343648613a7c6aedc141d7ef7
 DIST podman-4.5.0.tar.gz 17423692 BLAKE2B ba28e77626bb4bcdb85b20031e12cf93f2eb3174b678cb8e99557df13e2cdf377ea402eb373a51ea44302f878f8e1cdedda14a2f3ad8c9e88895754fc50c272e SHA512 8a699dc01fc3d7c4a9e5ef4f166170303fc30e0f6695c61f763944e1cb755e75896108e0c4166d184fe49e3a6859f045aa3883047ebba9290e851fc128d77cac
 DIST podman-4.7.0.tar.gz 20554573 BLAKE2B a98e52ec9fe48d5b70489ed6bd6961877cf67735048425ad30fe9de3e163f8266d6510c37b0c43effa90cc8ce1b39bdc46c5add90dabd8f78c79602824f132a6 SHA512 4cab8698a819cd42de4cb588978c94c91b0c85693db2476aa6d20d7f4e4a7674d417703f70bdbb5a0e94b678fd585ae03a95ff0e5b7eb2682d9f400b92915742
+DIST podman-4.7.1.tar.gz 20557503 BLAKE2B f34cc0e2c9bd46d8f538c51b7353b36aea3380233f998467f26aeee6c35850bc26ca25234d39426ae7e4951fb40bc9cf1b8218b1db92fc95bb4ce0f221827dbf SHA512 cb89a687900bdc8ab9aec01d11c4e3062d8735122aa03639fa6eeecde10ea4bc3633381bce1e65955bf112d4fda330182f81d81054916b1eca8b7354c0f55c14
 EBUILD podman-4.5.0-r1.ebuild 4166 BLAKE2B 94f8f30f755c9fff8975bb3abb883e285587fde977c1f37917d3e6cefd0be27b8d1c88b595fd803ec19c70744aa532c2919b23b7b28700a0c8d4e071f514af63 SHA512 b85d481ba927771f769d93bce9928cb97031c14ba1a1a9e95f1eec07284291cd500d51b5f174bb6a03405909e06ce0491172e863e15420bea5fc39cfa05c871b
 EBUILD podman-4.5.0.ebuild 4939 BLAKE2B bf6c2708e30d5d505f7010befbbce321ee78fd525cbd16523b95dcabf744b2c0f9bc0d15dcd2547660b2791bc3ec6b5bbff188463a74e3df330961129985a133 SHA512 0980613932f7a549ccb324b8597250ca004d9ffc768e79a6a2d0f6fa28048e777b98efa91332d48ebd57c9c83e0c4a8c5d06fa988c3e64393e052c94af256dba
 EBUILD podman-4.7.0.ebuild 3285 BLAKE2B 0e1b423e0da222dd179256cb572cd470c28d9ae979993cef05bbb71e93dafc23a26634d3d58c8efe283590785ff92a062a2b6266668eac225ec31ab392cef7cd SHA512 f79dfa57bb252a34d178d10e66456364989b67ce16d24503143c3858483c0ea85b16d5f7dc30131e4d9fdd557cb14a841d158e3c9dc783df0e015bcd46001323
-EBUILD podman-9999.ebuild 3285 BLAKE2B 0e1b423e0da222dd179256cb572cd470c28d9ae979993cef05bbb71e93dafc23a26634d3d58c8efe283590785ff92a062a2b6266668eac225ec31ab392cef7cd SHA512 f79dfa57bb252a34d178d10e66456364989b67ce16d24503143c3858483c0ea85b16d5f7dc30131e4d9fdd557cb14a841d158e3c9dc783df0e015bcd46001323
+EBUILD podman-4.7.1.ebuild 3267 BLAKE2B fa4df1776c79e2b791b090384a5a8972a39f6e68f06ca8679b0cb1fcdf1b043f32b8135b24ae8e9eb5f03c830398a406a02225ed016e4e130c00d72285d6823d SHA512 22a56db38ff489eb9ec91515d4bf8d0da4c90f4e25f0f806dfac3c5b008cf913d0f7355f6d95e76bb628250f0c246363b22b8c716982584161291a56474e1698
+EBUILD podman-9999.ebuild 3267 BLAKE2B fa4df1776c79e2b791b090384a5a8972a39f6e68f06ca8679b0cb1fcdf1b043f32b8135b24ae8e9eb5f03c830398a406a02225ed016e4e130c00d72285d6823d SHA512 22a56db38ff489eb9ec91515d4bf8d0da4c90f4e25f0f806dfac3c5b008cf913d0f7355f6d95e76bb628250f0c246363b22b8c716982584161291a56474e1698
 MISC metadata.xml 1755 BLAKE2B fa4c8562a0a7de9352b555c1c268686cd2862a20dc6b34fbca9ab8c1e825c412a65728de731ad0e4eb848e0402fe7796b977c10b16ecc1ed3764f712c2103b97 SHA512 c068f54fa0c88fb46c7696921770abd3ea07c385d85eb3b78cd218e86b672da28d3a4afe76a707847adbcfc10cb08cb98de392cb2e2a62c2c020c0ae469eee71
diff --git a/app-containers/podman/podman-4.7.1.ebuild b/app-containers/podman/podman-4.7.1.ebuild
new file mode 100644
index 000000000000..f10c9b0ec10a
--- /dev/null
+++ b/app-containers/podman/podman-4.7.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module tmpfiles linux-info
+
+DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
+HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/podman.git"
+else
+	SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="apparmor btrfs cgroup-hybrid wrapper +fuse +init +rootless +seccomp selinux systemd"
+RESTRICT="test"
+
+RDEPEND="
+	app-crypt/gpgme:=
+	>=app-containers/conmon-2.0.0
+	>=app-containers/containers-common-0.56.0
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-apps/shadow:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
+	!cgroup-hybrid? ( app-containers/crun )
+	wrapper? ( !app-containers/docker-cli )
+	fuse? ( sys-fs/fuse-overlayfs )
+	init? ( app-containers/catatonit )
+	rootless? ( app-containers/slirp4netns )
+	seccomp? ( sys-libs/libseccomp:= )
+	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-go/go-md2man
+"
+
+PATCHES=(
+	"${FILESDIR}/seccomp-toggle-4.7.0.patch"
+)
+
+CONFIG_CHECK="
+	~USER_NS
+"
+
+pkg_setup() {
+	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	local file
+	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
+		[[ -f hack/"${file}".sh ]] || die
+	done
+
+	local feature
+	for feature in apparmor systemd; do
+		cat <<-EOF > hack/"${feature}"_tag.sh || die
+		#!/usr/bin/env bash
+		$(usex ${feature} "echo ${feature}" echo)
+EOF
+	done
+
+	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
+	cat <<-EOF > hack/btrfs_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
+EOF
+}
+
+src_compile() {
+	export PREFIX="${EPREFIX}/usr"
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
+
+	insinto /etc/cni/net.d
+	doins cni/87-podman-bridge.conflist
+
+	newconfd "${FILESDIR}"/podman.confd podman
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	PODMAN_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
+
+	local want_newline=false
+	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-9999.ebuild
index 2c7ededf36fd..f10c9b0ec10a 100644
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@@ -7,6 +7,7 @@ inherit go-module tmpfiles linux-info
 
 DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
 HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
+
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/containers/podman.git"
@@ -14,6 +15,7 @@ else
 	SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
+
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="apparmor btrfs cgroup-hybrid wrapper +fuse +init +rootless +seccomp selinux systemd"
@@ -60,12 +62,12 @@ pkg_setup() {
 src_prepare() {
 	default
 	local file
-	for file in apparmor_tag btrfs_installed_tag btrfs_tag selinux_tag systemd_tag; do
+	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
 		[[ -f hack/"${file}".sh ]] || die
 	done
 
 	local feature
-	for feature in apparmor selinux systemd; do
+	for feature in apparmor systemd; do
 		cat <<-EOF > hack/"${feature}"_tag.sh || die
 		#!/usr/bin/env bash
 		$(usex ${feature} "echo ${feature}" echo)
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 60a950361566..23ced9d6336e 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/sequoia-chameleon-gnupg/Manifest b/app-crypt/sequoia-chameleon-gnupg/Manifest
index e8a87bb9c2b8..cde100f25763 100644
--- a/app-crypt/sequoia-chameleon-gnupg/Manifest
+++ b/app-crypt/sequoia-chameleon-gnupg/Manifest
@@ -1,3 +1,4 @@
+AUX sequoia-chameleon-gnupg-0.3.2-bump-crates.patch 2720 BLAKE2B af857e16db68b7b56f5a31b52bac79c6b0526445345f8cf074af893ef0ef12a1012e1490516e8338bc506a21bc9c2ed376d0c56817c09448907af984853d45b7 SHA512 feff7f317ad519f9cd0fbc7d69004ea442c387fb697dfc9298ed3517a61cb58412a7a6f066afb2957bfbab80f15bb6d687c059caf73fe95fc33fef5eab9fa41e
 DIST addr2line-0.19.0.crate 33210 BLAKE2B a6b393dcddfa0f858297efb6b261d3a23f118be45a3211ee15f6c58808f241dbcf5282f4a86be579360513f23ac4035819e923f2587b7499110af42e9ac3ab88 SHA512 18da72e412bb89028e2ccb838192330535e45300f6fd8edc7d1d64397792a3db12418aa24a3312730c5414e2a1b1d65e6b9d5691ba234c9142b5d885523a5e94
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aead-0.5.2.crate 15509 BLAKE2B 0214f3e8ee85a7e18c7d20f9a3fcbdbb9e5af6fdfdcb427e915279b505556dbd2df6d09d5c90561417c56796236a56ab24b2b11389745bc03a0a6da45c0e8636 SHA512 61926a615618e64efd0e9342d729a89f80d6e092dda50e018252a06147e2ca0dc2a989136416f57ae02019695757dfa3d3f3cf3799f138e440662744ecab4a44
@@ -13,6 +14,7 @@ DIST backtrace-0.3.67.crate 78564 BLAKE2B 8c77d3d182c7e1ec3840fd6c7f4214322e473b
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST base64-0.21.0.crate 72180 BLAKE2B c7aeaf671bdeac67703f9c4ee1be003eb8d6f46fbaa0adf61a4da304458742938db04291d5f626115e3fcc901eb3abb3f9baf8247f6344b4d49f60a200fc6fd2 SHA512 60bcc157c6449a2160e083611e6d53e07bbff7db8cd550d9056cb804e99e990d4a20092ba4347306a3c6b6c42474a06d92cb3895125c50cef9b74cd3cbd83a2f
 DIST bindgen-0.57.0.crate 199132 BLAKE2B ed5d73da72116acca0124770f6f8e162c161c3375980505a704d3fc73ad20fc8cd81ce59680deb4922def8737914027c1c1e2c9fb4b181ddf114a08522657b62 SHA512 a4bf376aa0f84e625f4c5eed7bdc9775549b0ab9e9edcee708d8b56df6cb49611b7093692e772ed7ad5adb1c3d8055d81b4ff19359a193a5bfb4b200ca8a26a8
+DIST bindgen-0.63.0.crate 201856 BLAKE2B a99470e5878c90d0ff4cdcba5d16177eb765822041203c7224f9baf1fda23f83d92c3b9cd83759ed9ca779f9d3961509b4d7e038b716b9d68bf6563743ca8141 SHA512 43ac3067b3635c968c3a4bf6d665d633b9b80ff4eec36aad353019fc16e25c2338ea3f00a7fb077ae0dc055d10ea3ed6c304055a18dcf0c31bf980c26b110796
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -33,6 +35,7 @@ DIST capnp-futures-0.14.2.crate 11421 BLAKE2B ea74dd0511886b9f9a1a7a174f71ee81e9
 DIST capnp-rpc-0.14.1.crate 76196 BLAKE2B 32775637354fac46e9f242a613d7a1f90c56858259222a0b08d5682265eea1484c15c928118634628e8364c419347dc4babcc9708c15f4bfdc54fb025589600a SHA512 3cd6ef7283c540074cd125fd14bb204833e37ce734c6875795f6d63079207ad8edaf9a678a181171295a882c2547519cc723d45995bac7d7dab89569b44411ba
 DIST cc-1.0.78.crate 61375 BLAKE2B fd4765cf5ae0dc7018bc6b56298cd0fa9bf6fe23545e845670d98ce73baee55354e77c6d87cf047f10b074f3d742deca8b5631a250c69b347b4a1fc653965d43 SHA512 b85bec4c75cb1d1e252419052e9dd22b6892e54ea36195ff483a04f785b5b103e82b30b778459fd45324ffeb2463aa4f5696baeff2779c25ffe9f65eb99ae893
 DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37
+DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.23.crate 187259 BLAKE2B b4a7cfb8d1921d396c9e2bf350e6c61d04480a78c170d153e525ff581e8298936583744b6c59769774fdb8ad433269d01ad792f967da96e6c19d33460de937f9 SHA512 697a78ee83eaf38d83011bdf2086b3149b830d3d270e8414828b98ed2426063df43ac6eb4324f2dd694662afb86e6e4f005dee6116dfdd97adaebedefffd43fa
@@ -173,15 +176,18 @@ DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a8329
 DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
 DIST memsec-0.6.2.crate 5737 BLAKE2B f1270c63255736fef18a55658614b64049a1ba6d26765f6e8be00a9a66d0dd846dce7eadf234ecdc804fe32fc4d2ae2a4b0a1a366b622f281cc1a6c6cac72ada SHA512 07588f961d1b8cdff8accfcf03a2dcc28246c8dbd902929a6f0a4def387a39d50d4b276e523e7fd669bd22296252a379d12fb63b22f5014e8ee69811fd355112
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
+DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
 DIST mio-0.8.5.crate 93993 BLAKE2B 6c20d66c3b5753234c0ab0461642b63e84383128db775c6e01d50bade5a69081f7da1626f87244c2c45c2451690e8cdca02e2d1ca20f279ba6f8401fb006c7cc SHA512 e92bbc1d06ad8d4311d76f878d514d0c91e47de2c511c54bb53096ad689012c3d1ffeec18e2de05a5f66c03ad83150cd45d31edd203e9b9522ece13be00bcede
 DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c
 DIST nettle-7.2.2.crate 575136 BLAKE2B d82c6675a304bd2c8dd2184f101dfa09bf72d5ca1293e17df38146807fd7cbb131c4858f24a251292723a5b916ccf43cb8b660e0ec5d5f2ea61f8be9921799f2 SHA512 d799680c0035cdf46be176fa4a4411a0a8e76aadd5e249b683edf85b8e0530ed36c1735352043e4764a64fc432d4e6669cea6fe5fa54e8c3c8d5c97f2932cfd4
 DIST nettle-sys-2.1.0.crate 27365 BLAKE2B d8adf0768efbab1b7bd5e12d5c7608e450d5f2090605598179b6bc5291a379c99b05b430e73d0d0cd8e301060928269652af3baaf5ce8ff513513715306c4ac5 SHA512 499f6f8d08ac4853816db3e3323695d065ee5d7e8588c3b7725e722f92875940a212945b0af71956e1846a1064c0afac74c54021fbf06d0c5f2d2704d32e9797
+DIST nettle-sys-2.2.0.crate 28559 BLAKE2B 87da765ad2e88e595a6fbaad4f3d972e72c0a1fe4b5e16efd91e9c0f601c307c3891586f27e9f6096224775253479a4e63b37f2c73133e5ee9122b53ca863625 SHA512 db72ab5f0bfd79230489d1310ba6d91ff55ec8d7229f0c21cc309fcf50aba6c8db44fda946c01642b4b9d348c7d113d77d3c13f7cc395f7fde7e9c50cbb6e90f
 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
 DIST nibble_vec-0.1.0.crate 11796 BLAKE2B 2e80648e4e18d17fdd41671acc1e166a8337fe1ec1765e5a7f08c19fbcb23ce43b11d1cb396b867b9a2c0ae58e30225d9b13fa337793d8c32abf99969e7c11af SHA512 21bc50bfa5f11f50b19a20691346f098db083ceb6891faed72fb91d2e911cee060ad4d19ee1c98792c5809cb6ab2bd65061bc051a1dea75d9096060b87497f67
 DIST nix-0.18.0.crate 209962 BLAKE2B 3ff822e3d49a6c477d5da3702fc88bbe270202acb4f7c449a78969ada9b8fc8855a90ee194bd2943dd27c28286b88e1b22a6003e08260e19f7c8ed6036bc2891 SHA512 b86660bfa2533fdfb945a3ef840c692b5d96108e3e73b76d6489b65039cde87ae04935d2f10878cab1ea38f039083aebf4ec9b2bb6ba66ee204be700e3e96581
 DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
+DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST ntest-0.9.0.crate 5212 BLAKE2B e252d146109a93bbc4591605534e8c994b8c5345d6efbd9fbd47ac196619eedaf3c2abc615581176f27a9f4e2632be8ae779f5c3a44d07b089b6115a5f233ee3 SHA512 266b3d81addea3c6e8bbff0cb3c1411d4709e2f6f978e34743a7fea0f3f5b241209f8569c09f604331beb1338060a5f5c901b27e3e68d2741333aff63e059846
 DIST ntest_test_cases-0.9.0.crate 5336 BLAKE2B 8a67d43fd0e224acfd4b3abafd412ad2951a012bee97227b7d86dd25fda0d5426bf737ff37b215ad6eec36ffd95f0fe694a245d317af5f28d1f51e3413274afa SHA512 09bb4d14137204237c099a6ba5461915ed538d6c3389833d1c611940e74cd6506d161a996c4fbb75fdbc3a9690d5d0409649d7d50574ef798194351fa83e8825
 DIST ntest_timeout-0.9.0.crate 2972 BLAKE2B 49611ccee56913cc16f1d76d17a9c92544956e974a9059bf160dccf555fd885328b5369d1efd7611f85b8aeecd8bbf1db8ee4760424117c31e52906e0243e5df SHA512 fe7db5f555cac1e5d04759466f63d5cafb58d715d99b18d5611d2f7e0f1ab82cd52e607a70147bc8ccf91475de5be4e1f3306df842e59afb5e464a27dbfd2248
@@ -267,6 +273,7 @@ DIST serde_with_macros-3.0.0.crate 28221 BLAKE2B e0a202135e93ee6347f50a3a2f7967b
 DIST sha1collisiondetection-0.2.7.crate 821703 BLAKE2B 6a51a0547e4f6760d49a2216f9e00c680e74425b8ce032defc0aca3c08e3b24efa1f4c6ec165603db7b8ea1aef3a022ed9b01f0ea90bf6f4a609220dc1267800 SHA512 7b7edc81dd4ed8994eaa2686c8922dc3e6c83497f5715c4aaafd30f509dd324f9c09ccc0bad5fe54c2ab501b6988386aac6b9493f2276fba856a87a7eccc7977
 DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
+DIST shlex-1.2.0.crate 6584 BLAKE2B ac07c648d9affe62512edab307fe07436dce69b428570ba6455aaf21c178145b1026e35704f920fc177b334cf190f57e393e4dd9e522dd26d133f80fb2c15f47 SHA512 cf48c0c47aac44654a48047fed3568c30f53f19cd131615cabbc247dbdf1eb1b7540b0d188f341251b4876dd0d5fcc13792800f0160f7907e8d8fe9a5e75083f
 DIST signature-1.6.4.crate 16012 BLAKE2B 5c003942d28fed88cc0bf1ec6c69011cc514de935004f6d24d1bbb7da1cd5c9c719cccb63013f71c1bb5ccd47351585b1422fec423d43dfcf56ff1b371191e8a SHA512 7409b4c26c6f569d486ceeb4648af2bfb9854cd9f35fde11ef0e17ae31cecc4293418e2d86e8101c79737a6d5cf9a8098bfbd64477ff4d2f537aed98eb3424bf
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521
@@ -361,4 +368,5 @@ DIST zeroize-1.3.0.crate 15913 BLAKE2B 571d96420e85e3d12100dcaff00d4721eae729646
 DIST zeroize_derive-1.3.3.crate 10380 BLAKE2B 5ed1fd50f483e1eeec54584adb3d6e20f12987037edf859bd0ca1e9274c41be332edfd4a294d25a96ec811ab06299185148702f4317dbcf1c5e0a23e7e8116b0 SHA512 cfe53287c80866868ca435414efba32267f68b6b95dca9c11201365c9fc21444b1ca926fe8a2dd64c0978a8691e351108538bc7e1fc6f60feb83dde93f56b3c3
 EBUILD sequoia-chameleon-gnupg-0.3.1.ebuild 8278 BLAKE2B 048b80077686f06508a58324ebc4b9784ea9b8c6c82f9bbdab32de82ab4b6b7b125db636e87f09c292e82ff1fdc8dc34ae0ee0bc17c2b40881e9668f21fe92d2 SHA512 2a0fafe70adb723cae883e746df2fe96af45ce2342e5502e703e72fa5f79dfdc14467fe63b06509d03a5555d06e1809e66f152bf0bd0ff9caadacfb7bfbc163f
 EBUILD sequoia-chameleon-gnupg-0.3.2-r1.ebuild 8315 BLAKE2B 48cfd4a276a2c39f8ceb961692d8aa3b301f98d6b26f93d52aea6f67a5066faa59c7cf1ec2e24da7fa6e725a6273bd67b38fb37a2c08b23ca9596ae1731c9fa1 SHA512 ac57c3423c8f738ab6aa52749070dd5aca2a5f34775d2df3048862cfbf6c510e32e70bf4e9ba0e2a6d794f1dfe8c142cc2756d198e9ea8072a7a3a72a3bf128a
+EBUILD sequoia-chameleon-gnupg-0.3.2-r2.ebuild 8396 BLAKE2B c300e323a507f637f3e807b605ff13a8aa2058ce37056e3a0eea7bdad170ad0e4207a133f891edc05b7ccfdd230b6ba618e4f3c1a4525a2a4e1cf5bfb530efc9 SHA512 0abca94702b8671a26d8637592da0b0f8012a4a1b1b0174aca13ab7eb7ecf325d55c079564d65d373cda67223b1717ed86846a4bb441cadbaf06934340714b98
 MISC metadata.xml 447 BLAKE2B a876bb1a6e3290305705c7b732d4225f658687095bcba12285f3c3e258177ffe9dd3ba0cd4e3b309dcb6e076906a8d568f9af1d932870ee1a4d471b9989a07cf SHA512 7d2d5e66179740cc71a73bc918c20ce0e022053841f60a1b8bbe71b9ef7df64457c39d2113e98043eaadc435953475823c0d8945e59f2ba3700b505680953afe
diff --git a/app-crypt/sequoia-chameleon-gnupg/files/sequoia-chameleon-gnupg-0.3.2-bump-crates.patch b/app-crypt/sequoia-chameleon-gnupg/files/sequoia-chameleon-gnupg-0.3.2-bump-crates.patch
new file mode 100644
index 000000000000..f6bbeecdfbd5
--- /dev/null
+++ b/app-crypt/sequoia-chameleon-gnupg/files/sequoia-chameleon-gnupg-0.3.2-bump-crates.patch
@@ -0,0 +1,90 @@
+Avoid nettle-sys failure with either new pkgconf or >=nettle-3.9.0?
+
+https://bugs.gentoo.org/913729
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -131,9 +131,9 @@ checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+ 
+ [[package]]
+ name = "bindgen"
+-version = "0.57.0"
++version = "0.63.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d"
++checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
+ dependencies = [
+  "bitflags 1.3.2",
+  "cexpr",
+@@ -146,6 +146,7 @@ dependencies = [
+  "regex",
+  "rustc-hash",
+  "shlex",
++ "syn 1.0.105",
+ ]
+ 
+ [[package]]
+@@ -303,9 +304,9 @@ checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+ 
+ [[package]]
+ name = "cexpr"
+-version = "0.4.0"
++version = "0.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
++checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+ dependencies = [
+  "nom",
+ ]
+@@ -1642,6 +1643,12 @@ version = "0.3.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+ 
++[[package]]
++name = "minimal-lexical"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
++
+ [[package]]
+ name = "miniz_oxide"
+ version = "0.6.2"
+@@ -1695,9 +1702,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "nettle-sys"
+-version = "2.1.0"
++version = "2.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b13b685c7883e3a32196ccf3ce594947ec37ace43d74e157de7ca03d3fe62d17"
++checksum = "b5e81c347b9002da0b6b0c4060993c280e99eb14b42ecf65a2fefcd6eb3d8a73"
+ dependencies = [
+  "bindgen",
+  "cc",
+@@ -1736,12 +1743,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "nom"
+-version = "5.1.2"
++version = "7.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
++checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+ dependencies = [
+  "memchr",
+- "version_check",
++ "minimal-lexical",
+ ]
+ 
+ [[package]]
+@@ -2697,9 +2704,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "shlex"
+-version = "0.1.1"
++version = "1.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
++checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+ 
+ [[package]]
+ name = "signature"
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.3.2-r2.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.3.2-r2.ebuild
new file mode 100644
index 000000000000..1a5ab1081d66
--- /dev/null
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.3.2-r2.ebuild
@@ -0,0 +1,427 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.6.2
+
+EAPI=8
+
+CRATES="
+	addr2line@0.19.0
+	adler@1.0.2
+	aead@0.5.2
+	ahash@0.8.3
+	aho-corasick@0.7.20
+	android_system_properties@0.1.5
+	anyhow@1.0.66
+	ascii-canvas@3.0.0
+	async-trait@0.1.63
+	atty@0.2.14
+	autocfg@1.1.0
+	backtrace@0.3.67
+	base64@0.13.1
+	base64@0.21.0
+	bindgen@0.63.0
+	bit-set@0.5.3
+	bit-vec@0.6.3
+	bitflags@1.3.2
+	bitflags@2.3.2
+	block-buffer@0.10.4
+	block-buffer@0.9.0
+	block-padding@0.3.3
+	botan-sys@0.10.1
+	botan@0.10.1
+	buffered-reader@1.2.0
+	bumpalo@3.11.1
+	byteorder@1.4.3
+	bytes@1.3.0
+	bzip2-sys@0.1.11+1.0.8
+	bzip2@0.4.3
+	capnp-futures@0.14.2
+	capnp-rpc@0.14.1
+	capnp@0.14.11
+	cc@1.0.78
+	cexpr@0.6.0
+	cfg-if@0.1.10
+	cfg-if@1.0.0
+	chrono@0.4.23
+	cipher@0.2.5
+	cipher@0.4.4
+	clang-sys@1.4.0
+	clap@4.0.32
+	clap_complete@4.0.7
+	clap_derive@4.0.21
+	clap_lex@0.3.0
+	clap_mangen@0.2.6
+	cmac@0.7.2
+	codespan-reporting@0.11.1
+	core-foundation-sys@0.8.3
+	core-foundation@0.9.3
+	cpufeatures@0.2.5
+	crc32fast@1.3.2
+	crossbeam-channel@0.5.8
+	crossbeam-deque@0.8.2
+	crossbeam-epoch@0.9.13
+	crossbeam-queue@0.3.8
+	crossbeam-utils@0.8.14
+	crossbeam@0.8.2
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	ctor@0.1.26
+	ctr@0.9.2
+	curve25519-dalek@3.2.1
+	cxx-build@1.0.83
+	cxx@1.0.83
+	cxxbridge-flags@1.0.83
+	cxxbridge-macro@1.0.83
+	daemonize@0.5.0
+	darling@0.20.1
+	darling_core@0.20.1
+	darling_macro@0.20.1
+	data-encoding@2.3.3
+	dbl@0.3.2
+	diff@0.1.13
+	digest@0.10.7
+	digest@0.9.0
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	dirs-sys@0.3.7
+	dirs-sys@0.4.1
+	dirs@4.0.0
+	dirs@5.0.1
+	doc-comment@0.3.3
+	dot-writer@0.1.3
+	dyn-clone@1.0.9
+	eax@0.5.0
+	ed25519-dalek@1.0.1
+	ed25519@1.5.3
+	edit-distance@2.1.0
+	either@1.8.0
+	ena@0.14.0
+	encoding_rs@0.8.32
+	endian-type@0.1.2
+	enum-as-inner@0.5.1
+	enumber@0.3.0
+	errno-dragonfly@0.1.2
+	errno@0.2.8
+	fallible-iterator@0.2.0
+	fallible-streaming-iterator@0.1.9
+	fastrand@1.8.0
+	fd-lock@3.0.8
+	filetime@0.2.19
+	fixedbitset@0.4.2
+	flate2@1.0.25
+	fnv@1.0.7
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	form_urlencoded@1.1.0
+	fs2@0.4.3
+	futures-channel@0.3.25
+	futures-core@0.3.25
+	futures-executor@0.3.25
+	futures-io@0.3.25
+	futures-macro@0.3.25
+	futures-sink@0.3.25
+	futures-task@0.3.25
+	futures-util@0.3.25
+	futures@0.3.25
+	generic-array@0.14.6
+	getrandom@0.1.16
+	getrandom@0.2.8
+	gimli@0.27.0
+	glob@0.3.0
+	h2@0.3.15
+	hashbrown@0.12.3
+	hashbrown@0.13.2
+	hashlink@0.8.2
+	heck@0.4.0
+	hermit-abi@0.1.19
+	hermit-abi@0.2.6
+	hex@0.4.3
+	home-dir@0.1.0
+	hostname@0.3.1
+	http-body@0.4.5
+	http@0.2.8
+	httparse@1.8.0
+	httpdate@1.0.2
+	hyper-tls@0.5.0
+	hyper@0.14.23
+	iana-time-zone-haiku@0.1.1
+	iana-time-zone@0.1.53
+	ident_case@1.0.1
+	idna@0.2.3
+	idna@0.3.0
+	indexmap@1.9.2
+	inout@0.1.3
+	instant@0.1.12
+	interprocess@1.2.1
+	io-lifetimes@1.0.3
+	ipconfig@0.3.1
+	ipnet@2.7.1
+	is-terminal@0.4.2
+	itertools@0.10.5
+	itoa@1.0.5
+	js-sys@0.3.60
+	lalrpop-util@0.19.8
+	lalrpop@0.19.8
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libc@0.2.138
+	libloading@0.7.4
+	libm@0.2.6
+	libsqlite3-sys@0.26.0
+	link-cplusplus@1.0.7
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.1.4
+	lock_api@0.4.9
+	log@0.4.17
+	lru-cache@0.1.2
+	match_cfg@0.1.0
+	matches@0.1.10
+	memchr@2.5.0
+	memoffset@0.7.1
+	memsec@0.6.2
+	mime@0.3.16
+	minimal-lexical@0.2.1
+	miniz_oxide@0.6.2
+	mio@0.8.5
+	native-tls@0.2.11
+	nettle-sys@2.2.0
+	nettle@7.2.2
+	new_debug_unreachable@1.0.4
+	nibble_vec@0.1.0
+	nix@0.18.0
+	nom@7.1.3
+	ntest@0.9.0
+	ntest_test_cases@0.9.0
+	ntest_timeout@0.9.0
+	num-bigint-dig@0.8.2
+	num-integer@0.1.45
+	num-iter@0.1.43
+	num-traits@0.2.15
+	num_cpus@1.14.0
+	object@0.30.0
+	once_cell@1.17.0
+	opaque-debug@0.3.0
+	openpgp-cert-d@0.1.0
+	openssl-macros@0.1.0
+	openssl-probe@0.1.5
+	openssl-sys@0.9.83
+	openssl@0.10.48
+	option-ext@0.2.0
+	os_str_bytes@6.4.1
+	parking_lot@0.12.1
+	parking_lot_core@0.9.5
+	peeking_take_while@0.1.2
+	percent-encoding@2.2.0
+	petgraph@0.6.2
+	phf_shared@0.10.0
+	pin-project-lite@0.2.9
+	pin-utils@0.1.0
+	pkg-config@0.3.26
+	ppv-lite86@0.2.17
+	precomputed-hash@0.1.1
+	proc-macro-crate@1.3.1
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.60
+	quick-error@1.2.3
+	quote@1.0.28
+	radix_trie@0.2.1
+	rand@0.7.3
+	rand@0.8.5
+	rand_chacha@0.2.2
+	rand_chacha@0.3.1
+	rand_core@0.5.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	rand_hc@0.2.0
+	rayon-core@1.10.2
+	rayon@1.6.1
+	redox_syscall@0.2.16
+	redox_users@0.4.3
+	regex-syntax@0.6.28
+	regex@1.7.0
+	remove_dir_all@0.5.3
+	reqwest@0.11.14
+	resolv-conf@0.7.0
+	roff@0.2.1
+	rusqlite@0.29.0
+	rustc-demangle@0.1.21
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	rustix@0.36.5
+	rustversion@1.0.9
+	ryu@1.0.12
+	schannel@0.1.21
+	scopeguard@1.1.0
+	scratch@1.0.2
+	security-framework-sys@2.8.0
+	security-framework@2.8.1
+	semver@1.0.17
+	sequoia-cert-store@0.3.2
+	sequoia-ipc@0.30.1
+	sequoia-net@0.27.0
+	sequoia-openpgp-mt@0.1.0
+	sequoia-openpgp@1.16.0
+	sequoia-policy-config@0.6.0
+	sequoia-wot@0.8.1
+	serde@1.0.164
+	serde_derive@1.0.164
+	serde_json@1.0.91
+	serde_urlencoded@0.7.1
+	serde_with@3.0.0
+	serde_with_macros@3.0.0
+	sha1collisiondetection@0.2.7
+	sha2@0.9.9
+	shlex@1.2.0
+	signature@1.6.4
+	siphasher@0.3.10
+	slab@0.4.7
+	smallvec@1.10.0
+	socket2@0.4.7
+	spin@0.5.2
+	stfu8@0.2.6
+	string_cache@0.8.4
+	strsim@0.10.0
+	subtle@2.4.1
+	syn@1.0.105
+	syn@2.0.18
+	synstructure@0.12.6
+	tempfile@3.3.0
+	term@0.7.0
+	termcolor@1.1.3
+	terminal_size@0.2.3
+	thiserror-impl@1.0.37
+	thiserror@1.0.37
+	time-core@0.1.0
+	time-macros@0.2.6
+	time@0.1.45
+	time@0.3.17
+	tiny-keccak@2.0.2
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.0
+	to_method@1.1.0
+	tokio-macros@1.8.2
+	tokio-native-tls@0.3.0
+	tokio-socks@0.5.1
+	tokio-util@0.7.4
+	tokio@1.23.0
+	toml@0.5.11
+	toml_datetime@0.6.1
+	toml_edit@0.19.4
+	tower-service@0.3.2
+	tracing-attributes@0.1.23
+	tracing-core@0.1.30
+	tracing@0.1.37
+	trust-dns-client@0.22.0
+	trust-dns-proto@0.22.0
+	trust-dns-resolver@0.22.0
+	try-lock@0.2.4
+	typenum@1.16.0
+	unicode-bidi@0.3.8
+	unicode-ident@1.0.5
+	unicode-normalization@0.1.22
+	unicode-width@0.1.10
+	unicode-xid@0.2.4
+	url@2.3.1
+	vcpkg@0.2.15
+	version_check@0.9.4
+	want@0.3.0
+	wasi@0.10.0+wasi-snapshot-preview1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasi@0.9.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.83
+	wasm-bindgen-futures@0.4.33
+	wasm-bindgen-macro-support@0.2.83
+	wasm-bindgen-macro@0.2.83
+	wasm-bindgen-shared@0.2.83
+	wasm-bindgen@0.2.83
+	web-sys@0.3.60
+	widestring@0.5.1
+	win-crypto-ng@0.4.0
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.42.0
+	windows-sys@0.48.0
+	windows-targets@0.48.0
+	windows_aarch64_gnullvm@0.42.0
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.42.0
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.42.0
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.42.0
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.42.0
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.42.0
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.42.0
+	windows_x86_64_msvc@0.48.0
+	winnow@0.3.5
+	winreg@0.10.1
+	xxhash-rust@0.8.6
+	zbase32@0.1.2
+	zeroize@1.3.0
+	zeroize_derive@1.3.3
+"
+
+LLVM_MAX_SLOT=15
+inherit cargo llvm xdg-utils
+
+DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
+HOMEPAGE="https://sequoia-pgp.org/"
+SRC_URI="
+	https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/archive/v${PV}/${P}-v${PV}.tar.bz2
+	${CARGO_CRATE_URIS}
+"
+S="${WORKDIR}"/${PN}-v${PV}-0052b89698af9ef6e1915ce12db119f399f3cea9
+
+LICENSE="GPL-3+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ LGPL-3+ MIT MPL-2.0
+	Unicode-DFS-2016
+	|| ( GPL-2 GPL-3 LGPL-3 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+# See e.g. https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/issues/8
+# Even though that's fixed as of >0.2.0, tests still completely fail inside
+# Portage. Not yet sure why/how. They do better outside, although some fail
+# still then.
+RESTRICT="test"
+
+DEPEND="
+	dev-db/sqlite:3
+	dev-libs/gmp:=
+	dev-libs/nettle:=
+	dev-libs/openssl:=
+"
+RDEPEND="${DEPEND}"
+# Needed for bindgen
+BDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))"
+
+QA_FLAGS_IGNORED="usr/bin/gpg-sq usr/bin/gpgv-sq"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.2-bump-crates.patch
+)
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_test() {
+	export GNUPGHOME="${T}"/.gnupg
+	export REAL_GPG_BIN="${BROOT}"/usr/bin/gpg
+	export REAL_GPGV_BIN="${BROOT}"/usr/bin/gpgv
+
+	mkdir "${GNUPGHOME}" || die
+	chmod 700 "${GNUPGHOME}" || die
+
+	xdg_environment_reset
+	RUST_BACKTRACE=full cargo_src_test -vv
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 4f11f5881469..a7f4364e9284 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
index cda6ad4d60f5..c4df3136fad1 100644
--- a/app-text/htp/Manifest
+++ b/app-text/htp/Manifest
@@ -1,3 +1,7 @@
+AUX htp-1.19-fix-perl-5.26.patch 245 BLAKE2B 62f2b7a3ea607f00c07ef286dadf276c816663be65a82d3a879b33c7a556f6b788df491f63d5cae3c1472c5e03e143796bfb069071731f7d58a9ee9b28e2fbe0 SHA512 95195c71eb3b2897798f49c6da1b797c54eb2da4f5cd3235879203ea1cdf00bc863014a9cd88f7994786c0abce6dff77ee0169e9b433df5e0a81cef243375d02
+AUX htp-1.19-no-prestrip.patch 238 BLAKE2B 02d28ba9bda2264de0edd0a0179c04bafc90b35a14fc7cbd54a97ee21005a77b4b1c9bca00d7e3641831f26949c159d60ee3c48e26c2b5f9dc544cc727e38074 SHA512 6a673c84b97255b22e7bcbf19c5bfaa48f886de99652ac88310b253682df0bd412468300087e82c226e5272279459b05d33f5088f29e8d1b56dc4b9412064fd9
+AUX htp-1.19-parallel-make.patch 758 BLAKE2B d3f106b9951386c2485b95773b455a925196c0a1b9e051306a7724d07672096046c2317af4c7559e104fc27799aa94d96a91f7f3913d5ab50c25470b1ffca9c7 SHA512 3946a7ac4dd37dbd768389c4761cf7a4187cdefb315a4581438be83ebf8355805f7d6f4d168d1940e9d73c4dc6c125e0e9c158ed577e61c4d257267894d6df3f
 DIST htp-1.19.tar.gz 208683 BLAKE2B 86837290a2f14b8a0337d9eb6a0fa4ad553c5c51074d5df903ee19aa7ba441898199f0649b39b93c35fa3707e4084a284e02d8802c014bf5c0277e3f18d02c98 SHA512 32d82bb42ef877bd815fe45fa81599a1428ad6d3269cbe53a4e686bcfe6d1c12ac2af280462768d488b1983ca67cc521da4ed78cc82d904575ffeff08c7eec1d
+EBUILD htp-1.19-r1.ebuild 845 BLAKE2B dbf5370dacd12249e84be567512a7451ee06ef3ffa6b8f88002608fc22602c9b77ccb57108c6cd1aaf07be4e435a02a5dd8fb5570fbccd3135ab09e18b37c8d4 SHA512 4eba9d70b0b98ff199029e6472cfb30a489da7f6c37858964c48364c54d10323a53d8411acb442ff56b912be6db88471ab8c3e0d3dcbb8542eb97689f897db5b
 EBUILD htp-1.19.ebuild 688 BLAKE2B 260c735a88959148e91d0987c1310459003284e82dd1de4d9565ef744a48ae6c640f5d8585b304fd07ecc057ba4a87312bea49bbb7127db85558538d4d2aa898 SHA512 b29c85c8f3c7a513d790182fb45f84e27fd7474b8207cab1d13f35d7c8d09175d31ec2742306c08ad15723ecbcc4469bb80ff2b367397e6baffc674a4bd5d8bd
 MISC metadata.xml 324 BLAKE2B f50c674c3b49fdf33568893e52cdc07346930fc63577ae3a06d88b4458da04fcce805f1ad65cacab300ad0ed1ce499d554fad0643494d018ba4ab479cc11e954 SHA512 840a52457ca080294d6dadcb72b32da6a22e5c51565e53894383f46d369edafaf949fe4fc147986c559609a75a6a56582d253e79e29a7daf4cebcffe74b01cb4
diff --git a/app-text/htp/files/htp-1.19-fix-perl-5.26.patch b/app-text/htp/files/htp-1.19-fix-perl-5.26.patch
new file mode 100644
index 000000000000..b3adff7db2be
--- /dev/null
+++ b/app-text/htp/files/htp-1.19-fix-perl-5.26.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/668250
+--- a/homepage/ref/pphtp.pl
++++ b/homepage/ref/pphtp.pl
+@@ -6,7 +6,7 @@
+ #  -n include line numbers
+ #  -s include EBNF like syntax
+ 
+-require "hlhtp.pl";
++require "./hlhtp.pl";
+ 
+ 
+ while ($ARGV[0] =~ /^-(.*)/) {
diff --git a/app-text/htp/files/htp-1.19-no-prestrip.patch b/app-text/htp/files/htp-1.19-no-prestrip.patch
new file mode 100644
index 000000000000..c47b9e4d4241
--- /dev/null
+++ b/app-text/htp/files/htp-1.19-no-prestrip.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.sub
++++ b/src/Makefile.sub
+@@ -46,7 +46,7 @@ install: install-bin
+ 
+ install-bin: $(HTP)
+ 	mkdir -p $(bindir)
+-	$(INSTALL) -s $(HTP) $(bindir)
++	$(INSTALL) $(HTP) $(bindir)
+ 
+ #
+ # explicit dependency: final executable
diff --git a/app-text/htp/files/htp-1.19-parallel-make.patch b/app-text/htp/files/htp-1.19-parallel-make.patch
new file mode 100644
index 000000000000..850b1d18e330
--- /dev/null
+++ b/app-text/htp/files/htp-1.19-parallel-make.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/827173
+https://sources.debian.org/patches/htp/1.19-8/0004-Parallel-ftbfs.patch/
+
+Description: Fix occasional parallel FTBFS
+ Various source files indirectly include $(d)/version.inc,
+ don't regenerate it in the middle of the build.
+Author: Adrian Bunk <bunk@debian.org>
+
+--- htp-1.19.orig/src/Makefile.sub
++++ htp-1.19/src/Makefile.sub
+@@ -57,14 +57,12 @@ $(HTP) : $(OBJ$(d))
+ #
+ # implicit dependencies for source code
+ #
+-$(OBJ$(d)) : %.$(OBJEXT) : %.c
++$(OBJ$(d)) : %.$(OBJEXT) : %.c $(d)/version.inc
+ ifdef WIN32DMC
+ 	cd $(dir $<); $(CC) $(CCOPT) $(DEFINES) $(notdir $<)
+ else
+ 	$(CC) $(CCOPT) $(DEFINES) -o $*.$(OBJEXT) $<
+ endif
+ 
+-$(d)/htp.$(OBJEXT) $(d)/ver.$(OBJEXT): $(d)/version.inc
+-
+ # restore parent dir
+ d := $(p$(d))
+
diff --git a/app-text/htp/htp-1.19-r1.ebuild b/app-text/htp/htp-1.19-r1.ebuild
new file mode 100644
index 000000000000..c01e19b48e7d
--- /dev/null
+++ b/app-text/htp/htp-1.19-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="An HTML preprocessor"
+HOMEPAGE="http://htp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.19-no-prestrip.patch
+	"${FILESDIR}"/${PN}-1.19-parallel-make.patch
+	"${FILESDIR}"/${PN}-1.19-fix-perl-5.26.patch
+)
+
+src_compile() {
+	# TOOD: Tests are always run by the Makefile right now
+	emake \
+		CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
+		CC="$(tc-getCC)" \
+		LINK='$(CC) $(LDFLAGS)'
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix='$(DESTDIR)/usr' \
+		pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
+		install
+}
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 14218128cae8..7a1d938d1b9a 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,7 +1,9 @@
 DIST lesspipe-2.06.tar.gz 168100 BLAKE2B a7447efa85cd422343f9dbb06001e85fa7b33c92db752f8248e4b4a0d9ecce4ef0241240d6993c5a71157c44da2f4ffc3efd41ac5e0a31e89ed5b80ac99f71fe SHA512 b2411c5e6b287fb67e1ea9b6d10377fe19b58e8c0f54587f825d1ee4c1a85f9a8ed3244a7cf339bcba960094e95821d9a56929951d862eb697f1d12fe55ef20d
 DIST lesspipe-2.07.tar.gz 168973 BLAKE2B b9be5968d808dc57caa00551cdf663be75dff1c9662b585ddd2e1891f6f66fce0b71a468d9b9172af2833bd6ee255ad9b5fb917dac527eeb8b57427c568cd620 SHA512 6fa5debfa5b72fa5826294eca158a935a0b49dc431bd27eb7dc598315592d575ad302bb94fcdb86409dce1cb7055242ff10eb09cbf3708e472b8dbe8286d5511
 DIST lesspipe-2.08.tar.gz 169527 BLAKE2B c1b1e4b9d3b24f7a9547f25a276bdee7aebf35777401441bb9bbefef3f3ff319ca8ef330c76e969811cbb2047a539aa4d2dbea5059c5ed06a69bea43d54f94a9 SHA512 309f69240308eab082ed9bff1bda1785eb8394022e576ff49656816cf793e0f3bb26bb0f41eff4c1437ed7719cbd810a83d75d8a1a08a11a8cf378c1741397bd
+DIST lesspipe-2.10.tar.gz 170918 BLAKE2B 156fe53975252ac6c59a637ffe0ee9862be0699f325a0b328e5c0f2cb5e6f7d8324481f3d3211cbb15a585a5dabde45adf87ac4e0af91cd34540359331684264 SHA512 3fe122cf0adf8dd3e0782ae65132c58d76f7131a2e8c30d9a10eb426c6f63e50b4b5e02b6792524a37b27ca572bd3e2661a6c82118e9c4ed5ecbccaf2c5a42e2
 EBUILD lesspipe-2.06.ebuild 1271 BLAKE2B 058b3721627c8b4e0054f709207a89956d3121fdb337d66872bbfaee860811a75b807cac6a72c1058d9737be43df4f3f7a685036341028f5edd6112156aa1773 SHA512 ea3033cc6e826f33d57156d04fd70b625dd2c42d2eaedc6719661f25788a22cd4d3f468603a50cc1e85bcf82c56b1a7ba698fdd37d4c032a7017a2f1be7c7583
 EBUILD lesspipe-2.07.ebuild 1308 BLAKE2B e0e051c4fcc0a97d365d9a00c26e77a8953d0c832a83c56700f5aa502bae169840ab3abcab5bfc9de4d8e9700a11634337df2813350141024f2f5f5180970502 SHA512 a8f6b914053eaaa48faeadf9730f7fbbdba2be47c82cf935144857b2d75d069bdfc0e48e67c03b148264dbcc9a4c308d658d40c826aa746d77fce39ae880ef17
 EBUILD lesspipe-2.08.ebuild 1306 BLAKE2B de9328c85649a107f7b0290d6d6b3b6e03c31825988fbf278c48aebe2af988992fe43c8e999483162f3c61f8ea1dd8a4a37aa36087e7e3d6ed22c19124dd2bd1 SHA512 c2214069bb84cf5d30e129f629ca0ef4d0e0e6c8d1bf50e0d9a102b3a81ee47e51c62cbf60fe3c7479a04271af0b35c680ef1921a790c562d2907675302821b9
+EBUILD lesspipe-2.10.ebuild 1308 BLAKE2B d6ac7a3ba1ba1b4671813a476d02861d3dd9bbbbeb1253bc059ad1032bb0c268c7201dacd5d0d2035afa24900f74a39429a4cee29924fc07d14778d6cc9f4648 SHA512 0b84f99b8deebccfa8207064992de827dfc585168b4f20be28f66b1fab33ba577544b859c454be6165867af957c9b14fad4c12d7b098e6c075eb7aafb0c8142c
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.10.ebuild b/app-text/lesspipe/lesspipe-2.10.ebuild
new file mode 100644
index 000000000000..f3b596821f54
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.10.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo bash-completion-r1
+
+DESCRIPTION="Preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+# Please check again on bumps!
+# bug #734896
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="dev-lang/perl"
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( app-editors/vim )
+"
+
+src_configure() {
+	# Not an autoconf script.
+	edo ./configure --prefix="${EPREFIX}"/usr
+}
+
+src_compile() {
+	# Nothing to build (avoids the "all" target)
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+
+	rm "${ED}"/usr/share/bash-completion/less_completion || die
+	newbashcomp less_completion less
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 33c3af50c436..f34ed0ec64a3 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index a68ae7dd8257..e0ffecb31146 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -3,9 +3,12 @@ DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b
 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
 DIST gettext-0.22.2.tar.xz 10238092 BLAKE2B 337597432af11ba082354e968fa7dd95aa6b568344b464d6bfb606d9f9bbe88fee035d39f29fdce62e28a9ece7da29cbde23093ca2af0cdd1955f26abd854036 SHA512 c5c24eca1c7e8e242e6b993a39068dc281b84fda7f06e5020dc7fc10ac7de5bfcc476b7e94711723a7f82cc7f5a0845616ddd553078ee69690e3a146fc3f8ae5
 DIST gettext-0.22.2.tar.xz.sig 833 BLAKE2B 47a3480c6ec5b379e2262588a358e69560477c5e8cdc13d82f879bf1c2381c4b176060e6e1d482b0a9b17d497ff5e7c1642646489f3829c879340b939d51de5c SHA512 b40f233d64001b13ab5d5b85bc87424bc873cbbd6e59e797997ed39404325a5a2dc945f7b6a3dfc25becaff788d5dd644779bf505d5141bfa437882931dcf22c
+DIST gettext-0.22.3.tar.xz 10236340 BLAKE2B 567945a9554f14729835b63587d0ae1e8c1a4538ec039243b525abe4bff9a30cd02d0ddb12f3475f27c6a2a0c6647e52201f2ea34ba60d1867c063c653718785 SHA512 ccfd17d664f02da58b91623845fde23b9763442cb988be979d814aff66d774db87ed7d8b27dcce84bf8f118d85d34f4782ce451c5d3cb5a9484161ba2c3f4209
+DIST gettext-0.22.3.tar.xz.sig 833 BLAKE2B a329a9b6d9bc8e7dfc4bda748624649f1a4d66fbe5ab4e61038e0e931d5838448bfd93a093b5f4fff8e86f446683ca660f47d8bfd2a0dc27f52f575daaa116ef SHA512 fd3fdbd78e5f86dd1e5d149cac7e7f1ee6c553e1c703bb141906116cb6e8603042128aa64a9dfc06c51841c5748c532219337735911e55c7c99306099fd5d719
 DIST gettext-0.22.tar.xz 10008808 BLAKE2B e91c82eb793897bd7ed727503e9d6e72a47027adf51ca76cf5c936437c434e910508814b1d03b12694c5e87156018683cb2c8cc51637b121313ed41155bcd3e5 SHA512 c6368344aa4e0f6fd7c4a93023a5f7b377c7bb97b8ea688fd54f4c385c069d9ff27611d8763b1aed6328b6d3c4db7b34bd89bfbf6525ecaef11eb58434a4d4fa
 DIST gettext-0.22.tar.xz.sig 833 BLAKE2B d1718f02100abc2c7c67e5c6a49000baee5244030fcef33f099fac255562211332b0c7838d329e2cdd2c99c5b4e5d4bfed6da81cdddd86a4adf9f24f626c8704 SHA512 2d4f0ea68150aa9f7da315545bd782f0c74d581ec89f60ca5138d069cc6ef0296f85df6e05f0c7f030dc8660a8db32529d237497473f6cef7c72034adcc58a9b
 EBUILD libintl-0.21.1.ebuild 2725 BLAKE2B 6213eda4c30383cbcd8d90f4041af79b92377dbd719243ef0b6ddd31d182e42730b2ad4c556f3e4549a5cde49264cffcaae147fc36de7fb4f7475d9786680234 SHA512 e91a802db10a0ece6710644928e7bc4050b5f0e63da0001166c7f6b827fb1d155edcc252fb1a9310d1b2e6855bf8ea0585711437684fc6cfcd5ed7fb6b240407
 EBUILD libintl-0.22-r1.ebuild 2896 BLAKE2B 64fc4b6bcaeea61041583a93db7da6908be267fb13a36d752e82841d50d359a134b8200d4175490a9f916671ee02b17db267618243dc0f066561b0a32872e1c0 SHA512 8828a7b7b22c396d1bc65fd9f45dad7906c2fda33ab765afeec94c4b120da0c4c6c96bce45af7000fc1bc70ab09ff0e0f2e461d04b6e527b94d92306fcee15a3
 EBUILD libintl-0.22.2.ebuild 2682 BLAKE2B 901ecb7960d3d5d014cb531bdab4cfb0ac9565b3039454dda63b1d2c2e49c945f11bf41050c33a7016c64421dd58fec6599edca7082fd6fc4857fb2f7cea1bcf SHA512 cc0769fb6930cd9403bac6293c47edbaf559bc6df2f961fe8890f5cea3ae8d7c72d769f8ad75fb19e46d2b34a658e41a9f61b506d9817b26aeb1afdbeb8f5385
+EBUILD libintl-0.22.3.ebuild 2682 BLAKE2B 901ecb7960d3d5d014cb531bdab4cfb0ac9565b3039454dda63b1d2c2e49c945f11bf41050c33a7016c64421dd58fec6599edca7082fd6fc4857fb2f7cea1bcf SHA512 cc0769fb6930cd9403bac6293c47edbaf559bc6df2f961fe8890f5cea3ae8d7c72d769f8ad75fb19e46d2b34a658e41a9f61b506d9817b26aeb1afdbeb8f5385
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/dev-libs/libintl/libintl-0.22.3.ebuild b/dev-libs/libintl/libintl-0.22.3.ebuild
new file mode 100644
index 000000000000..8e0a98b1ff08
--- /dev/null
+++ b/dev-libs/libintl/libintl-0.22.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: Keep version bumps in sync with sys-devel/gettext.
+
+EAPI=8
+
+MY_P="gettext-${PV}"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc
+inherit multilib-minimal libtool usr-ldscript verify-sig
+
+DESCRIPTION="the GNU international library (split out of gettext)"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="
+	mirror://gnu/gettext/${MY_P}.tar.xz
+	verify-sig? ( mirror://gnu/gettext/${MY_P}.tar.xz.sig )
+"
+S="${WORKDIR}/${MY_P}/gettext-runtime"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs +threads"
+
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
+# Block C libraries known to provide libintl.
+RDEPEND="
+	${DEPEND}
+	!sys-libs/glibc
+	!sys-libs/musl
+	!<sys-devel/gettext-0.19.6-r1
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gettext )"
+
+src_prepare() {
+	default
+
+	cd "${WORKDIR}/${MY_P}" || die
+
+	# gettext-0.21.1-java-autoconf.patch changes
+	# gettext-{runtime,tools}/configure.ac and the corresponding
+	# configure scripts. Avoid regenerating other autotools output.
+	#touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die
+	# Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac
+	#touch -c configure || die
+
+	cd "${S}" || die
+
+	# The libtool files are stored higher up, so make sure we run in the
+	# whole tree and not just the subdir we build.
+	elibtoolize "${WORKDIR}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--cache-file="${BUILD_DIR}"/config.cache
+
+		# Emacs support is now in a separate package.
+		--without-emacs
+		--without-lispdir
+		# Normally this controls nls behavior in general, but the libintl
+		# subdir is skipped unless this is explicitly set.  ugh.
+		--enable-nls
+		# This magic flag enables libintl.
+		--with-included-gettext
+		# The gettext package provides this library.
+		--disable-c++
+		--disable-libasprintf
+		# No Java until someone cares.
+		--disable-java
+
+		$(use_enable static-libs static)
+		$(use_enable threads)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	# We only need things in the intl/ subdir.
+	emake -C intl
+}
+
+multilib_src_install() {
+	# We only need things in the intl/ subdir.
+	emake DESTDIR="${D}" install -C intl
+
+	gen_usr_ldscript -a intl
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.la" -delete || die
+	fi
+
+	rm -r "${ED}"/usr/share/locale || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 42e6a80a2376..583c7d05591b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 7a18e8ab96f3..98ad0d6482fe 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -5,6 +5,8 @@ AUX cython-0.29.23-test_exceptions-py310.patch 656 BLAKE2B 6c650c85d01b8bf367528
 AUX cython-3.0.2-enummeta.patch 2485 BLAKE2B 65d662309a470e316f6fbf5d310f6a0821e1f9d170203a698b336cf85dcf2f83d500a8bfbde2064e9c29f69e69097a311952ca96301f44a1581e6e730125cb31 SHA512 2c7f0d5a91b82f08b88c5129857fc75e2aa4ef770707605733af1c8a75f3d3a8ba0a82095f9393c2452fdb4afc48f52958ccc49757a541752c798e8ff6e3353c
 DIST cython-0.29.36.gh.tar.gz 2115333 BLAKE2B 6d43779c7222ff65d7de3a35ec18ef636480807d53480a8f94cc8c92d462fcc2f4d201a3bbf6e840a11fd33025e32c53f85626b05c131d10eed2859cdca7eb2d SHA512 a086fe1a11290cd3c870b891e61a0a0e2595bab9c26888024a758b6950c07059346d682fa9349e46c0af89805abbdd750059b3189960b8ce18007dfb5eb4391a
 DIST cython-3.0.2.gh.tar.gz 2744583 BLAKE2B f631891870a6ce24acf2bcde75ebcb9775cf0df7840fe9d7b138cfdea64d54e9253a53d35d892a9086f251c1294d9414eec8521218d031840a3cd06903fefb86 SHA512 f55be138efdca6ca61bd39c6f2fab736244328a170a6f6c9bda87036e022c846930b209e9e9101fad889cb179d6e60034ba6f299f14b3056536d46235b438eb7
+DIST cython-3.0.3.gh.tar.gz 2753188 BLAKE2B 0e6d40533f1cebf3c4217dc19aeebc2f873a8bacb94e68810e81d1c6d4cd75176de88516f2d82f43b36107656b6cd5e6990547e93bd8436b1aa93c73ccda6eaf SHA512 c27c16abaf0122ad61e0eeb92aa80a33fc491332b8ebec209cd1810d2b0e3bf14fe1e81838803b86f407520a6d6f7ab8b84d97e495e7d91fd6f7702a46980caa
 EBUILD cython-0.29.36.ebuild 2232 BLAKE2B 437729f1c61680b7d7f4d6cba1bbfd85e8ae6f70e4da47d8ff30aa84cf5ec50e7049671d75d6b7921e02236ffd47c3451e6f01bebc9e55e1ee834879e62f8b56 SHA512 dfd4d1f7c1907f27ff38a2e2dbcf27de4c5435920cbd19874430827e3089ca6285d225ae594f6c1566d84880fbcc541a7f78f3709c960822590b2e4fba5765a8
 EBUILD cython-3.0.2-r1.ebuild 2085 BLAKE2B e8a78a6d020acf7755d6cd2ab0c9cb5f9a704eb4aa3bdff6761fd6a9cacde72374fb49f270bb98eab7d9754a7f03d0a43f863f0eb7336f5b7af405f884887eaf SHA512 3685d1eb1d4766ddca4220a750c13ad978bdffb168bb3ab05671c22e58f1860ace6ca60c3d8a55c74226942c711124a2953f51861ff2ce05f7fed21aad626620
+EBUILD cython-3.0.3.ebuild 2017 BLAKE2B 0416cca96aa1e5ff9ef31fbad4260b348aa33f7422b0092e26a8a7564613fc0b2681d3f1a3345775e0941e863c96624878f7acf3bd47f3b28a67a113daeb5434 SHA512 933421ea06e3ca92c8a635b73e474e783fa4456870f63f34bd55f706e8e97bdff918b9cb03c1723389839f2dfd16de3e869b87336494327f7abd3cbd60d87776
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-3.0.3.ebuild b/dev-python/cython/cython-3.0.3.ebuild
new file mode 100644
index 000000000000..4223753eab93
--- /dev/null
+++ b/dev-python/cython/cython-3.0.3.ebuild
@@ -0,0 +1,84 @@
+# 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_TESTED=( python3_{10..11} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 multiprocessing toolchain-funcs
+
+MY_P=${P/_rc/rc}
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="
+	https://cython.org/
+	https://github.com/cython/cython/
+	https://pypi.org/project/Cython/
+"
+SRC_URI="
+	https://github.com/cython/cython/archive/${PV/_rc/rc}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+	"${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.patch"
+)
+
+distutils_enable_sphinx docs \
+	dev-python/jinja \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+		einfo "Skipping tests on ${EPYTHON} (xfail)"
+		return
+	fi
+
+	# Needed to avoid confusing cache tests
+	unset CYTHON_FORCE_REGEN
+
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py \
+		-vv \
+		-j "$(makeopts_jobs)" \
+		--work-dir "${BUILD_DIR}"/tests \
+		--no-examples \
+		--no-code-style \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 771d13627253..70ab1307adc7 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,3 +1,3 @@
 DIST mypy-1.5.1.gh.tar.gz 2901212 BLAKE2B b136cf061162bc50a48f1556763d7a1258b5a29b63a77db9190f89c56d3e85375a2b0e826d75472a0dc37df4d3391f2d85bb5f1f29c2907055a978e3c8d75906 SHA512 2c81322c0e7d9621e6d189f4d9d25d77c5fd6decbb563c8d0015e0f94ff1ff8206e5b7a38884edd3eedb99e839c03283ebfa7d86577c9f8e0d707c0cc4eb8fed
-EBUILD mypy-1.5.1.ebuild 1676 BLAKE2B 3c67fde5252f68056f1b2700e4992e7c29430b264c3a2a15444fbe2f25822df2a4a133e5ec7496a040e7b1926707415febe782ec93a507fc2f79670b40d7425c SHA512 43208c8a1b83b54f8957488518066266bf676b47de3ff7d6e954d88f8f7ff03255ba3b1f96dbb3636b2bb20d1d411c8bb3b5b607c1f36e75f29f9d9d4bee1842
+EBUILD mypy-1.5.1.ebuild 1548 BLAKE2B a8aedcd6bbb5efe0cdebd4451ea3b0ef2eba9d66c89802d73fea4785c97fb75f748267431686325e22217321b5d8d3f3789b83a0b349b4b159ed0bd87e5c3f9c SHA512 a1d829e224dc3b12d0ae50fa8774c5414cbd5c13106a8d29004a525295ef11cbede074052b4fd71af2cbcb69c9bf330c7d8cba487b8ec00e9d1de8d3915557b4
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-1.5.1.ebuild b/dev-python/mypy/mypy-1.5.1.ebuild
index cc6ca1914147..7a9d3c91109a 100644
--- a/dev-python/mypy/mypy-1.5.1.ebuild
+++ b/dev-python/mypy/mypy-1.5.1.ebuild
@@ -40,9 +40,6 @@ BDEPEND="
 		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-7.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 63e4564b36c3..6fc97b29811e 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-xdist-3.3.1.tar.gz 77751 BLAKE2B 483774b3fefefb513cc3021c49fd816089869a885ba098588e503530ff3b2dfb77612aff80a7147ff33fd8c1fe69c4fda40133de94007e41c699ad763d112e92 SHA512 f439ff1acf65a8df025fec847602ebdc5355b2099501845f8cde3c5287299a9c3102fa6dd6fc82a30bc016893556a24b0b5409323f5db4015e77c711a7b5c59f
+EBUILD pytest-xdist-3.3.1-r1.ebuild 1061 BLAKE2B 3cc707cfa3d284e4b0dbea9cd28220c6b60bdacbd79ac7d54f6f46c44f392e2d6819d306bc6515f5f78e230cec51dc8947516431abbaf4660e53844216b1d907 SHA512 7948f46c67b08e478b40a0abf482b89339bc3dd3e2cd647c3a823856e7e3febf2808e1ea8649929edbbfff94ea372672c88e6e47c7a63092abc92190c2295f34
 EBUILD pytest-xdist-3.3.1.ebuild 1097 BLAKE2B d3edfdae4b57a6dcb23427285e21a266ca52f5b7e8a0b8f75a8b63e22c43ae62acfa7f802a7b31fdc31223742ddbd9dd1f1a5223e8573ab780156c34624cef72 SHA512 f125820c3bbd2f50359e3dbfc70e101c59048f7d4d4e9d41c25f1b8c5b9a29e8160985644f0ac72c83bbef30486761d58db970d5197e2a811d1d4070aad21626
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.3.1-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..441f239a2f03
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-3.3.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="
+	https://pypi.org/project/pytest-xdist/
+	https://github.com/pytest-dev/pytest-xdist/
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# disable autoloading plugins in nested pytest calls
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, force loading necessary plugins
+	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
+
+	epytest
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e6f553c4b1f6..d109318f97ec 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 711d0b8278c6..3febb5aad661 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -4,10 +4,12 @@ DIST dav1d-1.0.0.tar.bz2 960470 BLAKE2B 79355eeceea37df81e30be49dfea3dee9747fbbb
 DIST dav1d-1.1.0.tar.bz2 994368 BLAKE2B 877fd315fb00cb37c80f128c871641b8dbc4a7c9edb3d81afe00e65cb907ed88bcc10e2f92855d1eef51e196a7ae6d189db16dcf0e151f7ca9db715451bd28f5 SHA512 2eb177b415d1ac7bd08d54b16375afedec61f0771a5181fa93e5e6215856fc26504a7cb47de08abbea5bf18fac5ff91ca31044e7054681c380e0ab152e53aabc
 DIST dav1d-1.2.0.tar.xz 866120 BLAKE2B f9c9ca8c48ba2cae8e2137bb46e9db9a2070b3fba35ca142fde836f20be8a0db11b3b0dc3f78d06780d5cf6d014b0a6b545368371f421864d3f30a35ca6fe5ef SHA512 1f1775bdcdbc38a0bb12d7f14f01ee321cc03f15d8b7c6fabe2ada3a3c46885b0eff5851ea912079a1519ef01278c3a192e3b0347b0ab9b25cafab4124f1ae6a
 DIST dav1d-1.2.1.tar.xz 873008 BLAKE2B 52478112f1f2c39a020556a8ed18c1267de93fc129941eb87b75fa872188a0389389ba9c7f7ae641726ca78a0a515ce5923968374b8122fec159f33c1f65e7bc SHA512 f172eebc0a5f6c51d31fc9e9758c2dd0de51d8a5d0e00c93a5f2b1b16b7b4a37b365f9c56dea95d400e66b63af5fa4c63d9e720719ac38852777fc8c6066e4a7
+DIST dav1d-1.3.0.tar.xz 885220 BLAKE2B aa79eaa22adde287a31ed60b88ae8d4095e18b92359a7e30aecd13c10eafe07acdeeb2f0bdb232acc6b136cdbd87626ac641df0615683d50f355edfd6c028caf SHA512 a91d217b8656c452dd80f5597e988f0e7a2ea32b12092c2695e7dc388033db7b193f7a8c98413bec31d1c38af376561d39f7618b935c4feeb6498c5d2b43f6a4
 EBUILD dav1d-0.9.2.ebuild 1392 BLAKE2B bfc3a4e00ab29a8492a714e27ae9577ef5fa0963dbf041eea653a007d4fee4121cfa9c74279084ec1e83292d25ca3ade0cb4bf17ae1bbf49aee781a2af1dd26e SHA512 50521384c4d9d2a54f011e64a0ec9605bcbae244da3408c71c77cfc21633816e1573f4035e8d38565ef624fd136519475ef95c69e7abc7fd6ea1e377e921173d
 EBUILD dav1d-1.0.0.ebuild 1309 BLAKE2B de42f5a7895e34cf5acf6916f1cae3d7cb4837395a250b5bdd695e523dd49e8c1844bec32cc89323360117c35ccbf0f8529a531181f45f991366d17d70a1e8c2 SHA512 4d68269aec8f7b3f5cdca296d2faa1ab13ca3c482cb3aaaaf1e9a74d5cae6491582077bf4a1b886600d917189dad7f4e7f0b8d4111094c8fa4a84db41be46ff2
 EBUILD dav1d-1.1.0.ebuild 1321 BLAKE2B b0b6dda3b52dbffb3592e563645c35efca4343a888a242529cd0f18eec1986bbbcc3fd9f12b6e6855fe945122e555a61af3c555abcf04935371589ab5ce8fb0a SHA512 0bafdafc9715e590ed953366700d47df193aecf043d86f4030565de2996cf32436a1613fb2be766ce0c0f0e24bff4c3d3f5b4e5f70f745f84f188040703c69b6
 EBUILD dav1d-1.2.0.ebuild 1330 BLAKE2B 19b2fcff6f97bcf0000833a2673e0f5614678e270a843f10915af7d525a78252fc8053ae838db3aaaccd57fd769be634c9e3937bd64ffa86b0c5e36208e1e9dd SHA512 33796b8adcdf2096c45009de0cba1e544eb3d57084050e0b2ef740986f0b6e6e75c1e3efbe227aad60d01e0002368fda1e07b246bd322d4f0aa2b96eec2cefaf
 EBUILD dav1d-1.2.1.ebuild 1348 BLAKE2B a058cf73e95797b4eee169794d80e8c0a46c3ccaa2e78ad0a4e655cbb86b05b263e44f8168a3be27e3c1272973be5d25f43f2fcb79d42152f9574273911af333 SHA512 816557c6cb7e35541ea0f4186ae659a357a5345e25453e02041fdba9bdd9146bd8e7bd29ec905b885a54a50c792d6b39fa2bf584ce8391380f96a58a78f033df
-EBUILD dav1d-9999.ebuild 1330 BLAKE2B 19b2fcff6f97bcf0000833a2673e0f5614678e270a843f10915af7d525a78252fc8053ae838db3aaaccd57fd769be634c9e3937bd64ffa86b0c5e36208e1e9dd SHA512 33796b8adcdf2096c45009de0cba1e544eb3d57084050e0b2ef740986f0b6e6e75c1e3efbe227aad60d01e0002368fda1e07b246bd322d4f0aa2b96eec2cefaf
+EBUILD dav1d-1.3.0.ebuild 1354 BLAKE2B 1f8b2ab92bb03fb58289cc32e895185002b5d4e18c04c0c940004bcef287fb3f5f7612ff4ad091342d8be1c572d977046e13bc9f0ed17c25703c83bd1cdc2779 SHA512 00371911b5fa7834499eb786e16af27429c2a8f2bfe3f78d07e37b06d12020b6d33542f3d1b4a931ffd9140658ad7fc448baff051f15c9abb630c6aa7895fa1a
+EBUILD dav1d-9999.ebuild 1354 BLAKE2B 1f8b2ab92bb03fb58289cc32e895185002b5d4e18c04c0c940004bcef287fb3f5f7612ff4ad091342d8be1c572d977046e13bc9f0ed17c25703c83bd1cdc2779 SHA512 00371911b5fa7834499eb786e16af27429c2a8f2bfe3f78d07e37b06d12020b6d33542f3d1b4a931ffd9140658ad7fc448baff051f15c9abb630c6aa7895fa1a
 MISC metadata.xml 626 BLAKE2B 517fdb1d54d2714913d8d7644c5cc9d72ad04aa51160ba3b31b9915246c1aba3f18c3870428ce66a5b13afb50e6e65e95f12a65af931baf9b73defa8dba16c82 SHA512 7fca750f4f56a87b44ef4a14c466818411ff8a4aa1a376abb11b41648a661ef77c58611d649daebf97fafc1f5bc712d9486327b8f7ea6d94e1981a1d14bf2fd3
diff --git a/media-libs/dav1d/dav1d-1.3.0.ebuild b/media-libs/dav1d/dav1d-1.3.0.ebuild
new file mode 100644
index 000000000000..69bc630fc619
--- /dev/null
+++ b/media-libs/dav1d/dav1d-1.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.videolan.org/pub/videolan/dav1d/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
+fi
+
+inherit meson-multilib
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+# Check SONAME on version bumps!
+SLOT="0/7"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
+
+ASM_DEPEND=">=dev-lang/nasm-2.15.05"
+DEPEND="xxhash? ( dev-libs/xxhash )"
+BDEPEND="
+	asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)
+"
+
+DOCS=( README.md doc/PATENTS THANKS.md )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	local enable_asm
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		enable_asm=false
+	else
+		enable_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-Dbitdepths=$(IFS=,; echo "${bits[*]}")
+		-Denable_asm=${enable_asm}
+		$(meson_use test enable_tests)
+		$(meson_feature xxhash xxhash_muxer)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		meson_src_test
+	fi
+}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index 9fe8aea4d1ae..69bc630fc619 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/dav1d/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 fi
 
 inherit meson-multilib
@@ -18,7 +18,7 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
 
 LICENSE="BSD-2"
 # Check SONAME on version bumps!
-SLOT="0/6"
+SLOT="0/7"
 IUSE="+8bit +10bit +asm test xxhash"
 RESTRICT="!test? ( test )"
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 0c456fb8f715..ca6b02f8f531 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 819eb583c682..84ca844d75d7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Oct 2023 22:10:10 +0000
+Fri, 06 Oct 2023 04:10:14 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 6e90353ca441..e4f3ce6f25af 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 549618 BLAKE2B df3cca5309face77ad600cd7dd41da5c8d5969140f0f882439af0839721ca14a3e2ddda207c25ab4f6c4bb766db6e715560df951e539d7cc21ac6c04098c804d SHA512 fecd1787120b073b451d8a3eda16e7b1d80f65213749758b8dc28dd7adb7911c5d678553c3d79c9868d343fd46ecb5e858110be9deff13b5fe735cee99c77036
-TIMESTAMP 2023-10-05T22:10:14Z
+TIMESTAMP 2023-10-06T04:10:18Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUfNEZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUfiKpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCO+w/+O9eRi+POX/MPiWjRfOmyTXiMOKQb4VaOfGW4y9yIKaphVRsBl1XvTStd
-EDFTVwTYucmhCSDtJbHkJs5zB+k6ZFogOBDUeO5G+JUxkoD8khrx8ZTIbukFNaA/
-HWyf6khJF/SQAHVN/hIimObFLv6YB+WoLghOEGn5OYXu3ysy4SESGhlplHZuQ5kw
-mZFNOeuvgpQAKtjDvPAKm39nLu1+Y3YMgisM2ErFtOSVFRVixRPi+ZLpOwhlq52s
-jOq7zg6KgthJRb/0k4MeFDnkpTbI1LRdKD7BFwTNpmhx6j/qbZIzt5PgFAmknO7V
-rr5MznMCwpjU3DHMze8H5+8a7tXD/EvoelVTNbTq7LR4mPlnEEjkI7rGisWN1UNa
-cY+Cxz8fTYBD8cjZXsjFVYHSD2oarC0yhhhjFW3EuzK1yv3xFMNeyMXFVglRkPP9
-ByHPJiGGYCcViS2t5HhN7bCZK+vEXHCSm/s+1BjaNci6KL5Ebr0iVgBUzRKWcyks
-dVl466CPFTjYqAcCdss+IVSK1Sp82clZGWN1sshSoguEF/NehoGDtK1VcfAvNMPL
-99sAA7G/eAXizwc1Gvp83BoGPCWPj1winbkhsdJ+bOR4Ml4bCW1ajMmTi6xHRll0
-jL2jHRx6lBzBebwkaKERFqgaoa0pJQVmFz4KH1KuoneHZoWlyEE=
-=0wk5
+klCDvQ//XuwcSpqfyaudYGHIHJHJPYWODlfVH+C6UhHL96Mx3EA7bFojNZJLq+fE
+0RtJflqDKYZcssQsvpt+CMCH0J3sV432ZgY1GcJCbeBVpBcBIsaXPauDOdxrUJlj
+VhOxkcOMwnzImQk0PGQWwS2KvFLJ+RfvVFc5A2q0T40xSJzKc7YDbiBEfLY8OlSM
+ipBklRb1FtIWNSTkAAgrIE2/e0VEXAlGfvjzG7oojSeKUkUMtYhQVs0nyZ42Pb24
+5gDfIS25dZRSC1QMuEtqGtSPvXfWwHm/rYGQVgJuC1NwcQU1IC8gI397vLoF0neD
+4PWJiOsYrq7zE/47Bl9UCa0065Zv9Uj/8JQo1qRg6BHPvxo82XhOxzhu4iUqNy8C
+xbu96ofsSUgtZ76Lnpq35nY6+QuOwzawYb/JVpTITvygKz8SfddytTbDDB5a20bB
+5hwmfzfF31fYeSsLkRa0rk3hG3BoXbyX0Fwtb9KU+PmMogENYoyfmnC+kOQDgxHh
+okai1wCYaGK90XRhao6CoT/Z4IWtK55lsmekDx0FsNvrJGWGJeDBb3roXqP/0Spm
+nekIBI5ZhFfVzf6wmpZWlr8JrZ9t1wCa0IaqWag5lP/jhyrKPmBionIZ79TKlNd2
+rHXElbU765JdVgSXdd3iOV0rYkfK/gpocQoRMmX2yWFHan6PNTo=
+=2b0V
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 819eb583c682..84ca844d75d7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Oct 2023 22:10:10 +0000
+Fri, 06 Oct 2023 04:10:14 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b31ec46e3ef4..710d274eb4f5 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 73c1d16184f3..5224d33c812b 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/podman-4.7.1 b/metadata/md5-cache/app-containers/podman-4.7.1
new file mode 100644
index 000000000000..0bc4c93d8701
--- /dev/null
+++ b/metadata/md5-cache/app-containers/podman-4.7.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-go/go-md2man >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install postinst preinst prepare setup unpack
+DEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/containers-common-0.56.0 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) wrapper? ( !app-containers/docker-cli ) fuse? ( sys-fs/fuse-overlayfs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=A tool for managing OCI containers and pods with Docker-compatible CLI
+EAPI=8
+HOMEPAGE=https://github.com/containers/podman/ https://podman.io/
+INHERIT=go-module tmpfiles linux-info
+IUSE=apparmor btrfs cgroup-hybrid wrapper +fuse +init +rootless +seccomp selinux systemd
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/containers-common-0.56.0 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-apps/shadow:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) wrapper? ( !app-containers/docker-cli ) fuse? ( sys-fs/fuse-overlayfs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/containers/podman/archive/v4.7.1.tar.gz -> podman-4.7.1.tar.gz
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=b0c8b3c5d18853a8f73d80b782cefe60
diff --git a/metadata/md5-cache/app-containers/podman-9999 b/metadata/md5-cache/app-containers/podman-9999
index 71ce4143c3ce..419f4bd645e7 100644
--- a/metadata/md5-cache/app-containers/podman-9999
+++ b/metadata/md5-cache/app-containers/podman-9999
@@ -12,4 +12,4 @@ RDEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 >=app-containers/contain
 RESTRICT=test strip
 SLOT=0
 _eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	go-module	8624eede24936fd7666e5298e5332f22	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=dc2d95ecff95dddab65f00ca9327d8cb
+_md5_=b0c8b3c5d18853a8f73d80b782cefe60
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index a81a27f384e4..d78e319b52f3 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/sequoia-chameleon-gnupg-0.3.2-r2 b/metadata/md5-cache/app-crypt/sequoia-chameleon-gnupg-0.3.2-r2
new file mode 100644
index 000000000000..ff4e9feeabf1
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/sequoia-chameleon-gnupg-0.3.2-r2
@@ -0,0 +1,16 @@
+BDEPEND=<sys-devel/clang-16 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=dev-db/sqlite:3 dev-libs/gmp:= dev-libs/nettle:= dev-libs/openssl:= !!sys-devel/llvm:0
+DESCRIPTION=Sequoia's reimplementation of the GnuPG interface
+EAPI=8
+HOMEPAGE=https://sequoia-pgp.org/
+INHERIT=cargo llvm xdg-utils
+IUSE=debug
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-3+ Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016 || ( GPL-2 GPL-3 LGPL-3 )
+RDEPEND=dev-db/sqlite:3 dev-libs/gmp:= dev-libs/nettle:= dev-libs/openssl:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/archive/v0.3.2/sequoia-chameleon-gnupg-0.3.2-v0.3.2.tar.bz2 https://crates.io/api/v1/crates/addr2line/0.19.0/download -> addr2line-0.19.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aead/0.5.2/download -> aead-0.5.2.crate https://crates.io/api/v1/crates/ahash/0.8.3/download -> ahash-0.8.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/anyhow/1.0.66/download -> anyhow-1.0.66.crate https://crates.io/api/v1/crates/ascii-canvas/3.0.0/download -> ascii-canvas-3.0.0.crate https://crates.io/api/v1/crates/async-trait/0.1.63/download -> async-trait-0.1.63.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.67/download -> backtrace-0.3.67.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/base64/0.21.0/download -> base64-0.21.0.crate https://crates.io/api/v1/crates/bindgen/0.63.0/download -> bindgen-0.63.0.crate https://crates.io/api/v1/crates/bit-set/0.5.3/download -> bit-set-0.5.3.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.3.2/download -> bitflags-2.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.4/download -> block-buffer-0.10.4.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-padding/0.3.3/download -> block-padding-0.3.3.crate https://crates.io/api/v1/crates/botan-sys/0.10.1/download -> botan-sys-0.10.1.crate https://crates.io/api/v1/crates/botan/0.10.1/download -> botan-0.10.1.crate https://crates.io/api/v1/crates/buffered-reader/1.2.0/download -> buffered-reader-1.2.0.crate https://crates.io/api/v1/crates/bumpalo/3.11.1/download -> bumpalo-3.11.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.3.0/download -> bytes-1.3.0.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/capnp-futures/0.14.2/download -> capnp-futures-0.14.2.crate https://crates.io/api/v1/crates/capnp-rpc/0.14.1/download -> capnp-rpc-0.14.1.crate https://crates.io/api/v1/crates/capnp/0.14.11/download -> capnp-0.14.11.crate https://crates.io/api/v1/crates/cc/1.0.78/download -> cc-1.0.78.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/cipher/0.4.4/download -> cipher-0.4.4.crate https://crates.io/api/v1/crates/clang-sys/1.4.0/download -> clang-sys-1.4.0.crate https://crates.io/api/v1/crates/clap/4.0.32/download -> clap-4.0.32.crate https://crates.io/api/v1/crates/clap_complete/4.0.7/download -> clap_complete-4.0.7.crate https://crates.io/api/v1/crates/clap_derive/4.0.21/download -> clap_derive-4.0.21.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/clap_mangen/0.2.6/download -> clap_mangen-0.2.6.crate https://crates.io/api/v1/crates/cmac/0.7.2/download -> cmac-0.7.2.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.8/download -> crossbeam-channel-0.5.8.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.13/download -> crossbeam-epoch-0.9.13.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.8/download -> crossbeam-queue-0.3.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/crossbeam/0.8.2/download -> crossbeam-0.8.2.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/ctor/0.1.26/download -> ctor-0.1.26.crate https://crates.io/api/v1/crates/ctr/0.9.2/download -> ctr-0.9.2.crate https://crates.io/api/v1/crates/curve25519-dalek/3.2.1/download -> curve25519-dalek-3.2.1.crate https://crates.io/api/v1/crates/cxx-build/1.0.83/download -> cxx-build-1.0.83.crate https://crates.io/api/v1/crates/cxx/1.0.83/download -> cxx-1.0.83.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.83/download -> cxxbridge-flags-1.0.83.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.83/download -> cxxbridge-macro-1.0.83.crate https://crates.io/api/v1/crates/daemonize/0.5.0/download -> daemonize-0.5.0.crate https://crates.io/api/v1/crates/darling/0.20.1/download -> darling-0.20.1.crate https://crates.io/api/v1/crates/darling_core/0.20.1/download -> darling_core-0.20.1.crate https://crates.io/api/v1/crates/darling_macro/0.20.1/download -> darling_macro-0.20.1.crate https://crates.io/api/v1/crates/data-encoding/2.3.3/download -> data-encoding-2.3.3.crate https://crates.io/api/v1/crates/dbl/0.3.2/download -> dbl-0.3.2.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.10.7/download -> digest-0.10.7.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys/0.4.1/download -> dirs-sys-0.4.1.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs/5.0.1/download -> dirs-5.0.1.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dot-writer/0.1.3/download -> dot-writer-0.1.3.crate https://crates.io/api/v1/crates/dyn-clone/1.0.9/download -> dyn-clone-1.0.9.crate https://crates.io/api/v1/crates/eax/0.5.0/download -> eax-0.5.0.crate https://crates.io/api/v1/crates/ed25519-dalek/1.0.1/download -> ed25519-dalek-1.0.1.crate https://crates.io/api/v1/crates/ed25519/1.5.3/download -> ed25519-1.5.3.crate https://crates.io/api/v1/crates/edit-distance/2.1.0/download -> edit-distance-2.1.0.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/ena/0.14.0/download -> ena-0.14.0.crate https://crates.io/api/v1/crates/encoding_rs/0.8.32/download -> encoding_rs-0.8.32.crate https://crates.io/api/v1/crates/endian-type/0.1.2/download -> endian-type-0.1.2.crate https://crates.io/api/v1/crates/enum-as-inner/0.5.1/download -> enum-as-inner-0.5.1.crate https://crates.io/api/v1/crates/enumber/0.3.0/download -> enumber-0.3.0.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/fd-lock/3.0.8/download -> fd-lock-3.0.8.crate https://crates.io/api/v1/crates/filetime/0.2.19/download -> filetime-0.2.19.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/futures-channel/0.3.25/download -> futures-channel-0.3.25.crate https://crates.io/api/v1/crates/futures-core/0.3.25/download -> futures-core-0.3.25.crate https://crates.io/api/v1/crates/futures-executor/0.3.25/download -> futures-executor-0.3.25.crate https://crates.io/api/v1/crates/futures-io/0.3.25/download -> futures-io-0.3.25.crate https://crates.io/api/v1/crates/futures-macro/0.3.25/download -> futures-macro-0.3.25.crate https://crates.io/api/v1/crates/futures-sink/0.3.25/download -> futures-sink-0.3.25.crate https://crates.io/api/v1/crates/futures-task/0.3.25/download -> futures-task-0.3.25.crate https://crates.io/api/v1/crates/futures-util/0.3.25/download -> futures-util-0.3.25.crate https://crates.io/api/v1/crates/futures/0.3.25/download -> futures-0.3.25.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/gimli/0.27.0/download -> gimli-0.27.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/h2/0.3.15/download -> h2-0.3.15.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashbrown/0.13.2/download -> hashbrown-0.13.2.crate https://crates.io/api/v1/crates/hashlink/0.8.2/download -> hashlink-0.8.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/home-dir/0.1.0/download -> home-dir-0.1.0.crate https://crates.io/api/v1/crates/hostname/0.3.1/download -> hostname-0.3.1.crate https://crates.io/api/v1/crates/http-body/0.4.5/download -> http-body-0.4.5.crate https://crates.io/api/v1/crates/http/0.2.8/download -> http-0.2.8.crate https://crates.io/api/v1/crates/httparse/1.8.0/download -> httparse-1.8.0.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/hyper-tls/0.5.0/download -> hyper-tls-0.5.0.crate https://crates.io/api/v1/crates/hyper/0.14.23/download -> hyper-0.14.23.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/inout/0.1.3/download -> inout-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/interprocess/1.2.1/download -> interprocess-1.2.1.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.3/download -> io-lifetimes-1.0.3.crate https://crates.io/api/v1/crates/ipconfig/0.3.1/download -> ipconfig-0.3.1.crate https://crates.io/api/v1/crates/ipnet/2.7.1/download -> ipnet-2.7.1.crate https://crates.io/api/v1/crates/is-terminal/0.4.2/download -> is-terminal-0.4.2.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/lalrpop-util/0.19.8/download -> lalrpop-util-0.19.8.crate https://crates.io/api/v1/crates/lalrpop/0.19.8/download -> lalrpop-0.19.8.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.138/download -> libc-0.2.138.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/libm/0.2.6/download -> libm-0.2.6.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.26.0/download -> libsqlite3-sys-0.26.0.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.7/download -> link-cplusplus-1.0.7.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lru-cache/0.1.2/download -> lru-cache-0.1.2.crate https://crates.io/api/v1/crates/match_cfg/0.1.0/download -> match_cfg-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.10/download -> matches-0.1.10.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.7.1/download -> memoffset-0.7.1.crate https://crates.io/api/v1/crates/memsec/0.6.2/download -> memsec-0.6.2.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/mio/0.8.5/download -> mio-0.8.5.crate https://crates.io/api/v1/crates/native-tls/0.2.11/download -> native-tls-0.2.11.crate https://crates.io/api/v1/crates/nettle-sys/2.2.0/download -> nettle-sys-2.2.0.crate https://crates.io/api/v1/crates/nettle/7.2.2/download -> nettle-7.2.2.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nibble_vec/0.1.0/download -> nibble_vec-0.1.0.crate https://crates.io/api/v1/crates/nix/0.18.0/download -> nix-0.18.0.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/ntest/0.9.0/download -> ntest-0.9.0.crate https://crates.io/api/v1/crates/ntest_test_cases/0.9.0/download -> ntest_test_cases-0.9.0.crate https://crates.io/api/v1/crates/ntest_timeout/0.9.0/download -> ntest_timeout-0.9.0.crate https://crates.io/api/v1/crates/num-bigint-dig/0.8.2/download -> num-bigint-dig-0.8.2.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.14.0/download -> num_cpus-1.14.0.crate https://crates.io/api/v1/crates/object/0.30.0/download -> object-0.30.0.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openpgp-cert-d/0.1.0/download -> openpgp-cert-d-0.1.0.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-sys/0.9.83/download -> openssl-sys-0.9.83.crate https://crates.io/api/v1/crates/openssl/0.10.48/download -> openssl-0.10.48.crate https://crates.io/api/v1/crates/option-ext/0.2.0/download -> option-ext-0.2.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.5/download -> parking_lot_core-0.9.5.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/petgraph/0.6.2/download -> petgraph-0.6.2.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro-crate/1.3.1/download -> proc-macro-crate-1.3.1.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.60/download -> proc-macro2-1.0.60.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.28/download -> quote-1.0.28.crate https://crates.io/api/v1/crates/radix_trie/0.2.1/download -> radix_trie-0.2.1.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rand_distr/0.4.3/download -> rand_distr-0.4.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rayon-core/1.10.2/download -> rayon-core-1.10.2.crate https://crates.io/api/v1/crates/rayon/1.6.1/download -> rayon-1.6.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/regex/1.7.0/download -> regex-1.7.0.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.14/download -> reqwest-0.11.14.crate https://crates.io/api/v1/crates/resolv-conf/0.7.0/download -> resolv-conf-0.7.0.crate https://crates.io/api/v1/crates/roff/0.2.1/download -> roff-0.2.1.crate https://crates.io/api/v1/crates/rusqlite/0.29.0/download -> rusqlite-0.29.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.36.5/download -> rustix-0.36.5.crate https://crates.io/api/v1/crates/rustversion/1.0.9/download -> rustversion-1.0.9.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.crate https://crates.io/api/v1/crates/schannel/0.1.21/download -> schannel-0.1.21.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.2/download -> scratch-1.0.2.crate https://crates.io/api/v1/crates/security-framework-sys/2.8.0/download -> security-framework-sys-2.8.0.crate https://crates.io/api/v1/crates/security-framework/2.8.1/download -> security-framework-2.8.1.crate https://crates.io/api/v1/crates/semver/1.0.17/download -> semver-1.0.17.crate https://crates.io/api/v1/crates/sequoia-cert-store/0.3.2/download -> sequoia-cert-store-0.3.2.crate https://crates.io/api/v1/crates/sequoia-ipc/0.30.1/download -> sequoia-ipc-0.30.1.crate https://crates.io/api/v1/crates/sequoia-net/0.27.0/download -> sequoia-net-0.27.0.crate https://crates.io/api/v1/crates/sequoia-openpgp-mt/0.1.0/download -> sequoia-openpgp-mt-0.1.0.crate https://crates.io/api/v1/crates/sequoia-openpgp/1.16.0/download -> sequoia-openpgp-1.16.0.crate https://crates.io/api/v1/crates/sequoia-policy-config/0.6.0/download -> sequoia-policy-config-0.6.0.crate https://crates.io/api/v1/crates/sequoia-wot/0.8.1/download -> sequoia-wot-0.8.1.crate https://crates.io/api/v1/crates/serde/1.0.164/download -> serde-1.0.164.crate https://crates.io/api/v1/crates/serde_derive/1.0.164/download -> serde_derive-1.0.164.crate https://crates.io/api/v1/crates/serde_json/1.0.91/download -> serde_json-1.0.91.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/serde_with/3.0.0/download -> serde_with-3.0.0.crate https://crates.io/api/v1/crates/serde_with_macros/3.0.0/download -> serde_with_macros-3.0.0.crate https://crates.io/api/v1/crates/sha1collisiondetection/0.2.7/download -> sha1collisiondetection-0.2.7.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/shlex/1.2.0/download -> shlex-1.2.0.crate https://crates.io/api/v1/crates/signature/1.6.4/download -> signature-1.6.4.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/stfu8/0.2.6/download -> stfu8-0.2.6.crate https://crates.io/api/v1/crates/string_cache/0.8.4/download -> string_cache-0.8.4.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.105/download -> syn-1.0.105.crate https://crates.io/api/v1/crates/syn/2.0.18/download -> syn-2.0.18.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/term/0.7.0/download -> term-0.7.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.2.3/download -> terminal_size-0.2.3.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.6/download -> time-macros-0.2.6.crate https://crates.io/api/v1/crates/time/0.1.45/download -> time-0.1.45.crate https://crates.io/api/v1/crates/time/0.3.17/download -> time-0.3.17.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/to_method/1.1.0/download -> to_method-1.1.0.crate https://crates.io/api/v1/crates/tokio-macros/1.8.2/download -> tokio-macros-1.8.2.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.0/download -> tokio-native-tls-0.3.0.crate https://crates.io/api/v1/crates/tokio-socks/0.5.1/download -> tokio-socks-0.5.1.crate https://crates.io/api/v1/crates/tokio-util/0.7.4/download -> tokio-util-0.7.4.crate https://crates.io/api/v1/crates/tokio/1.23.0/download -> tokio-1.23.0.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/toml_datetime/0.6.1/download -> toml_datetime-0.6.1.crate https://crates.io/api/v1/crates/toml_edit/0.19.4/download -> toml_edit-0.19.4.crate https://crates.io/api/v1/crates/tower-service/0.3.2/download -> tower-service-0.3.2.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/trust-dns-client/0.22.0/download -> trust-dns-client-0.22.0.crate https://crates.io/api/v1/crates/trust-dns-proto/0.22.0/download -> trust-dns-proto-0.22.0.crate https://crates.io/api/v1/crates/trust-dns-resolver/0.22.0/download -> trust-dns-resolver-0.22.0.crate https://crates.io/api/v1/crates/try-lock/0.2.4/download -> try-lock-0.2.4.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.2.4/download -> unicode-xid-0.2.4.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.33/download -> wasm-bindgen-futures-0.4.33.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/web-sys/0.3.60/download -> web-sys-0.3.60.crate https://crates.io/api/v1/crates/widestring/0.5.1/download -> widestring-0.5.1.crate https://crates.io/api/v1/crates/win-crypto-ng/0.4.0/download -> win-crypto-ng-0.4.0.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-targets/0.48.0/download -> windows-targets-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.0/download -> windows_aarch64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.0/download -> windows_aarch64_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.0/download -> windows_i686_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.0/download -> windows_i686_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.0/download -> windows_x86_64_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.0/download -> windows_x86_64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.0/download -> windows_x86_64_msvc-0.48.0.crate https://crates.io/api/v1/crates/winnow/0.3.5/download -> winnow-0.3.5.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/xxhash-rust/0.8.6/download -> xxhash-rust-0.8.6.crate https://crates.io/api/v1/crates/zbase32/0.1.2/download -> zbase32-0.1.2.crate https://crates.io/api/v1/crates/zeroize/1.3.0/download -> zeroize-1.3.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.3.3/download -> zeroize_derive-1.3.3.crate
+_eclasses_=cargo	8520ae1bed0e6965d027399b471a3595	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	llvm	2e1701c714b75feb512bffdecd3fe7d0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=368fcecffde659f02746dd18b347a267
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 863a022f23a5..43c1d1bd32dc 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/htp-1.19-r1 b/metadata/md5-cache/app-text/htp-1.19-r1
new file mode 100644
index 000000000000..114d8de89791
--- /dev/null
+++ b/metadata/md5-cache/app-text/htp-1.19-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=An HTML preprocessor
+EAPI=8
+HOMEPAGE=http://htp.sourceforge.net/
+INHERIT=toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=Clarified-Artistic
+SLOT=0
+SRC_URI=mirror://sourceforge/htp/htp-1.19.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=1cb962d1c3e4cf5b828d6f1ac8acf0ed
diff --git a/metadata/md5-cache/app-text/lesspipe-2.10 b/metadata/md5-cache/app-text/lesspipe-2.10
new file mode 100644
index 000000000000..9d3b6f018ce3
--- /dev/null
+++ b/metadata/md5-cache/app-text/lesspipe-2.10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig test? ( app-editors/vim )
+DEFINED_PHASES=compile configure install preinst
+DESCRIPTION=Preprocessor for less
+EAPI=8
+HOMEPAGE=https://github.com/wofr06/lesspipe
+INHERIT=edo bash-completion-r1
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.10.tar.gz -> lesspipe-2.10.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=0c1a702541351cff83f2bd99a6433fd4
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index fcb6377719ca..9eae1501e794 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libintl-0.22.3 b/metadata/md5-cache/dev-libs/libintl-0.22.3
new file mode 100644
index 000000000000..4e06e79ae2a4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libintl-0.22.3
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-gettext ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=virtual/libiconv-0-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(-)?]
+DESCRIPTION=the GNU international library (split out of gettext)
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/gettext/
+INHERIT=multilib-minimal libtool usr-ldscript verify-sig
+IUSE=static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=virtual/libiconv-0-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(-)?] !sys-libs/glibc !sys-libs/musl !<sys-devel/gettext-0.19.6-r1
+SLOT=0
+SRC_URI=mirror://gnu/gettext/gettext-0.22.3.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.22.3.tar.xz.sig )
+_eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_md5_=006a096b3a510df3f389658727a3feb1
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 00bbe3f771a8..1bf582d468ad 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/cython-3.0.3 b/metadata/md5-cache/dev-python/cython-3.0.3
new file mode 100644
index 000000000000..1e00edee0c7f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cython-3.0.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_targets_python3_10? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) doc? ( || ( ( dev-lang/python:3.12[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/jinja[python_targets_python3_12(-)] dev-python/sphinx-issues[python_targets_python3_12(-)] dev-python/sphinx-tabs[python_targets_python3_12(-)] ) ( dev-lang/python:3.11[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/sphinx-tabs[python_targets_python3_11(-)] ) ( dev-lang/python:3.10[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx-tabs[python_targets_python3_10(-)] ) ( dev-python/pypy3[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/jinja[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/sphinx-tabs[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
+DESCRIPTION=A Python to C compiler
+EAPI=8
+HOMEPAGE=https://cython.org/ https://github.com/cython/cython/ https://pypi.org/project/Cython/
+INHERIT=distutils-r1 multiprocessing toolchain-funcs
+IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cython/cython/archive/3.0.3.tar.gz -> cython-3.0.3.gh.tar.gz
+_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=7f06cad0515f6ce0c5fff32384a401a1
diff --git a/metadata/md5-cache/dev-python/mypy-1.5.1 b/metadata/md5-cache/dev-python/mypy-1.5.1
index 508c8c5238f3..ceaaeedff67f 100644
--- a/metadata/md5-cache/dev-python/mypy-1.5.1
+++ b/metadata/md5-cache/dev-python/mypy-1.5.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/attrs-18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-xdist-1.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/py-1.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/virtualenv-16.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( !dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mypy_extensions-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=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(-)?]
+BDEPEND=test? ( >=dev-python/attrs-18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-xdist-1.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( !dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mypy_extensions-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=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=Optional static typing for Python
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v1.5.1.tar.gz -> mypy-1.5.1.gh.tar.gz
 _eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=9afd0adacda5fc4a9417775c76c98a0b
+_md5_=c3d5f24a697fb8f64d82d78e8a55588e
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-3.3.1-r1 b/metadata/md5-cache/dev-python/pytest-xdist-3.3.1-r1
new file mode 100644
index 000000000000..2367eff7a5ea
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-xdist-3.3.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Distributed testing and loop-on-failing modes
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-xdist/pytest-xdist-3.3.1.tar.gz
+_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=4557cb8668ac8b2e027cae2027010a62
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 8e763f0cc652..2411cfe61e1d 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/dav1d-1.3.0 b/metadata/md5-cache/media-libs/dav1d-1.3.0
new file mode 100644
index 000000000000..c3a1fee6cc74
--- /dev/null
+++ b/metadata/md5-cache/media-libs/dav1d-1.3.0
@@ -0,0 +1,15 @@
+BDEPEND=asm? ( abi_x86_32? ( >=dev-lang/nasm-2.15.05 ) abi_x86_64? ( >=dev-lang/nasm-2.15.05 ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=xxhash? ( dev-libs/xxhash )
+DESCRIPTION=dav1d is an AV1 Decoder :)
+EAPI=8
+HOMEPAGE=https://code.videolan.org/videolan/dav1d
+INHERIT=meson-multilib
+IUSE=+8bit +10bit +asm test xxhash abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos
+LICENSE=BSD-2
+RESTRICT=!test? ( test )
+SLOT=0/7
+SRC_URI=https://downloads.videolan.org/pub/videolan/dav1d/1.3.0/dav1d-1.3.0.tar.xz
+_eclasses_=meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=8bf9d4c14dbf811c7c54772a2f545a50
diff --git a/metadata/md5-cache/media-libs/dav1d-9999 b/metadata/md5-cache/media-libs/dav1d-9999
index cade658bdf6b..5578ee719f1f 100644
--- a/metadata/md5-cache/media-libs/dav1d-9999
+++ b/metadata/md5-cache/media-libs/dav1d-9999
@@ -9,6 +9,6 @@ IUSE=+8bit +10bit +asm test xxhash abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n3
 LICENSE=BSD-2
 PROPERTIES=live
 RESTRICT=!test? ( test )
-SLOT=0/6
+SLOT=0/7
 _eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=23a0a59caecd6b682d7dfb7612739251
+_md5_=8bf9d4c14dbf811c7c54772a2f545a50
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index faa1590c85d8..5a6bc0eb06d2 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/wireshark-4.0.7 b/metadata/md5-cache/net-analyzer/wireshark-4.0.7
deleted file mode 100644
index f6e81b325b6f..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-4.0.7
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( dev-lang/python:3.11 dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( !qt6? ( dev-qt/qtdeclarative:5 ) )
-DESCRIPTION=Network protocol analyzer (sniffer)
-EAPI=8
-HOMEPAGE=https://www.wireshark.org/
-IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
-RESTRICT=!test? ( test ) test
-SLOT=0/4.0.7
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.0.7.tar.xz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=81b0d25d7a57e25bf95631278b784cfa
diff --git a/metadata/md5-cache/net-analyzer/wireshark-4.0.6 b/metadata/md5-cache/net-analyzer/wireshark-4.0.9
index b054d309cd79..e3ea14ab5359 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-4.0.6
+++ b/metadata/md5-cache/net-analyzer/wireshark-4.0.9
@@ -1,18 +1,18 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( dev-lang/python:3.11 dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( dev-lang/python:3.11 dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ) ) verify-sig? ( sec-keys/openpgp-keys-wireshark ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( !qt6? ( dev-qt/qtdeclarative:5 ) )
 DESCRIPTION=Network protocol analyzer (sniffer)
 EAPI=8
 HOMEPAGE=https://www.wireshark.org/
 IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86
+INHERIT=fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake verify-sig
+IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd +filecaps +lua_single_target_lua5-1 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 RESTRICT=!test? ( test ) test
-SLOT=0/4.0.6
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.0.6.tar.xz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=81b0d25d7a57e25bf95631278b784cfa
+SLOT=0/4.0.9
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.0.9.tar.xz verify-sig? ( https://www.wireshark.org/download/SIGNATURES-4.0.9.txt -> wireshark-4.0.9-signatures.txt )
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=495eedd26b718339d32968b810ba14a0
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 4a3133918440..e5d0e0f7a28f 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/openssh-contrib-9.5_p1 b/metadata/md5-cache/net-misc/openssh-contrib-9.5_p1
new file mode 100644
index 000000000000..ec68d43e86fa
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-contrib-9.5_p1
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/autoconf virtual/pkgconfig || ( >=sys-devel/gcc-config-2.6 >=sys-devel/clang-toolchain-symlinks-14-r1:14 >=sys-devel/clang-toolchain-symlinks-15-r1:15 >=sys-devel/clang-toolchain-symlinks-16-r1:* ) verify-sig? ( sec-keys/openpgp-keys-openssh ) 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 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst preinst prepare pretend test unpack
+DEPEND=!net-misc/openssh acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] )
+DESCRIPTION=Port of OpenBSD's free SSH release with HPN/X509 patches
+EAPI=8
+HOMEPAGE=https://www.openssh.com/
+INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+IUSE=abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X X509 xmss verify-sig
+KEYWORDS=~amd64
+LICENSE=BSD GPL-2
+RDEPEND=!net-misc/openssh acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.5p1.tar.gz hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p2-hpn-15.2-glue.patch.xz ) X509? ( https://roumenpetrov.info/openssh/x509-14.3/openssh-9.5p1+x509-14.3.diff.gz https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.5_p1-X509-glue-14.3.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.5_p1-hpn-15.2-X509-14.3-glue.patch.xz ) ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.5p1.tar.gz.asc )
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_md5_=3b8e4b3cd07064d80c0010d10859d9b1
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index a4ae9a0ba2b2..9afe57d618f1 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.88 b/metadata/md5-cache/sys-block/tgt-1.0.88
index ec09d99dfb9f..cf0dcd9d0cae 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.88
+++ b/metadata/md5-cache/sys-block/tgt-1.0.88
@@ -5,11 +5,11 @@ DESCRIPTION=Linux SCSI target framework (tgt)
 EAPI=7
 HOMEPAGE=https://github.com/fujita/tgt
 INHERIT=toolchain-funcs systemd
-IUSE=fcoe fcp ibmvio infiniband rbd selinux
+IUSE=infiniband rbd selinux
 KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-perl/Config-General rbd? ( sys-cluster/ceph ) infiniband? ( sys-cluster/rdma-core ) dev-libs/libaio sys-apps/sg3_utils selinux? ( sec-policy/selinux-tgtd )
 SLOT=0
 SRC_URI=https://github.com/fujita/tgt/archive/v1.0.88.tar.gz -> tgt-1.0.88.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=3d70587e5a7842c93ffabc781c407bf8
+_md5_=1c176f9d5e6485010ddaf31aa3c52edf
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 1a0834090f2f..0b36da264e4e 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-11.4.1_p20231005 b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20231005
new file mode 100644
index 000000000000..df15879bd9c7
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.4.1_p20231005
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=mirror://gcc/snapshots/11-20231005/gcc-11-20231005.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-10.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	180d9b3d140769583760160bb2504616	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=35b2fba1731799fb85abfa2903332da0
diff --git a/metadata/md5-cache/sys-devel/gettext-0.22.3 b/metadata/md5-cache/sys-devel/gettext-0.22.3
new file mode 100644
index 000000000000..8590596a45f9
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gettext-0.22.3
@@ -0,0 +1,16 @@
+BDEPEND=git? ( dev-vcs/git ) verify-sig? ( sec-keys/openpgp-keys-gettext ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
+DEPEND=>=virtual/libiconv-0-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(-)?] >=virtual/libintl-0-r2[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/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:= ) java? ( virtual/jdk:1.8 ) xattr? ( sys-apps/attr ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=GNU locale utilities
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/gettext/
+INHERIT=java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs
+IUSE=acl +cxx doc emacs git java ncurses nls openmp static-libs xattr java 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=GPL-3+ cxx? ( LGPL-2.1+ )
+PDEPEND=emacs? ( app-emacs/po-mode )
+RDEPEND=>=virtual/libiconv-0-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(-)?] >=virtual/libintl-0-r2[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/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:= ) java? ( virtual/jdk:1.8 ) xattr? ( sys-apps/attr ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=mirror://gnu/gettext/gettext-0.22.3.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.22.3.tar.xz.sig )
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_md5_=6a1b4641d062cb9a56a162a267a54fd7
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 20c5d4adbd31..793082a1e3ff 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-10-05T22:10:14Z
+TIMESTAMP 2023-10-06T04:10:18Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUfNEZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUfiKpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB9kg/9G/4TGrzp8OqZ3FvSGc6TksFyJRrlSTA1u49UhlxEAkGkOt2PiQ6zkrL0
-9MGAXBnhxaXoSq9MHs0KULBrRO6w3GYbXnKonCx+5wnw1t3snFEAB2RaKdnYmNn3
-/fy+PodNliWkipB09wiT+H/BIxWDoUglXkljwGG31ipQToDig0j2J9Ygc8w21egf
-dnUYxLw1EqnXgPCGa0J0BgL5jmBhvJyE7vl40azBBGSyCK2BtfBADyPaD4g8p7uM
-HsB2RWP3qKt5I+uOyp2I33AvS5K6LHnKh6ah4zuBF/aHBpfzJhRIBl7wDz2aqzgu
-KNKeUWUyO0IlvFCAoOAN9pQaJz2v8+JjHLIlMbrST5Pc0f5ah1YgD7hq6VdOCq5o
-1cX/Hyq3YwfhbtmymjOD2AhNMAcun7hMI2njGDmHpMyKaML4wVvhBHskS93NjGoY
-F0VOZ2qf7J0/6ftBClB6CyX5OnYgOVTNETRPlrTVO4imst/xfp3E5LYZJXT1KWr0
-R3wZJYojX45Wua0t5y+i1E3jBIn0xyjfD9RZWMpKCEqJAffPMnwehZE56OWAChbn
-yQ5AdNeeRYmw6/+Y/ZNeQbeYFdUZxKFUfIq0FeyEX/ECkMh56lGaCMgpFYiYrMyl
-5kzUrOg0gvPdg997EU1XWqy788xt5ra9uHwAMBu0VAEYWZ2THbs=
-=eCxC
+klDmfA//VYuHT2ZOrm5UHRxZ/u9cIZam4+XWQRHanRLrOyebq3B/pCgg0Hj5k6Uv
+5ZzvSuSCC1baIpTUcvIQsGbe79Us2NZLc4YRLpIfdf4JtzsF2GoZ3kxcV2TDdd8g
+15A87ljZsBgaKGMr3V+/HUtLiyZ/GRznPBy2rJT6vVCsIjmchylynDPOm+XZL8r2
+0wTSNbzWPpdYtCzXf0HH2uAjQB73NH6mMPLZk2yo9FhGktwhxT4/SREZkzYAkiGZ
+V+MMAZeLH78u1AlJKOWn160SVOtnF3cmW0e8vkBPrtra4o9SBnkwh9WuJjBqe7Fa
+sYpCVFME9akY9tQzX34VtFwcQ4UhGxzizQPLKdB8/4GyiiR/P2O+RguTAjWdjl9Z
+pZpCZHSAtTJ1UQKszKdx/AE2EdfihWMWOeAO5U6aZcyaMavCQ9ZvbALxiGr2WwLa
+6ErZWBGrsoxAleiJfq7mpihN2yzHPi4ytjRbVYCLkI0PLiDw8iu6HpyYy+WdMIoT
+BA6hJur3fHtnGu2U268GrTm6TM8A3wEKJFz14QqnuNXQ0IL2gM1xq5l8y4L0+OVF
+GIxOtnOlbNSmvaUvMkKbcEshqaphAiSfVSdQzQ6JfyMdTyA5/WiijdeR0zzr1mVV
+pp+SfzfOh2fMpuXvzbla/BoW4H+dGk6IFq952nlSDkh+p9+OXDg=
+=3gjc
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 819eb583c682..29b5b6ebd728 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Oct 2023 22:10:10 +0000
+Fri, 06 Oct 2023 04:10:15 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index eda078687cad..9af233f2aff5 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Oct  5 10:10:10 PM UTC 2023
+Fri Oct  6 04:10:14 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4d70274a1197..8d44d4068a12 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Oct 2023 22:15:01 +0000
+Fri, 06 Oct 2023 04:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 53f7647c579f..d036284c5fb8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-205f2ad608baa06f3eda1632a76b20f56e923682 1696540002 2023-10-05T21:06:42+00:00
+d550925be8ae0c33c3aeacd447c94a9174573543 1696564735 2023-10-06T03:58:55+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3154835188e0..75d75c26e267 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1696543801 Thu 05 Oct 2023 10:10:01 PM UTC
+1696565401 Fri 06 Oct 2023 04:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 819eb583c682..84ca844d75d7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Oct 2023 22:10:10 +0000
+Fri, 06 Oct 2023 04:10:14 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8435a76916eb..2b8de78e373d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b0c6c8d098cc..7642014b3f8c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,14 +1,13 @@
 AUX README.gentoo 188 BLAKE2B 1734362317f1c09b63ebb946961a3f31e5b785787ac3c4e026d71c95c14367f4f3df752706e0d04e14792c95c33c3829eea704806b3b14a96339819f8c2ad4f7 SHA512 92811e9bb6df95d87058e6b77ed09dd086db922721b71ea87af0fdfcc44e2585ef28cf264095d8645a9b5bb60a3990b21376f892305debac19a3f01518918959
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
-DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B 5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52 SHA512 651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b
-DIST wireshark-4.0.7.tar.xz 43113752 BLAKE2B 06d4863fe796da8d3b97144a8b24430741ea8f58a8401a56327e0db37e5a7e81e63ab43325c87195a535565af7cb1265e25f8c62600ae69d549da479951bb9a1 SHA512 98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab
 DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778 SHA512 f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
+DIST wireshark-4.0.9-signatures.txt 2503 BLAKE2B 830d4630826bbf644c3d0b1dbb5df32ba460448c59b07a307987d68354305c6fbe6c4700a38abe493f80883d90425bf9ec330f4155006fca4d1bff37f42df6dd SHA512 d813145850e13a3c77e2edba66f3606667b685d657b04e4ee5bc3b1f6d26a50fb492a2de91447ad07dd358a7c3bbe2b2ccd30ade30da943071daabd006eddffb
+DIST wireshark-4.0.9.tar.xz 43130608 BLAKE2B 9a7760711e761f382496123ca4578a0e6b834de85999a908f24e16ac48ebd3f3ea17e8c29d422f13f67b168ac7accb2cd394a78714b3c543077909a40029a660 SHA512 4700f41f38f23801267c035557b27c151b718542e830460ab895c87d976c44606397b98b9d48b72a7cdd3917aa744794cbccac5babbb6de94a7bd59e8d91e1f0
 DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34 SHA512 ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a
 DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627 SHA512 d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0
-EBUILD wireshark-4.0.6.ebuild 7998 BLAKE2B 5cfa933262dd90a34f80eabe4712e1ef56a17c95458eb1739397e872cd35d95374aa54fdba164121a912163b335691623a52d6d5ea164d6074567ec6c655154e SHA512 5996d39b034060fe9cebc3b13f2e9becfbcf640e68d9039e5e48a4da97c8a4d5f6d00973fd64db3e2d514872afa4317813b296b33d53bf630e58ac9a4d5e9a30
-EBUILD wireshark-4.0.7.ebuild 7998 BLAKE2B 5cfa933262dd90a34f80eabe4712e1ef56a17c95458eb1739397e872cd35d95374aa54fdba164121a912163b335691623a52d6d5ea164d6074567ec6c655154e SHA512 5996d39b034060fe9cebc3b13f2e9becfbcf640e68d9039e5e48a4da97c8a4d5f6d00973fd64db3e2d514872afa4317813b296b33d53bf630e58ac9a4d5e9a30
 EBUILD wireshark-4.0.8.ebuild 7998 BLAKE2B 5cfa933262dd90a34f80eabe4712e1ef56a17c95458eb1739397e872cd35d95374aa54fdba164121a912163b335691623a52d6d5ea164d6074567ec6c655154e SHA512 5996d39b034060fe9cebc3b13f2e9becfbcf640e68d9039e5e48a4da97c8a4d5f6d00973fd64db3e2d514872afa4317813b296b33d53bf630e58ac9a4d5e9a30
+EBUILD wireshark-4.0.9.ebuild 8573 BLAKE2B 85a90743e7523f4bcd10d5f08630d9108d17dd47f5cfce1e569353e0e3b57c579c59b982b4f2b1691d0e6b25b27885dfaed350b83eff6964e76b2a639a1f355f SHA512 c8f253c1af0aabebffaf03fe67a8c682d3af5f2d796e9753eaf91c0135a4061433fbb3debcf184772d7a798fcc776a3576f84939ad5bc441678a38cf34069eb4
 EBUILD wireshark-4.1.0.ebuild 8654 BLAKE2B 6754327a2167144d0b62daa259686bd24163f9ee28adcfcbf75c03938595c3b95ed3202700a11c4978e5a02f439deb5b42e0937a3a91aca1e2ace211898a473c SHA512 80c91b955949f2143282614b7514662d58a23add7706d86329fc3a63424d65a2f288cd0e2b53f17c70508b3e94fa793d3780c3c4a4f84d5a1303b004625d50ca
 EBUILD wireshark-9999.ebuild 8654 BLAKE2B 6754327a2167144d0b62daa259686bd24163f9ee28adcfcbf75c03938595c3b95ed3202700a11c4978e5a02f439deb5b42e0937a3a91aca1e2ace211898a473c SHA512 80c91b955949f2143282614b7514662d58a23add7706d86329fc3a63424d65a2f288cd0e2b53f17c70508b3e94fa793d3780c3c4a4f84d5a1303b004625d50ca
 MISC metadata.xml 5422 BLAKE2B 92a191ef763a5ce4079f75b06ec7514c1f052b96e3ed2ff1e6d60e426b60d3bdebe373fc23b11625e5de2b8dc495924787e14ab6be6ec9e9f5216686a3c7dd3b SHA512 574ab162b8634bd66d1d93ac3e845328958cab66982aac5ea5aba3bbecd2c510c66a7f7584eb1192c1ca0c157522ade2dbaf0780c4d92601ff416a81a6b1239f
diff --git a/net-analyzer/wireshark/wireshark-4.0.7.ebuild b/net-analyzer/wireshark/wireshark-4.0.7.ebuild
deleted file mode 100644
index 2a642376f5e0..000000000000
--- a/net-analyzer/wireshark/wireshark-4.0.7.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
-	fi
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-# Tests restricted for now because rely on pytest internals w/ >=3.11
-# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
-RESTRICT="!test? ( test ) test"
-
-# bug #753062 for speexdsp
-RDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.50.0:2
-	dev-libs/libpcre2
-	>=net-dns/c-ares-1.13.0:=
-	>=dev-libs/libgcrypt-1.8.0:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6:= )
-	filecaps? ( sys-libs/libcap )
-	http2? ( >=net-libs/nghttp2-1.11.0:= )
-	ilbc? ( media-libs/libilbc:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	gui? (
-		x11-misc/xdg-utils
-		qt6? (
-			dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
-			dev-qt/qt5compat:6
-			dev-qt/qtmultimedia:6
-		)
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtconcurrent:5
-			dev-qt/qtgui:5
-			dev-qt/qtmultimedia:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-		)
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd:= )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy:= )
-	spandsp? ( media-libs/spandsp:= )
-	sshdump? ( >=net-libs/libssh-0.6:= )
-	ssl? ( >=net-libs/gnutls-3.5.8:= )
-	wifi? ( >=net-libs/libssh-0.6:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	gui? (
-		!qt6? (
-			dev-qt/qtdeclarative:5
-		)
-	)
-"
-# TODO: 4.0.0_rc1 release notes say:
-# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	gui? (
-		qt6? (
-			dev-qt/qttools:6[linguist]
-		)
-		!qt6? (
-			dev-qt/linguist-tools:5
-		)
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${RDEPEND}
-	gui? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-)
-
-python_check_deps() {
-	use test || return 0
-
-	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
-		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	python_setup
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos ; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use gui ; then
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	! use lto && filter-lto
-
-	mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex gui MOC=$(qt5_get_bindir)/moc '')
-		$(usex gui RCC=$(qt5_get_bindir)/rcc '')
-		$(usex gui UIC=$(qt5_get_bindir)/uic '')
-
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-
-		-DBUILD_wireshark=$(usex gui)
-		-DUSE_qt6=$(usex qt6)
-
-		-DENABLE_WERROR=OFF
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=OFF
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DBUILD_wifidump=$(usex wifi)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	EPYTEST_DESELECT=(
-		# TODO: investigate
-		suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
-	)
-
-	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-	epytest \
-		--disable-capture \
-		--skip-missing-programs=all \
-		--program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins "${BUILD_DIR}"/config.h
-
-	# If trying to remove this, try build e.g. libvirt first!
-	# At last check, Fedora is still doing this too.
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		wiretap
-		wsutil
-		wsutil/wmem
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	if use gui ; then
-		local s
-
-		for s in 16 32 48 64 128 256 512 1024 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins resources/icons/wsicon${s}.png wireshark.png
-		done
-
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]] ; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap ; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/wireshark/wireshark-4.0.6.ebuild b/net-analyzer/wireshark/wireshark-4.0.9.ebuild
index 2a642376f5e0..b93870af7ae4 100644
--- a/net-analyzer/wireshark/wireshark-4.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.9.ebuild
@@ -15,11 +15,15 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
 	inherit git-r3
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+	inherit verify-sig
+
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )"
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
+		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
 	fi
 fi
 
@@ -130,6 +134,10 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-wireshark )
 "
 
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )"
+fi
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
@@ -148,6 +156,23 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			cd "${DISTDIR}" || die
+			verify-sig_verify_signed_checksums \
+				${P}-signatures.txt \
+				openssl-dgst \
+				${P}.tar.xz
+			cd "${WORKDIR}" || die
+		fi
+
+		default
+	fi
+}
+
 src_configure() {
 	local mycmakeargs
 
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 013f649c9ee2..e881287f54a7 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/openssh-contrib/Manifest b/net-misc/openssh-contrib/Manifest
index 17ae45a0fc01..583f76fa6b58 100644
--- a/net-misc/openssh-contrib/Manifest
+++ b/net-misc/openssh-contrib/Manifest
@@ -37,7 +37,13 @@ DIST openssh-9.4_p1-hpn-15.2-X509-14.2-glue.patch.xz 5144 BLAKE2B 324dff4cccc027
 DIST openssh-9.4p1+x509-14.2.1.diff.gz 1221969 BLAKE2B 67b06648aafd849fdcb4c54c4a841c46b6a97d53d7ebdefe6110aba7a0877833ebb2a8d22a1e51a748051f889ba08cc1501ea0e9e221fef2f5c0e8caad170983 SHA512 d90dc7bde008ab793d9f85f1b4b0687f1d084fdf2fc6cfd229748424ddcc4664f558be44fee73d72e88bc99e03a5dd1ec57138a82f77b82e0f65d14bd3ef545a
 DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 SHA512 0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25
 DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af SHA512 983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a
+DIST openssh-9.5_p1-X509-glue-14.3.patch.xz 788 BLAKE2B 641c9936639a7629f6ae82d56f48b9dd39e58087024fe04259e2be5aef3b484a3f8ba6c91e603dd4f80d03c92490ee85cbaccff1e40e4f7ee1064c4a1ac9f191 SHA512 8f9255e3f8a682d7c82125a6064cdd8a80616e4b699a4c101515f15af7185a6b0b98efa246e0ed97a278f377ea616daf2dd98d0dc479c24d1ac3a76c12cd97ec
+DIST openssh-9.5_p1-hpn-15.2-X509-14.3-glue.patch.xz 5132 BLAKE2B 82a30622e67fab233591f6b30c634f2f8383eda77de163b6139ca9892c0485d8f174901e5e6788f6c911e0859e563ac6a9022e99099507f76a59908770474e78 SHA512 697b2ce1b2b0aa1bcf95b76b3bc79de7d8793a3c2975bc3bfb23a64fd3a9133df9fd0831848f9388b21f7f1fd597824b221d45b9380ee26beb60040596386d61
+DIST openssh-9.5p1+x509-14.3.diff.gz 1224337 BLAKE2B f695711eeab6b40a8660ac897961068738cb5941c799243888d5a90f56cf4b308803dd88d3d97d7932a72b82ebc269e20c7d142076fb3b03def1245491da0497 SHA512 a7798e2a40a81df882911c485fa240584713135df59c6dab720597b6ef60ecfac85ebd595983d7c5ce8625b758eeb777fe1462845976a2674cad339dadc0719a
+DIST openssh-9.5p1.tar.gz 1843001 BLAKE2B 55dbb0a2792b0046c943a19ca0966660e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796 SHA512 e183fdf7477fd986215b889eea4a945d71385e35305746ccb164e757ecc28166f429c70890a237d8ef4cdcae5132935ba2ecb3b2a658eb73a6afcf6f42277b9c
+DIST openssh-9.5p1.tar.gz.asc 833 BLAKE2B abec3d14d9a880008db202be00ed446ccc0a98ce77c16a9e6d6492feac07c8f3284f9cd24f6ee1d904a55f9f23d5cce8a716916975c179a38ef6bde1d36e0acf SHA512 2b6de653420ba02eb99c7e6fba09af3bacfe9c701f3dfc3c94f41a3539c0414954fc5c64cce63c488c5ccd5d4ddb42d3f2184ff7f323342c885c47bf7d426ca1
 EBUILD openssh-contrib-9.3_p1.ebuild 19047 BLAKE2B 3a11afc10f49b5934c6ba5421b05602b340cf3e868310a17347ca03f6807e658ebdbc2bdcac3e374693a7c7abc085c3436c4867c8435ca6a970df928d0fd0021 SHA512 05a210f134a884ec34e9eefb86bec983fa62f2ee93b10267b1e0679566cc4144a59bfc5660f833cef42fab5934e22fee042589d348a71b3f3718120d53e389ec
 EBUILD openssh-contrib-9.3_p2.ebuild 17980 BLAKE2B 0cbedde4a7b2df7a9381da583f4fb2171fe8198ba74506be4f86e8c263e792120cd5b72ea54aef625503fc85f1ba27464dbbf4d1c07d0553529a248c004923e8 SHA512 736504a0ba76c1c78ac2fbb067247e4e0f28afcb6b209a2eba3af80ebcae86c095ee2e54c08860013a95bd525003d8255c72d6d80b3b25f05c4f74fbb885c4af
 EBUILD openssh-contrib-9.4_p1-r1.ebuild 17926 BLAKE2B 86b0a07db827100203cdbe2a1ee702e45698323c22a461b09e03989ec9ba1cca854772de25cadd24e87e1171c26e8ef80ac56e58bb6292b441fdc35783318415 SHA512 fba1a337706d2b1f901965c4149bdf57d0bc86c6e45c140b49d58cf6486d3c0d65f68c4d879a3a307038a8f2c39294f1d20207a532022415210de0a98fbb2bd7
+EBUILD openssh-contrib-9.5_p1.ebuild 17871 BLAKE2B 385f43d2a59bd335ad1cdc5cb130f115d32931699fd3280738c3038c9b957836d0572b4e409bcc011a84212b63467496e901e205c5a0c5b473200734881110c0 SHA512 24c6d0fb0fbe3745c0479b5a5a99bee66c821face899855d802ef68555a623142b07d5b77fbb3ee8db43ca8a4326a624cb4c44d55641539d3eaa53a3ac82a634
 MISC metadata.xml 2975 BLAKE2B 068d52ba2e5de0b696e7fe995e4c2a041206a59258f24704ca3a72fe1d85323c2aad7899f055b48a4045d6303491822c59f2b86b85fc428a26f8259ea583796a SHA512 83fef701188c00af53382b5099fc2ebf83c903c3edefc3d2cf6deb0a667c0d0d9531c18728eef9b5b703903d31fbdb55a68e5b76890ea090bc1d79fef3ae6b89
diff --git a/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild
new file mode 100644
index 000000000000..0c2cbcad0001
--- /dev/null
+++ b/net-misc/openssh-contrib/openssh-contrib-9.5_p1.ebuild
@@ -0,0 +1,505 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+
+# Make it more portable between straight releases
+# and _p? releases.
+MY_P=${P/-contrib/}
+PARCH=${MY_P/_}
+
+# PV to USE for HPN patches
+#HPN_PV="${PV^^}"
+HPN_PV="8.5_P1"
+
+HPN_VER="15.2"
+HPN_PATCHES=(
+	openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+HPN_GLUE_PATCH="openssh-9.3_p2-hpn-${HPN_VER}-glue.patch"
+HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}"
+
+X509_VER="14.3"
+X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_PATCH="${X509_PATCH/p2/p1}"
+X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch"
+#X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch"
+X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER%.1}-glue.patch"
+
+DESCRIPTION="Port of OpenBSD's free SSH release with HPN/X509 patches"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${HPN_VER:+hpn? (
+		$(printf "mirror://sourceforge/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}")
+		https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz
+	)}
+	${X509_VER:+X509? (
+		https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH}
+		https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_GLUE_PATCH}.xz
+		${HPN_VER:+hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_HPN_GLUE_PATCH}.xz )}
+	)}
+	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X X509 xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	hpn? ( ssl )
+	ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( ssl !xmss )
+	xmss? ( ssl  )
+	test? ( ssl )
+"
+
+# tests currently fail with XMSS
+REQUIRED_USE+="test? ( !xmss )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		net-libs/ldns[ecdsa(+),ssl(+)]
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
+	virtual/libcrypt:=[static-libs(+)]
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
+"
+RDEPEND="
+	!net-misc/openssh
+	acct-group/sshd
+	acct-user/sshd
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
+	static? ( ${LIB_DEPEND} )
+"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	!prefix? ( sys-apps/shadow )
+	X? ( x11-apps/xauth )
+"
+# Weird dep construct for newer gcc-config for bug #872416
+BDEPEND="
+	sys-devel/autoconf
+	virtual/pkgconfig
+	|| (
+		>=sys-devel/gcc-config-2.6
+		>=sys-devel/clang-toolchain-symlinks-14-r1:14
+		>=sys-devel/clang-toolchain-symlinks-15-r1:15
+		>=sys-devel/clang-toolchain-symlinks-16-r1:*
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssh )
+"
+
+PATCHES=(
+	"${FILESDIR}/openssh-7.9_p1-include-stdlib.patch"
+	"${FILESDIR}/openssh-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex
+	"${FILESDIR}/openssh-6.7_p1-openssl-ignore-status.patch"
+	"${FILESDIR}/openssh-7.5_p1-disable-conch-interop-tests.patch"
+	"${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch"
+	"${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
+	"${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019
+)
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	local missing=()
+	check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); }
+	check_feature hpn HPN_VER
+	check_feature X509 X509_PATCH
+	if [[ ${#missing[@]} -ne 0 ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested: ${missing[*]}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "Missing requested third party patch."
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_unpack() {
+	default
+
+	# We don't have signatures for HPN, X509, so we have to write this ourselves
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc}
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply -- "${PATCHES[@]}"
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" &>/dev/null || die
+		eapply "${WORKDIR}/${X509_GLUE_PATCH}"
+		popd &>/dev/null || die
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}/openssh-9.0_p1-X509-uninitialized-delay.patch"
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/openssh-${PV}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}" || die
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
+		pushd "${hpn_patchdir}" &>/dev/null || die
+		eapply "${WORKDIR}/${HPN_GLUE_PATCH}"
+		use X509 && eapply "${WORKDIR}/${X509_HPN_GLUE_PATCH}"
+		popd &>/dev/null || die
+
+		eapply "${hpn_patchdir}"
+
+		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			# Before re-enabling, check https://bugs.gentoo.org/354113#c6
+			# and be sure to have tested it.
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	eapply_user #473004
+
+	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
+	sed -e '/\t\tpercent \\/ d' \
+		-i regress/Makefile || die
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+	use xmss && append-cflags -DWITH_XMSS
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
+		# doesn't check for this, so force the replacement to be put in
+		# place
+		append-cppflags -DBROKEN_GLOB
+	fi
+
+	# use replacement, RPF_ECHO_ON doesn't exist here
+	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		--with-hardening
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(usex X509 '' "$(use_with security-key security-key-builtin)")
+		$(use_with ssl openssl)
+		$(use_with ssl ssl-engine)
+	)
+
+	if use elibc_musl; then
+		# musl defines bogus values for UTMP_FILE and WTMP_FILE
+		# https://bugs.gentoo.org/753230
+		myconf+=( --disable-utmp --disable-wtmp )
+	fi
+
+	# Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all
+	# bug #869839 (https://github.com/llvm/llvm-project/issues/57692)
+	tc-is-clang && myconf+=( --without-hardening )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local tests=( compat-tests )
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		ewarn "user, so we will run a subset only."
+		tests+=( interop-tests )
+	else
+		tests+=( tests )
+	fi
+
+	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
+	mkdir -p "${HOME}"/.ssh || die
+	emake -j1 "${tests[@]}" </dev/null
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die
+	Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf"
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die
+	Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf"
+	EOF
+
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die
+	# Send locale environment variables (bug #367017)
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM (bug #658540)
+	SendEnv COLORTERM
+	EOF
+
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die
+	RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts"
+	EOF
+
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die
+	# https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/
+	ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+	EOF
+
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die
+	# Allow client to pass locale environment variables (bug #367017)
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM (bug #658540)
+	AcceptEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die
+		UsePAM yes
+		# This interferes with PAM.
+		PasswordAuthentication no
+		# PAM can do its own handling of MOTD.
+		PrintMotd no
+		PrintLastLog no
+		EOF
+	fi
+
+	if use livecd ; then
+		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die
+		# Allow root login with password on livecds.
+		PermitRootLogin Yes
+		EOF
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd-r1.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	if use pam; then
+		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	fi
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+	rmdir "${ED}"/var/empty || die
+
+	systemd_dounit "${FILESDIR}"/sshd.socket
+	systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service
+	systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service'
+}
+
+pkg_preinst() {
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
+		show_ssl_warning=1
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${old_ver}" -lt "5.8_p1"; then
+			elog "Starting with openssh-5.8p1, the server will default to a newer key"
+			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+		fi
+		if ver_test "${old_ver}" -lt "7.0_p1"; then
+			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+			elog "Make sure to update any configs that you might have.  Note that xinetd might"
+			elog "be an alternative for you as it supports USE=tcpd."
+		fi
+		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
+			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+			elog "adding to your sshd_config or ~/.ssh/config files:"
+			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+			elog "You should however generate new keys using rsa or ed25519."
+
+			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+			elog "out of the box.  If you need this, please update your sshd_config explicitly."
+		fi
+		if ver_test "${old_ver}" -lt "7.6_p1"; then
+			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+		fi
+		if ver_test "${old_ver}" -lt "7.7_p1"; then
+			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+			elog "if you need to authenticate against LDAP."
+			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+		fi
+		if ver_test "${old_ver}" -lt "8.2_p1"; then
+			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
+			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
+			ewarn "connection is generally safe."
+		fi
+		if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then
+			ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to"
+			ewarn "'Restart=on-failure', which causes the service to automatically restart if it"
+			ewarn "terminates with an unclean exit code or signal. This feature is useful for most users,"
+			ewarn "but it can increase the vulnerability of the system in the event of a future exploit."
+			ewarn "If you have a web-facing setup or are concerned about security, it is recommended to"
+			ewarn "set 'Restart=no' in your sshd unit file."
+		fi
+	done
+
+	if [[ -n ${show_ssl_warning} ]]; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c1fbb66f0af9..19766d99c21a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 3bb837b104a3..0d901e772554 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2023-10-06)
+# Breaks building scipy: https://github.com/cython/cython/issues/5748
+=dev-python/cython-3.0.3
+
 # Mart Raudsepp <leio@gentoo.org> (2023-10-04)
 # GStreamer plugin removed upstream. The database used by this music fingerprint
 # plugin has been defunct for a while. Removal on 2023-11-04. Bug #915189.
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 60a43efd401c..84d38c2abc45 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index f28810f48341..d8c0de43ac39 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -5,5 +5,5 @@ AUX tgtd.initd-new 3922 BLAKE2B 02e91c2c2f1d04af2ca9ae00143420aeb8c56e37842be136
 DIST tgt-1.0.87.tar.gz 304798 BLAKE2B e8772a02078204373dd43276cc5534dd9e8996841bdfef613f34a9c59ef2886f866ff6fb56e6bdaea653b4081b477e1ab15cb3ed3d125b7c08b45ab11a63a7cb SHA512 362adfc92f9fc6528b3de0aa9f202e39f6035b92fe3078236a3f75c0aef540a82cb4594077fdc7de2e524acc75601f5696111cc9aebc6de6265c53cd1d073db2
 DIST tgt-1.0.88.tar.gz 305767 BLAKE2B d9a35da5c12ba1621473a04f59ffc85364412443854e4b9d88ba7ae7a7120dbbf6cf233852ef33cca2f19bb67acd54dcdd97041812277cc7eb9359d2483289d4 SHA512 b1ac4da634ff65edfd67cfcbd4509772216ba411b8c389cd209d3abe7c72b19f8e261c627e3ad8343faeebe3d8b758855184b50ab9e635d11c707ba3bb79fe70
 EBUILD tgt-1.0.87-r1.ebuild 1605 BLAKE2B ac1e9de1cb377f30fd459164bb090b5726868338a3f9f90e7b2eeacc286f5379911e6c706dba7b503f385b8ab2d3151b2200b36db78f59c44a96f72c162eb548 SHA512 f895816371e87265c7fc97a3d157e5ba6c2ffe96a9e69dca63ad69585b12f61f0e4dc61d8f743920b27e22fc28f19f814c11f6de2986872dbcf971462b7fc709
-EBUILD tgt-1.0.88.ebuild 1605 BLAKE2B ac1e9de1cb377f30fd459164bb090b5726868338a3f9f90e7b2eeacc286f5379911e6c706dba7b503f385b8ab2d3151b2200b36db78f59c44a96f72c162eb548 SHA512 f895816371e87265c7fc97a3d157e5ba6c2ffe96a9e69dca63ad69585b12f61f0e4dc61d8f743920b27e22fc28f19f814c11f6de2986872dbcf971462b7fc709
+EBUILD tgt-1.0.88.ebuild 1470 BLAKE2B d5876bfb27d9540362eaaa441cc0d04c0befeee5a55da8b2c39edf967ca9f01cfff9299827b8377723e963b160fa93a4e4af2cb1e7dbd1d443a768082d8d1ad4 SHA512 497f8b338dc150c583a5ec7b0fe62335369c39fc9ff0c5b6c47f1e045b72afa5906421fbbd5aaee140c09de9c3ffe049a8e17d9bf604757e238ff8af4949a15d
 MISC metadata.xml 749 BLAKE2B 0bc71ded3e2d650bd34edcb3e5515926248ff71354db504d94c548ec951ded4f71e5af1d5127d8fa3a0a3b398204436743d016fbd1cc1e765b6303a8bd734fd8 SHA512 94f7b923adade87a471854f469731094b00872727c7a668ea7e34e558eb87e661ab01c42fbe920a885f28c394f2bc9bf0fba0e48b84893ecade9c3d967e4c2ea
diff --git a/sys-block/tgt/tgt-1.0.88.ebuild b/sys-block/tgt/tgt-1.0.88.ebuild
index f5b5df98b0fe..3acece87b340 100644
--- a/sys-block/tgt/tgt-1.0.88.ebuild
+++ b/sys-block/tgt/tgt-1.0.88.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
-IUSE="fcoe fcp ibmvio infiniband rbd selinux"
+IUSE="infiniband rbd selinux"
 
 DEPEND="
 	app-text/docbook-xsl-stylesheets
@@ -41,10 +41,7 @@ src_prepare() {
 
 src_compile() {
 	local myconf
-	use ibmvio && myconf="${myconf} IBMVIO=1"
 	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
-	use fcp && myconf="${myconf} FCP=1"
-	use fcoe && myconf="${myconf} FCOE=1"
 	use rbd && myconf="${myconf} CEPH_RBD=1"
 
 	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a616465f5a01..57b3aeae28d5 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e82db5778b80..1cf632c916e6 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -11,6 +11,7 @@ DIST gcc-11-20230622.tar.xz 76199316 BLAKE2B a769dc6be63eabca3bc33944b471d727bf2
 DIST gcc-11-20230824.tar.xz 76202120 BLAKE2B 243ce16e28c66d681bb27df32866947309f8fa386e258896651b6853e390da79304250669096fd55cafe0a9d5adf4b3a3cf5989302f4ad13660ece80639b545a SHA512 a9cab8bf61f2a572baba73a2a11271eeb61d43f07411df376a8568820c1373f64f635d747933fda1e942ae717b0ae9f1c810f662fc09ccb075940248bc48b582
 DIST gcc-11-20230921.tar.xz 76227940 BLAKE2B b086b35bc7192be078d08f6c9363a9b343f8d97a1bc781870796cf564b829febeccb5f94739fb14a88357f7f66530ff3c23f298eed9341ffb6927a5ac4a40546 SHA512 20fd7e680303a8328e9c017ab21dc3cab46fe5684a08bfc48a342ec4e95cc94675db2e450483499f126b2d5943e3ef8115287a5b4da8718b966c0ffe9f79b925
 DIST gcc-11-20230928.tar.xz 76217292 BLAKE2B d0c58f0e8e15a4efaa3faba9b83efdac9b96749836f776f2ef438cd0bcf74601e5d24b2c45e7edfb2cc44e5aee32c5a2b23c8efcb370e4cf902c98d930664157 SHA512 ddbc362d8b3177432886861da89e68b187deeaae7d40aa03881f8135931475ba688688fd3217d95dfb9d01d62a634808a04ab0a4c37f12332155bdabce459115
+DIST gcc-11-20231005.tar.xz 76222664 BLAKE2B f5671cdb01df00bd917f59ad33ac91a4904514ed25b9879e6c10cad15a86666709dd7ff9425ba99de45b811e3a1afde977a5683b6e9c8de91da8080f37dc9cce SHA512 4f0f0543655f398ea32c08f2b18be2430652ef3537b1d46ecbb9e522a7701bea2ffe04ed6fe6a179596a5f8da02fbd5fdc4758c6b9e8e2e9d9f0805383c4fc1e
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9
 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17
@@ -43,6 +44,7 @@ EBUILD gcc-11.4.1_p20230622.ebuild 1612 BLAKE2B 4f3d27e0196765563bdc3647f4bb1f7a
 EBUILD gcc-11.4.1_p20230824.ebuild 1614 BLAKE2B 76541d8ec0819f2ced3ac9ecc63b7f7fdee3716226b8cb1d1ae1d1115e2ba9c653cfb25e711289d263bce7b75c6812f24bd381ca84c8dbf33ee840f08765f8b7 SHA512 221b1b8aee3fe8d9db2bfc17f25cc59e473960307c95b0991bdae2b8258c889f2765514d27015621cd000e609f14110cb341ffe26054b42444e12a51fff19188
 EBUILD gcc-11.4.1_p20230921.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167b027737353abf34be5c9c64f463ecf28c1d6eb67f210a39964779a7b2d0adc8e2e052aa15aace5499428f7082c99cdf2 SHA512 a175a89736344022b27199d4f36bb95914c2fdce49787a98bdcd798e6ab1a2d1e8d55769301950472999ba51fbf9bae9b86d3f9914964f361e9a9b526de74170
 EBUILD gcc-11.4.1_p20230928.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167b027737353abf34be5c9c64f463ecf28c1d6eb67f210a39964779a7b2d0adc8e2e052aa15aace5499428f7082c99cdf2 SHA512 a175a89736344022b27199d4f36bb95914c2fdce49787a98bdcd798e6ab1a2d1e8d55769301950472999ba51fbf9bae9b86d3f9914964f361e9a9b526de74170
+EBUILD gcc-11.4.1_p20231005.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167b027737353abf34be5c9c64f463ecf28c1d6eb67f210a39964779a7b2d0adc8e2e052aa15aace5499428f7082c99cdf2 SHA512 a175a89736344022b27199d4f36bb95914c2fdce49787a98bdcd798e6ab1a2d1e8d55769301950472999ba51fbf9bae9b86d3f9914964f361e9a9b526de74170
 EBUILD gcc-11.5.9999.ebuild 1582 BLAKE2B a5b94704a65afc32a3079ad0732b544c03413a9f4965ccf1c2718fd763dc29b7a64e54b8cbb492d52e93527e3f0d4966d17eb6b6cb81fd609c6629d19f6b124d SHA512 bd165193f6ef2b12930bac05c8c3f75f6bafd143a13ed5c2960f7a1d8039608ca23ccbffe9a6b235d42c789d117e29cb3d47998c71a4a3eba30a63b8b9e0f116
 EBUILD gcc-12.3.1_p20230526.ebuild 1609 BLAKE2B a242d9a7eedbf244d1a43ec5d9f8e89e82e15fdfc2a0188dafcd5ee3050dd68e20cb765e06eeae92f1b4b965b9f678bd23786291d207984afe0365728f71a327 SHA512 a844ec1b656ade09280433231828e28bdfac9750e277fb5f7b2c905199f62d1f3d59c5c283706f8e80d8f8e5059a7529cd0b5a3c224a55b6e97faa335b8ebe74
 EBUILD gcc-12.3.1_p20230825.ebuild 1620 BLAKE2B 3866983ddc8c6811e00c12af0051e80bfc7f0651a5ef6ca4af9ee651e2efea89a095a616908cccdbac88d8c1baa5ba2eaba7ce7e94f9aae6ff3a56ff52bcd0c2 SHA512 81a426e6392a42d3a28eb6aa5a2de535771fdb87224eafb60ea369c902f27a42c8265565b354d4bbac8daa968849a20370c529c62c9367f0cf58756124d08e0b
diff --git a/sys-devel/gcc/gcc-11.4.1_p20231005.ebuild b/sys-devel/gcc/gcc-11.4.1_p20231005.ebuild
new file mode 100644
index 000000000000..02c58f02f0a6
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.4.1_p20231005.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="11.4.0"
+PATCH_VER="10"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index f0cc668e592f..120569e775c9 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -8,9 +8,12 @@ DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b
 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
 DIST gettext-0.22.2.tar.xz 10238092 BLAKE2B 337597432af11ba082354e968fa7dd95aa6b568344b464d6bfb606d9f9bbe88fee035d39f29fdce62e28a9ece7da29cbde23093ca2af0cdd1955f26abd854036 SHA512 c5c24eca1c7e8e242e6b993a39068dc281b84fda7f06e5020dc7fc10ac7de5bfcc476b7e94711723a7f82cc7f5a0845616ddd553078ee69690e3a146fc3f8ae5
 DIST gettext-0.22.2.tar.xz.sig 833 BLAKE2B 47a3480c6ec5b379e2262588a358e69560477c5e8cdc13d82f879bf1c2381c4b176060e6e1d482b0a9b17d497ff5e7c1642646489f3829c879340b939d51de5c SHA512 b40f233d64001b13ab5d5b85bc87424bc873cbbd6e59e797997ed39404325a5a2dc945f7b6a3dfc25becaff788d5dd644779bf505d5141bfa437882931dcf22c
+DIST gettext-0.22.3.tar.xz 10236340 BLAKE2B 567945a9554f14729835b63587d0ae1e8c1a4538ec039243b525abe4bff9a30cd02d0ddb12f3475f27c6a2a0c6647e52201f2ea34ba60d1867c063c653718785 SHA512 ccfd17d664f02da58b91623845fde23b9763442cb988be979d814aff66d774db87ed7d8b27dcce84bf8f118d85d34f4782ce451c5d3cb5a9484161ba2c3f4209
+DIST gettext-0.22.3.tar.xz.sig 833 BLAKE2B a329a9b6d9bc8e7dfc4bda748624649f1a4d66fbe5ab4e61038e0e931d5838448bfd93a093b5f4fff8e86f446683ca660f47d8bfd2a0dc27f52f575daaa116ef SHA512 fd3fdbd78e5f86dd1e5d149cac7e7f1ee6c553e1c703bb141906116cb6e8603042128aa64a9dfc06c51841c5748c532219337735911e55c7c99306099fd5d719
 DIST gettext-0.22.tar.xz 10008808 BLAKE2B e91c82eb793897bd7ed727503e9d6e72a47027adf51ca76cf5c936437c434e910508814b1d03b12694c5e87156018683cb2c8cc51637b121313ed41155bcd3e5 SHA512 c6368344aa4e0f6fd7c4a93023a5f7b377c7bb97b8ea688fd54f4c385c069d9ff27611d8763b1aed6328b6d3c4db7b34bd89bfbf6525ecaef11eb58434a4d4fa
 DIST gettext-0.22.tar.xz.sig 833 BLAKE2B d1718f02100abc2c7c67e5c6a49000baee5244030fcef33f099fac255562211332b0c7838d329e2cdd2c99c5b4e5d4bfed6da81cdddd86a4adf9f24f626c8704 SHA512 2d4f0ea68150aa9f7da315545bd782f0c74d581ec89f60ca5138d069cc6ef0296f85df6e05f0c7f030dc8660a8db32529d237497473f6cef7c72034adcc58a9b
 EBUILD gettext-0.21.1.ebuild 5199 BLAKE2B a0c375609a0a988debfe68d7101b04ce9a71abc3b949d57222e9642b80757b74e652017102bb736141d085bf7a160004c4e472ac1e0e4cb6c2d396172e700567 SHA512 934dbe90a60fe2559cbb4c3f42926b61184f77124442c143244d8bf3caac583f58cb097fce7b01c69761f97dc016214ef0d0ea6da5995f4fc2efcf2266d08efa
 EBUILD gettext-0.22-r1.ebuild 5215 BLAKE2B 74d2257746329ae3a15e4d0df0cbdd7adde734f316e5dba576b2251260612c90e1a952ff661b03944a40c9581efb4c72ec0e6f340634c356ef445419ddc24303 SHA512 f48b722448f551e610c58a2005ec9c214060090a6728f586f140bbc1462ea68a5925017b2dc52be8102d3aa3ff24feda13d899568d8cc2b2b068debb18ad72bc
 EBUILD gettext-0.22.2.ebuild 5203 BLAKE2B 9d4a1e785f50def1eadb4723172d1cc07914ee316bd06c05604c25e2ec74a7ce2ff656040cea6f5614b6ad46862755d2e937c8fc310a11a72712d4a918776328 SHA512 a80bc5afb3d5d2084de2c433a9c88a679c83d411b5fe0e110ad65150b4442b8f942d2939da879f2061938e56259839dd2f879115d34b919fa3eab81a6878d6ec
+EBUILD gettext-0.22.3.ebuild 5203 BLAKE2B 9d4a1e785f50def1eadb4723172d1cc07914ee316bd06c05604c25e2ec74a7ce2ff656040cea6f5614b6ad46862755d2e937c8fc310a11a72712d4a918776328 SHA512 a80bc5afb3d5d2084de2c433a9c88a679c83d411b5fe0e110ad65150b4442b8f942d2939da879f2061938e56259839dd2f879115d34b919fa3eab81a6878d6ec
 MISC metadata.xml 529 BLAKE2B 7043c2adba0d48824bf343847a587b7eb9ce0947b1985ee375f08a0af0fce3809e7a581001872b98ceb5305aeb410d4e2e72425e7906563593e168cfe60904f5 SHA512 06a0877db14a56e71a90ecc4eed1658e21703403c5739ed8e62202e5fe3958fccab5ffcc633975c7269402022f40653638cc41d1ae5b6427203dc8c28d6a502c
diff --git a/sys-devel/gettext/gettext-0.22.3.ebuild b/sys-devel/gettext/gettext-0.22.3.ebuild
new file mode 100644
index 000000000000..3fc8822689b6
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.22.3.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: Keep version bumps in sync with dev-libs/libintl.
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc
+inherit java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+
+if [[ ${PV} == *_rc* ]] ; then
+	SRC_URI="
+		https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz
+		verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz.sig )
+	"
+	S="${WORKDIR}/${P/_/-}"
+else
+	SRC_URI="
+		mirror://gnu/${PN}/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.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"
+fi
+
+# Only libasprintf is under the LGPL (and libintl is in a sep package),
+# so put that license behind USE=cxx.
+LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
+SLOT="0"
+IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs xattr"
+
+# only runtime goes multilib
+# Note: The version of libxml2 corresponds to the version bundled via gnulib.
+# If the build detects too old of a system version, it will end up falling back
+# to the bundled copy.  #596918
+# Note: expat lacks a subslot because it is dynamically loaded at runtime.  We
+# would depend on older subslots if they were available (based on the ABIs that
+# are explicitly handled), but expat doesn't currently use subslots.
+DEPEND="
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.3:=
+	dev-libs/expat
+	acl? ( virtual/acl )
+	ncurses? ( sys-libs/ncurses:= )
+	java? ( virtual/jdk:1.8 )
+	xattr? ( sys-apps/attr )
+"
+RDEPEND="
+	${DEPEND}
+	git? ( dev-vcs/git )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	git? ( dev-vcs/git )
+	verify-sig? ( sec-keys/openpgp-keys-gettext )
+"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# only installed for native ABI
+	/usr/include/gettext-po.h
+
+	/usr/include/autosprintf.h
+	/usr/include/textstyle.h
+	/usr/include/textstyle/stdbool.h
+	/usr/include/textstyle/version.h
+	/usr/include/textstyle/woe32dll.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch
+)
+
+QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+
+	default
+
+	# gettext-0.21.1-java-autoconf.patch changes
+	# gettext-{runtime,tools}/configure.ac and the corresponding
+	# configure scripts. Avoid regenerating other autotools output.
+	#touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die
+	# Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac
+	#touch -c configure || die
+
+	elibtoolize
+
+	if use elibc_musl || use elibc_Darwin; then
+		eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# switches common to runtime and top-level
+		--cache-file="${BUILD_DIR}"/config.cache
+		#--docdir="\$(datarootdir)/doc/${PF}"
+
+		# Emacs support is now in a separate package
+		--without-emacs
+		--without-lispdir
+		# glib depends on us so avoid circular deps
+		--with-included-glib
+		# libcroco depends on glib which ... ^^^
+		--with-included-libcroco
+		# this will _disable_ libunistring (since it is not bundled),
+		# see bug #326477
+		--with-included-libunistring
+		# Never build libintl since it's in dev-libs/libintl now.
+		--without-included-gettext
+		# Never build bundled copy of libxml2.
+		--without-included-libxml
+
+		--disable-csharp
+		--without-cvs
+
+		$(use_enable acl)
+		$(use_enable cxx c++)
+		$(use_enable cxx libasprintf)
+		$(use_with git)
+		$(multilib_native_use_enable java)
+		$(use_enable ncurses curses)
+		$(use_enable nls)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+		$(use_enable xattr attr)
+	)
+
+	local ECONF_SOURCE="${S}"
+	if ! multilib_is_native_abi ; then
+		# for non-native ABIs, we build runtime only
+		ECONF_SOURCE+=/gettext-runtime
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		dosym msgfmt /usr/bin/gmsgfmt # bug #43435
+		dobin gettext-tools/misc/gettextize
+	fi
+
+	# 909041 never install libintl which upstream insists on building
+	rm -f "${ED}"/usr/$(get_libdir)/libintl.* "${ED}"/usr/include/libintl.h
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	if use java ; then
+		java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
+		rm "${ED}"/usr/share/${PN}/*.jar || die
+		rm "${ED}"/usr/share/${PN}/*.class || die
+		if use doc ; then
+			java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2
+		fi
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+
+	if use doc ; then
+		docinto html
+		dodoc "${ED}"/usr/share/doc/${PF}/*.html
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+	fi
+	rm "${ED}"/usr/share/doc/${PF}/*.html || die
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}