gentoo auto-resync : 02:11:2023 - 03:49:51

50 files changed, 143 insertions, 324 deletions

diff --git a/Manifest b/Manifest
index 8c09faf05bb5..e019553f0de6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29279 BLAKE2B 2a8583edc89497fe0a9e02707fb7e1068bfa28da040dcd56eb2e7efd2d09fb74c5fbca3043aba3cd9a6592a158dc97bcb31e0ce357f236a3b71dc4fc7c71024a SHA512 21dbc440ee710dd18a14991383ce9b3bb494d5b39666462641ac391873cab99f1fdc021081e0dd59ad132cfc0b72f631d9a472a8274496d632a09bf753d8b238
-TIMESTAMP 2023-11-01T21:10:03Z
+MANIFEST Manifest.files.gz 29295 BLAKE2B df7a3eb86c421926985877438744d4bf8d89676acc9aefd96cff8c5e099a437a5d222b6c45ca1fa8adfaf44f794ef04aa33a88191479ccab59503ff48af183ed SHA512 fa8d85c6b09ba5d379708a09c32220c61df74cc111b5deb593522fd539685fedfaa0f73c9fe1623e3a74155b8bd79dbfa2d2a7a09daf10c832fe75731995e9e0
+TIMESTAMP 2023-11-02T03:10:03Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVCvqtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVDEwtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBz7A/9G1E9wBlNzxi+Id3l3lPgMobVXsJ6X6YtomR4RHdOvujP6IkemlMDKyS1
-3GYrGlc36jr98o4ucV/b6zrAf5v6Ig7KXzYPIQCQHDGqKQex/znhOSpmyELw0MpM
-F2C26Ptfzmh3JuWHjnNGA3MYa1+XU/Y0sBj3AmMELJOKvf9nMm+ofbE3jqyRctQW
-Xr0ImzuoQseEMKqkE0rRN97OnK2lk760LYVftDNS7bi78zGFdETq7xUM4519yuhX
-oCr/MHrXO8u1W+baXEAIecw/WHVYRy3viY69cizjfXRm1yZnrXjFs9mXyQQRGJct
-yv3rpoilGrD9xHHhqenDZHa9URs7GRTQaMzUv4fILlvBv+/xdVR95PdK2GRvuwT4
-cekGXqoOhO4QqQsk6hRl7+wDe06eTdEpa2Nw1JF/na5MKFfipFKiAmoZvPwqCch6
-I6jdzaxUujtjNRvOQ8JcL/FkqIPtybVt1/uewpEvugbvJXibtxqk85r3s8orhGv4
-T2vKS+uJHMpqdvmlnQLQ8PadkgjAYcH0sGIJFd6Gmk1Vi1IgDW2J0My0NMZ+tjIM
-I1cKm5KctR/jEbl61q4fbuzHMF1l6ZxJccQJfYO/LXcsamGFuviU2MifYtjh/EZS
-P0GXN5ND/2CbKkI7//OGkWIdlOoaJycNmsL9H5d0NeWtZvohJ6w=
-=Yvaj
+klBXVRAAgb0O/5MK87xgIOY3iEwIjab5bg2D2Y78Wa/HdLnQSCdWiHEKAu7ycQLQ
+0KmOUI18SC7t1RwuMU1QqyEMXIhwFK7JAXqX+Ae/EYTaxQVI1Z7v54TFhvDxP8ZS
+WggUx75tf/S2rWvQelzi7I6HcdL08wOsU7IMvckD8vQKBKE3it3JVEp2F+s2UWeA
+fBcQ9NbjJUE6HzASRQd1ZZcgtjsfiq0GjXBCjrUUsivwIX2Qk1BWscoJ001HJ//T
+smD8njTrnpNY315nzlZktXvdRVD3SA5uUsPFe3qFnNCEuicooOwNQ2JoVESTaLiX
+FssnCuOnKSb2YeziHp7RuTxQE77y8kr1WnoWTExHPe2RIS1+Vi84DHT3/ZMdLipt
+/hCt4l3AANvyInAmXz9hrH/4Au4O4b4AAlUo+TJrvlbkscCV9EE1+tPDiy38kdKk
+LMGfBmq9faIu8N7BdiFuFgBwMHTJO0WJIAE32mer7UcEL73gB6nuCOjzzaJBpc6K
+eD+6En2TjqIkCU2JYSCrFFoXq/RzTUOHXdrCj8Z8DhwAGzV1OzC0FlN3AL7tWzMc
+dsncEnO/1dsVsCo0YxBDH/lYyGdXp1mPAo0bl+qpfTmcmpnJEcII0ACfryZHjRVE
+fM+q6+KvYVa5mSSm9vuTgTNSlB+8LYYhnlFjqBAGTtwXF4zXgW8=
+=BH74
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 539b1df6c224..03551c5ccfe5 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 8ff11494bb2d..25f2bce4f1fe 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 8149086ff815..4e13b2d161b8 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -3,11 +3,9 @@ AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 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
+DIST podman-4.7.2.tar.gz 20554551 BLAKE2B a53bbe6b21145ab394b4a9bc540d4335ca6cdd0e0a98e741e5cfb8aa19aaeb2801ca8d117d42b0d66f618018a2d4b1d736fc851b58b661cbae6ee815712fb936 SHA512 1873a158f2e0527b6e57929f391c4ea5adee5fba33e861eb7744cd0ac845f7296f6149b5e824142e701e5b4db95466585206f37402298301f99cc40b781a51ba
 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-4.7.1.ebuild 3267 BLAKE2B fa4df1776c79e2b791b090384a5a8972a39f6e68f06ca8679b0cb1fcdf1b043f32b8135b24ae8e9eb5f03c830398a406a02225ed016e4e130c00d72285d6823d SHA512 22a56db38ff489eb9ec91515d4bf8d0da4c90f4e25f0f806dfac3c5b008cf913d0f7355f6d95e76bb628250f0c246363b22b8c716982584161291a56474e1698
-EBUILD podman-9999.ebuild 3267 BLAKE2B fa4df1776c79e2b791b090384a5a8972a39f6e68f06ca8679b0cb1fcdf1b043f32b8135b24ae8e9eb5f03c830398a406a02225ed016e4e130c00d72285d6823d SHA512 22a56db38ff489eb9ec91515d4bf8d0da4c90f4e25f0f806dfac3c5b008cf913d0f7355f6d95e76bb628250f0c246363b22b8c716982584161291a56474e1698
+EBUILD podman-4.7.2.ebuild 3607 BLAKE2B 11b3dd76f057d0f37ebc5e3332d960af027407eb07cc3a0e5a4099c1e6c6aa6d7b41d462f8e9dbcf213f5011d9b756e7cf273f6f45b69d6015aff9b27161cfa0 SHA512 4b46f60c59b808aecc94ba8c1cb5d59542111e8dae20fc3fcd6f618cb28f3fbf9a3af8622871f66fea74e136dc4b6b11079994f3d87532de9b616b3b9ca62588
+EBUILD podman-9999.ebuild 3607 BLAKE2B 11b3dd76f057d0f37ebc5e3332d960af027407eb07cc3a0e5a4099c1e6c6aa6d7b41d462f8e9dbcf213f5011d9b756e7cf273f6f45b69d6015aff9b27161cfa0 SHA512 4b46f60c59b808aecc94ba8c1cb5d59542111e8dae20fc3fcd6f618cb28f3fbf9a3af8622871f66fea74e136dc4b6b11079994f3d87532de9b616b3b9ca62588
 MISC metadata.xml 1755 BLAKE2B c798a03c4a1f63b22a2a4986b6cb0000018c5f01c1f144f3745a7d7c437e3a0524e1573b881df283f18ce5e108fbca7aa25762ca3439b88cb230a92848625ec9 SHA512 dde26f1fffa80f076a73fcdb28d3b73d2a60ffef54e475dbcf61a226ec7b317be9681fc08aedebdc2b72321d10a7538334913e6a94eff69a71d53ff78cd8cebd
diff --git a/app-containers/podman/podman-4.7.0.ebuild b/app-containers/podman/podman-4.7.0.ebuild
deleted file mode 100644
index 2c7ededf36fd..000000000000
--- a/app-containers/podman/podman-4.7.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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 selinux_tag systemd_tag; do
-		[[ -f hack/"${file}".sh ]] || die
-	done
-
-	local feature
-	for feature in apparmor selinux 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-4.7.1.ebuild b/app-containers/podman/podman-4.7.2.ebuild
index f10c9b0ec10a..85842e6a4f69 100644
--- a/app-containers/podman/podman-4.7.1.ebuild
+++ b/app-containers/podman/podman-4.7.2.ebuild
@@ -8,7 +8,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
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/containers/podman.git"
 else
@@ -16,7 +16,10 @@ else
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
 
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" 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"
@@ -61,6 +64,8 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
+	# assure necessary files are present
 	local file
 	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
 		[[ -f hack/"${file}".sh ]] || die
@@ -71,18 +76,24 @@ src_prepare() {
 		cat <<-EOF > hack/"${feature}"_tag.sh || die
 		#!/usr/bin/env bash
 		$(usex ${feature} "echo ${feature}" echo)
-EOF
+		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
+	EOF
 }
 
 src_compile() {
 	export PREFIX="${EPREFIX}/usr"
+
+	# For non-live versions, prevent git operations which causes sandbox violations
+	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
+	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
+
+	# BUILD_SECCOMP is used in the patch to toggle seccomp
 	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
 }
 
diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-9999.ebuild
index f10c9b0ec10a..85842e6a4f69 100644
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@@ -8,7 +8,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
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/containers/podman.git"
 else
@@ -16,7 +16,10 @@ else
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
 
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" 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"
@@ -61,6 +64,8 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
+	# assure necessary files are present
 	local file
 	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
 		[[ -f hack/"${file}".sh ]] || die
@@ -71,18 +76,24 @@ src_prepare() {
 		cat <<-EOF > hack/"${feature}"_tag.sh || die
 		#!/usr/bin/env bash
 		$(usex ${feature} "echo ${feature}" echo)
-EOF
+		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
+	EOF
 }
 
 src_compile() {
 	export PREFIX="${EPREFIX}/usr"
+
+	# For non-live versions, prevent git operations which causes sandbox violations
+	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
+	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
+
+	# BUILD_SECCOMP is used in the patch to toggle seccomp
 	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
 }
 
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index f42fd9def872..65d537590445 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 06133b48db3e..206ce4ce67d7 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -6,10 +6,10 @@ AUX godot-4.0_rc2-musl.patch 878 BLAKE2B d10e22acc29e14df6b42b180ed480908c61e6a9
 AUX godot-4.0_rc3-scons.patch 506 BLAKE2B 2fd1421760f082ea65febce90459f8a2d63e06e5b02b5e86e59bbacd14db78f76448ee50d0fa7c935b1a867f528b46a9b82b5bb03765d0b237e9af73d7fd14da SHA512 9ac654edc66a5a330055d1af0b706a5fa143061712146ddc02657add45d4518d96391d9e980c0a6b33d9fa966b5914a3f90a7b333f20885f0a05a7b8985fc667
 DIST godot-3.5.3-stable.tar.xz 24072964 BLAKE2B a4c03328e3aa77d741a1c642cfd645de04084f2852e865757fc8960c4919d3b8b8571e772f44004901fdd80a967e8e21bd8c6be8b36263db7afae787dcbd3ed6 SHA512 4c008af5bb7c298d465edbe03f6ebc642f5bbbb0a4254e99d7a7a88919e1f9424b98c5dff95a55ae68d4e2e5878c7c0bb7d13a66869cb632ecb51a913f865155
 DIST godot-4.0.4-stable.tar.xz 30267060 BLAKE2B 42f5f0c89edb96eb6f36c54229671f233ed0a49a769361195f9aaf807b45fe3968aeeaad204fc07e200114d852e4651f9dc8eb137c4f3aca7b8e8e1203ebcdc9 SHA512 4dadc123995d7262ffa6c5002d08611038957c59a8bd742284b9b62577de6b7182aad807db7a231180a355df0f25d10babdc914faf9287ed401152d98762bb5f
-DIST godot-4.1.1-stable.tar.xz 30681136 BLAKE2B 18e6dae0428812493ecdd8d76cc99c2264873707d4abac0146a1d9b9cbffe2f678c346951a714d0d211fd380b433f910cc952e1720a2c4933febeb7d64283369 SHA512 9fc4bdff2ef3f5ad173514709591941f1dff32dd7cc54224a85691b34b6a5f1d01addc9b4f8d996bc6f774cee5c722181122a39b498b23e48e8d70629ff8ff0b
 DIST godot-4.1.2-stable.tar.xz 31020196 BLAKE2B fbdc4470a4db78a810dcbd7700c46dd03a9d9802c08cbad68dd3aedbc00678f7285837f34642ac833c000164f4a98559cb82bcb615ca353cf319e771d55cdc6a SHA512 d9e3c948aeece3586632ed2a8c94ca2107a6b5b4bb1ae8dc264e350fbfcb4cc1f4cd4cf7fdcd61a5b0351511c12e34d83275a79d5e0361e2eee67c8447b5f831
+DIST godot-4.1.3-stable.tar.xz 31027024 BLAKE2B 7d3eb66f080089507662fa639307d941772f79413d3f956feadaaaa5a335dd4057c03e90ee75e247689e78534d798cba3511e55d59097da2ca8a5954bbbb4172 SHA512 e8dc812fc1bd98ce4d691d51fceb75d943fb40790c5a640e6178eb53b4de8b1078de8e1649e182963cb7beea26b2365c202f6deaea9bb679f789cd546d29f858
 EBUILD godot-3.5.3.ebuild 6667 BLAKE2B 9a6c6642b12bab97d0c91f9b65b48505532c5d713eb2c13ddbb3c074d6d62ff6913eddb34c6394c57a5db3870661158631cc40b870c3e6a345e490340c8b32b3 SHA512 9085bec5650281edbf46e2ea8ce3242bb40c7e8760f093c709fb21c8454caac54896ebdcea42d0d59e9069e681f8722f3c2029373617f501fff2df8cecbccd27
 EBUILD godot-4.0.4.ebuild 6983 BLAKE2B d089b3cd44737743c572ddd4496064c635f2934e367fbf834bb3527c852061cbaec8283405a7ccad7f59a6bf210fb5a44727c114b228056f98f0f2a819f7e889 SHA512 0aa73012f7b271939e5055f21db46d3d613c5b6eddde7f428418c0ffc0cc7a53aa7038fb417f4ff826dd1ab68e1f6baeea6293148f0a945a41987d01a44ead1e
-EBUILD godot-4.1.1.ebuild 7033 BLAKE2B 5ff93d7024d6404470339708928c7012a4ab843a4e535ddc033e5f05bde3934120f0fa4e174c480e8681a4a6a640fd2a7b37c35455d3a9c65164b718422d2661 SHA512 1b5a0bd0bd24bbbe7b5d77d489217fde719c94a452f113f079a9c575b81cfc62a3220675b6a310bb75e2d5f40e556a1f444fd7b70e2c13ebf03c367091891a8a
 EBUILD godot-4.1.2.ebuild 7075 BLAKE2B cfb19fc3bad4deee505de14044034a7a9e68832f1d773ade24ccfbf63d62fbf969d894b40d06b305b6cae728797a1bbcd3150f0e9149068a466b4833770c8d2d SHA512 f8dbcfde3ee9db5bc0ad971938d8f4a5d3c3627a3cd120b02969ea15aee5aae8611d89f931ae2edd4eb8f1ea970d5171ece5f51d57bf54a75da30b3fec155097
+EBUILD godot-4.1.3.ebuild 7073 BLAKE2B 8125a283060311ea5d203e1a9147bab32df3539a2a9595d182cee1ba90b3c07b66da4e6c069a3534a105c8dbca1999ab2729827f2bee833d7bcb448d95e117d6 SHA512 21c02b56c81341007fd477ada576e54395d65fa456036425ac763fd0d219077861b37e0a37fb5596be31d2ca2f8fa0c22ecfa6c9bd2cbc468bfa61585f3231a4
 MISC metadata.xml 1551 BLAKE2B 718ca848e6b90fad730ea413ff8d25a9c23836da1ff890d7c93d458a0b46b503a4d1b949742a4a819eb0323eb0626a3541cd35d41f809b600891fa470f565ff6 SHA512 b935ee9256ae07a8f01bc458ee41c46e25be8a38b6921cf353a20332c59b6083bd6f73e2112858827b3b7bccdb256f9122e1d9691d2a3751aba85bbb8c4ab262
diff --git a/dev-games/godot/godot-4.1.1.ebuild b/dev-games/godot/godot-4.1.3.ebuild
index bb300f4a8f99..e2f9c5de4c32 100644
--- a/dev-games/godot/godot-4.1.1.ebuild
+++ b/dev-games/godot/godot-4.1.3.ebuild
@@ -3,27 +3,30 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
 
 DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
 HOMEPAGE="https://godotengine.org/"
 SRC_URI="
 	https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz
-	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz"
-S="${WORKDIR}/${P}-stable"
+	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz
+"
+S=${WORKDIR}/${P}-stable
 
 LICENSE="
 	MIT
 	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+"
 SLOT="4"
 KEYWORDS="~amd64"
 # Enable roughly same as upstream by default so it works as expected,
 # except raycast (tools-only heavy dependency), and deprecated.
 IUSE="
 	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
-	+runner speech test +theora +tools +udev +upnp +vulkan +webp"
+	+runner speech test +theora +tools +udev +upnp +vulkan +webp
+"
 # TODO: tests still need more figuring out
 RESTRICT="test"
 
@@ -64,11 +67,13 @@ RDEPEND="
 	tools? ( app-misc/ca-certificates )
 	udev? ( virtual/udev )
 	upnp? ( net-libs/miniupnpc:= )
-	webp? ( media-libs/libwebp:= )"
+	webp? ( media-libs/libwebp:= )
+"
 DEPEND="
 	${RDEPEND}
 	gui? ( x11-base/xorg-proto )
-	tools? ( test? ( dev-cpp/doctest ) )"
+	tools? ( test? ( dev-cpp/doctest ) )
+"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
@@ -144,6 +149,7 @@ src_compile() {
 		builtin_mbedtls=no
 		builtin_miniupnpc=$(usex !upnp)
 		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_openxr=yes # not packaged
 		builtin_pcre2=no
 		builtin_recastnavigation=no
 		builtin_rvo2=yes # bundled copy has godot-specific changes
diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index 349efba7bcbb..a9dace7e78d3 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -3,5 +3,5 @@ AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107b
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f9423ff64e66d62f99d3e26bd898db0b53c135dc99318b236a1b129211f51de9b1a29d054e0810aa4ff2a7c307dc4b4a606eb4075a60748d9 SHA512 a41c7a65b1cfd0dabc080f509cf288f575b3ec5d7666a4a889a8c3156e9d32559e1f802e23783c5c70376c82a24dd87813e9bfde0876085e0e3967b47852059a
 DIST openscenegraph-openmw-3.6_p20221115.tar.gz 5789008 BLAKE2B 312544e8cb06146f1ba4f2ba87cbb7abcea166bfb88fb0252ab003eb35f6b84e96f85ca9d9f07a78a9b8fe692b43a976f57c2f4b326fc8612f564f8fa2baadd6 SHA512 0f54d98069674d016bfca08512d8322f3a744eb21c6ab7c798dc11896aba85270a64404e24f217217f5fd5e191b106aff645dbaec4f7828e8cc5f94328574977
-EBUILD openscenegraph-openmw-3.6_p20221115.ebuild 4426 BLAKE2B caefe6f709cf16e5f737c5aac735ab37bec5054ddd6aee51900d219eeb2edca175b9164e0f17eebd805e4ddf6c07e0e89944501eb788c37d22ab108aec213792 SHA512 19f46586f07339538dd3ed24e51a491b9cf87081c188ae789876e564cd66a73d08ca64cca2e326463e6700cca85244c915c63016f769a82529e6545434e6e897
+EBUILD openscenegraph-openmw-3.6_p20221115.ebuild 4350 BLAKE2B ed3c615ad918873425168e8c068ce5ae414bc2c8e1fafbcfa7b9a20a43eeef5da190845fca91c841d53c23e944f7cec1e62b7b9517a4f22bd4a0841c0f0adde0 SHA512 297abab69f777606635ec56a7bc33956150982f01b0aa579562ec984724f06301bfddd410cabf85d88a34b8ba07b7316aa318148e0029b4f3878c9b2f720984e
 MISC metadata.xml 2088 BLAKE2B 8a6d83cb201e765310d776e4fae427d16f611cd2800c1d9bb3a315cbf3e37f21eea39604730405f18732203b509ab6f9ccde4c9ae54349c0f1be7b228fd8c44f SHA512 8e0b6cc0489b1651c7e0d67af7cf8e31da2916b3df6e27253beddb5cf0a8bb94224611b559c6ef3a52297964b9258de8f2fac72690aa7894c797cedab28031cd
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
index ef31dfac302f..94a6a21ef271 100644
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
@@ -20,7 +20,7 @@ SLOT="0/162" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="
 	+collada curl dicom debug doc egl examples fltk fox gdal
-	gif glut gstreamer +jpeg las lua openexr openinventor osgapps pdf +png
+	gif gstreamer +jpeg las lua openexr openinventor osgapps pdf +png
 	+sdl sdl2 +svg tiff +truetype vnc wxwidgets xrandr +zlib
 "
 
@@ -51,7 +51,6 @@ RDEPEND="
 	examples? (
 		fltk? ( x11-libs/fltk:1[opengl] )
 		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
 		sdl2? ( media-libs/libsdl2 )
 		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
 	)
@@ -148,7 +147,6 @@ src_configure() {
 		mycmakeargs+=(
 			$(cmake_use_find_package fltk FLTK)
 			$(cmake_use_find_package fox FOX)
-			$(cmake_use_find_package glut GLUT)
 			$(cmake_use_find_package wxwidgets wxWidgets)
 		)
 	fi
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 94950628dccb..589f41782776 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/python-rtmidi/Manifest b/dev-python/python-rtmidi/Manifest
index f3e0d0aef48a..59c03a1504a7 100644
--- a/dev-python/python-rtmidi/Manifest
+++ b/dev-python/python-rtmidi/Manifest
@@ -1,6 +1,4 @@
 AUX python-rtmidi-1.5.1-unbundle_rtmidi.patch 1455 BLAKE2B 2cc76ace5758131a069194e9d30c8288ed93a261d41a2b4cf0294e2b4fc7ebee9e0c43b4377143ae8074a03dcc2abf13fd85fdebeebd321efce00e25e43057b1 SHA512 92c11d878018ded30dffa0d06006f8471054321af8d9f58268d4d899121dac66712ddc3a53285c19293fb2d52d4d054b0d803c559e9c01cb8c8f161ce5f2c734
-DIST python_rtmidi-1.5.6.tar.gz 367355 BLAKE2B c544669f51e12e82fe38b68e83078ac01463fcff54941c52fad80a1dd3d55985352dea259bad5ba2f70a895a80d5ad55c0249f9ef6fe4e7b81b84582a5855ef8 SHA512 e834159b07fb0b2d05a511ccd2d5b2a86d25f7b0d3a2b92ebe73edf28cd2a035a7aea0460adc6cf6836535da2815ccc0f986731bc9a23bbb19bc7d559d0ef955
 DIST python_rtmidi-1.5.7.tar.gz 368514 BLAKE2B 32028dff34928b1794cc178b22821fe8e01bff36d18b17b8673c763b21ca7ef85a6cb3ee62adcddbaf0b655079e7b8819ba5a28e58b8d5713015728cd6648246 SHA512 23c88cd307b5bc937920db9b39d0423043fb47878d679f4d721a025368a01e23b8e72749e1146da3277d37a20a9c5486e2c40c2a907c5efc5418567e97c3de91
-EBUILD python-rtmidi-1.5.6.ebuild 1565 BLAKE2B bc0dde3ce0327ad6a30fda46af7373ade34ec01d2aff0e970b015fe0455915e5d47994b336e89d12f408e90b17f663d29ba6b6af876d9e68b2d2d02ce7a2f084 SHA512 f1617c148c3450782d4c355a572c621e7c8b40288fe55c615c9d4ea71127152979c7372ed0397643b577f097d1b177d557b91e1b0f50551dc18142291f5724a9
-EBUILD python-rtmidi-1.5.7.ebuild 1565 BLAKE2B bc0dde3ce0327ad6a30fda46af7373ade34ec01d2aff0e970b015fe0455915e5d47994b336e89d12f408e90b17f663d29ba6b6af876d9e68b2d2d02ce7a2f084 SHA512 f1617c148c3450782d4c355a572c621e7c8b40288fe55c615c9d4ea71127152979c7372ed0397643b577f097d1b177d557b91e1b0f50551dc18142291f5724a9
+EBUILD python-rtmidi-1.5.7.ebuild 1559 BLAKE2B fcbddc44d5a6624303b4c6f06de5704215b9a79b6fe7a94d46e336f9c0faecaea59ba6a91a4e64ce4899d28a5f0f42d36e516436134a894a2c15557947d8b2c0 SHA512 d41c941fdc13381c022565b82c64100805698db6aada3cd20011482b36a7c755294ee160cb55df01db9f274f2cf38e92ebd6cff653826bb22cc6f92e8d97a520
 MISC metadata.xml 388 BLAKE2B b1bce0f609aae5a298c26c80c3dc3aa33eadf32c9de9da22f4a4f808d1cfd8c769b095d12f2264cf9dd04cdbec8a0fb7202b10c04bb43f9112146023aadd398d SHA512 012ad743d364b9266bef852d159235f27b172ec7fceff43737fe8a67478f991dc53532b021c02d8ffc2eea19cdc568046cf90e440afefb46dcdad275a33f71e3
diff --git a/dev-python/python-rtmidi/python-rtmidi-1.5.6.ebuild b/dev-python/python-rtmidi/python-rtmidi-1.5.6.ebuild
deleted file mode 100644
index 18e140eddb8a..000000000000
--- a/dev-python/python-rtmidi/python-rtmidi-1.5.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DOCS_BUILDER="sphinx"
-DOCS_DEPEND="dev-python/myst-parser"
-DOCS_DIR="docs"
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-
-inherit distutils-r1 docs pypi
-
-DESCRIPTION="Python bindings for media-libs/rtmidi implemented using Cython"
-HOMEPAGE="
-	https://pypi.org/project/python-rtmidi/
-	https://spotlightkid.github.io/python-rtmidi/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+alsa jack"
-
-# Most of these tests do not play nicely with the sandbox, some only
-# work with exactly the same version of rtmidi as the bundled one, and
-# several fail even with disabled sandbox unless there are actual MIDI
-# I/O devices present.
-RESTRICT="test"
-
-DEPEND="media-libs/rtmidi[alsa?,jack?]"
-RDEPEND="${DEPEND}"
-BDEPEND="<dev-python/cython-2.99[${PYTHON_USEDEP}]
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-unbundle_rtmidi.patch
-)
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# Just in case
-	rm -r src/rtmidi || die
-	rm src/_rtmidi.cpp || die
-
-	# Needed by USE=doc because documentation generation happens in ${S}
-	# but the version.py generated by Meson end up in respective ${BUILD_DIR}s.
-	# The version put in ${S} should be ignored by everything except Sphinx but
-	# just in case, be consistent and generate it unconditionally.
-	sed -e "s|@VERSION@|${PV}|" < rtmidi/version.py.in > rtmidi/version.py || die
-}
-
-python_test() {
-	cd "${T}" || die
-	eunittest "${S}"/tests
-}
diff --git a/dev-python/python-rtmidi/python-rtmidi-1.5.7.ebuild b/dev-python/python-rtmidi/python-rtmidi-1.5.7.ebuild
index 18e140eddb8a..a1779b717ea1 100644
--- a/dev-python/python-rtmidi/python-rtmidi-1.5.7.ebuild
+++ b/dev-python/python-rtmidi/python-rtmidi-1.5.7.ebuild
@@ -31,7 +31,7 @@ RESTRICT="test"
 
 DEPEND="media-libs/rtmidi[alsa?,jack?]"
 RDEPEND="${DEPEND}"
-BDEPEND="<dev-python/cython-2.99[${PYTHON_USEDEP}]
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]
 	virtual/pkgconfig"
 
 PATCHES=(
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dbb33326d476..c78f087c9acb 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/editorconfig-geany/Manifest b/dev-util/editorconfig-geany/Manifest
index f582eb05c653..746783b1ba83 100644
--- a/dev-util/editorconfig-geany/Manifest
+++ b/dev-util/editorconfig-geany/Manifest
@@ -1,3 +1,3 @@
 DIST editorconfig-geany-0.2.tar.gz 12322 BLAKE2B 2d203d3df6c6a7bb18a0b80cd33c041606b9732a83c5210fe3a66db587dedd81e1a1c2102e827980f6d85404cceed3b097f85e6c33aea81f21e9725fa7dd49e8 SHA512 cda2fd6c8ff5b7a2088840e5f2ceebb2f00f48281ff2943c4ffada30a7e70ce18ae9a84e5ac946e3affb3e5238512f829e545d31b59383722820b89c0309702d
-EBUILD editorconfig-geany-0.2.ebuild 1024 BLAKE2B 287ce27c0019f7f125e5f29534907b94b390407e94098aacdfe41ad97cb2da2201c7027973c433ee25a232ef87b2001a279f1568fd16fab8b5920b30fdd5b426 SHA512 4e58877e00d46b6ea12600bc6cf142cb013c8961cdeb1a61f91eae3103cd5f6487053f23e0173594c10e9703f75653a06b798c6403f535abdb55e4dc48ab168b
+EBUILD editorconfig-geany-0.2.ebuild 1291 BLAKE2B e61a9dd21e4a176c8590c3f057b2e7d355e3808cbed1d64a82756f2d2ce296a9668a35e8211947b3d2d9b97279072e0dc4d75241672a817338aa3c96b07acc90 SHA512 709ff122a4e34dabd17a7f72a2d3827be239059e783242fbfd5f2eb9ebb6fc8fc5c1a7293672ec24766d851f261e186321ece0ede31455fe9b6b9b4bc0397941
 MISC metadata.xml 315 BLAKE2B fded07b91d5f625cc455d1bbe742b67b3b293c30c5996e2ad33b64ff481030f8a2e488a1700906393813d0c097dc933991d88b97a74e6d70f8d89a73166598c1 SHA512 fc4b81aa5e80456a5e77c74d8f9c5bafff02c7d4514c4c566c8630724d7946202aba051c641c79f5b66346f1dda4b4804dba23fcd747cc8df747f349b09deeb0
diff --git a/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild b/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
index 2c9be9381e6e..3ec785445ba2 100644
--- a/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
+++ b/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,15 @@ src_prepare() {
 		-e "s|^\\(LDFLAGS =.*\\)|\\1 ${LDFLAGS}|" \
 		-e "s|\`pkg-config[^\`]*\`||" \
 		-i Makefile || die
+
+	# https://github.com/editorconfig/editorconfig-geany/pull/15
+	cat << "EOF" > "${T}/GeanyFunctions.patch" || die
+--- a/editorconfig-geany.c
++++ b/editorconfig-geany.c
+@@ -33 +32,0 @@
+-GeanyFunctions*      geany_functions;
+EOF
+	eapply -p1 "${T}/GeanyFunctions.patch"
 }
 
 src_install() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1b2f0123d957..f721e5da5a18 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 510bf7cdc99a..0ddde737e083 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Nov 2023 21:09:59 +0000
+Thu, 02 Nov 2023 03:09:58 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index eae5a8d8e4f4..02be2cb873c6 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 552954 BLAKE2B 671acecdf3b956e40593b940db3c3c4d25b604abd0c4cdd9a525b421aa0deed29e2aee66fa7fb224997743a298d8e522e0fa6422a7a980e3a08aa5605a60fcd3 SHA512 e4720971a7c42a5c5f28e5088e9d32a3a2120739479f770ecf817f49cff3b8e1d959bcac2d314db5770addfca412ff20e25845ec84ef98a44cf6b7797a85bcf0
-TIMESTAMP 2023-11-01T21:10:03Z
+TIMESTAMP 2023-11-02T03:10:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVCvqtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVDEwpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBv5hAAiR4x8MKKTcmbty1hWR9ruepSHKkvdTFo7eA4Aa5Jbu/NM4MvtnVAm4nf
-9wbPNIvK2QRWGAgZ7vcL+UF3frsK04Sz8tXoeDQvrEoZkcC7wsolXCjauJQAZD2B
-08QAMVikBm/Bvt8o7WDmd6OJndqtZRJ5S8Ufh9/pjDJ1QiJySCoXTOFlaMydRnH9
-iQETUHt3QfkxrY1ee8/gRoh9SeMXXkQiTI4E9Mhe7jv6Q7peUoTov+UW6ehDEOHo
-Z/qrKuAFzmNtQFtM8Ap/qgIr7wFuY0A7S38CrvZ/mTbYwz2utzSYDemeX+2NKmKC
-3FBDeVeeolvodvTV3+VDiqFsEE78XCWUyRHvpPZOLvAP5b+mwyES0yWrGuq4QY1u
-Cu4y+Qji4+hgxZO8eTybZ7Xqab/saSDSw0/iXCiBUYp7zWq5LhcNdBAxt8p96PDZ
-0K+1oUxFh3MSfaogIh8YGQuVPGwfFFUv/54Qa7WOQT3E9iyQoOCdxOV/aHAFmV7n
-Z4QSQ4nssppcpTzYU5mBt6sY8CBibt5iyfPL6nG57c7xIG8YA6rIZKwSCHmn888A
-JstghEp2JpHWHziImlOJGx3+VSelBzSkjqJET2vKQnvIgQS7HFV8NE3prIHM19+0
-JhByJfed17PMW7e4ub/e02niLN+swpjXeqpWhxv1O7NQwFGevmA=
-=k2AK
+klCs/Q/+MHXr5O42YdTvvfkdeekAWvOjVGVL5xknCDJQSxEv6NBpfqDc67X2ZW6L
+aWlBprAesgwT5nQ5QZS0QzfMQCemTgd8Pc5Wk1d3w4GE1cvvAvL4HCCSIO6XRvdM
+/I8l8sg1YH4r35O9WnuCHt0vKi0lfymQnxscLyDgS7QjCNAuQXgcVXFOHFUH4Nol
+EOfbYc5FucMeUCJ3McK3grPPSqNj6lzb+9DnubDxQ1+UL5dXhoRe5qWtgTLOya3K
+u8QpSMXGT4w3u27gm7cwOd9NJtujNl/95xLVAQJpzfnfxsMLTrF1V6u1cGuYALUK
+nY3HWQhFUKRXmAWOYBT/hO3t9nuJ+/AJsPc1ldHYcZpYQjk8YTxkvrl5u8E7JvO4
+BSzSnulEwnCbJu8GuGQyRL91f9chutOzTrCqplwL9fUl7zC6tGN81ftD495p6Ibf
+k+QVkonfLhh7H4HTLwyp1zV4J/NKrgl25HzeYOPEuHy4HpZhUix2ro3qNieHq6Qt
+xQzeIcUtTQKgmvFbuF/9madQe8WZ7PyM1ZwHdJBYQxj2WS/QVDhg5kKxB7onJqiQ
+hSsx7VQy16+6yeWdEwUDqSwiZQLckjsV+ps/bbrdbELmGSTHoh9wM2Pclu4w5HQI
+igBPhndKZSwMenBzAXuAgdAcbtR6kKecIHDxtGzfgBuCjX/goKM=
+=8ZJr
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 510bf7cdc99a..0ddde737e083 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Nov 2023 21:09:59 +0000
+Thu, 02 Nov 2023 03:09:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 561cec7fffd1..9d4095ac03a5 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 a2032261f6cd..7e21e8472587 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.0 b/metadata/md5-cache/app-containers/podman-4.7.0
deleted file mode 100644
index f72e5796b24c..000000000000
--- a/metadata/md5-cache/app-containers/podman-4.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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.0.tar.gz -> podman-4.7.0.tar.gz
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	70ec42843fec87d20fd94c67e77cdbff
-_md5_=dc2d95ecff95dddab65f00ca9327d8cb
diff --git a/metadata/md5-cache/app-containers/podman-4.7.1 b/metadata/md5-cache/app-containers/podman-4.7.2
index c4308597ecad..35e653633627 100644
--- a/metadata/md5-cache/app-containers/podman-4.7.1
+++ b/metadata/md5-cache/app-containers/podman-4.7.2
@@ -11,6 +11,6 @@ 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
+SRC_URI=https://github.com/containers/podman/archive/v4.7.2.tar.gz -> podman-4.7.2.tar.gz
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	70ec42843fec87d20fd94c67e77cdbff
-_md5_=b0c8b3c5d18853a8f73d80b782cefe60
+_md5_=738fb0e6b85db22152ecca41312b07a6
diff --git a/metadata/md5-cache/app-containers/podman-9999 b/metadata/md5-cache/app-containers/podman-9999
index 9fe9bbeec369..84199b6045d5 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	30ead54fa2e2b5f9cd4e612ffc34d0fe	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	70ec42843fec87d20fd94c67e77cdbff
-_md5_=b0c8b3c5d18853a8f73d80b782cefe60
+_md5_=738fb0e6b85db22152ecca41312b07a6
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index a7b475b197a2..3713f5d088dc 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/godot-4.1.1 b/metadata/md5-cache/dev-games/godot-4.1.3
index 3b2730cd180a..f19f725679eb 100644
--- a/metadata/md5-cache/dev-games/godot-4.1.1
+++ b/metadata/md5-cache/dev-games/godot-4.1.3
@@ -12,6 +12,6 @@ LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) t
 RDEPEND=app-arch/brotli:= app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
 RESTRICT=test
 SLOT=4
-SRC_URI=https://downloads.tuxfamily.org/godotengine/4.1.1/godot-4.1.1-stable.tar.xz https://github.com/godotengine/godot/releases/download/4.1.1-stable/godot-4.1.1-stable.tar.xz
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.1.3/godot-4.1.3-stable.tar.xz https://github.com/godotengine/godot/releases/download/4.1.3-stable/godot-4.1.3-stable.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	f6221c2f55e5e832be9919fe1711f33b	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	70ec42843fec87d20fd94c67e77cdbff	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e090f0b1ff5e2a98358c70bbc29c4c19
+_md5_=296195c2fd359c6bf1dc1a350ec95257
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20221115 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20221115
index 901f819c0486..b5c1a0b069f1 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20221115
+++ b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20221115
@@ -1,16 +1,16 @@
 BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!dev-games/openscenegraph dev-libs/glib:2 media-libs/fontconfig media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( dev-libs/imath:= >=media-libs/openexr-3:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler:=[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) x11-base/xorg-proto
+DEPEND=!dev-games/openscenegraph dev-libs/glib:2 media-libs/fontconfig media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( dev-libs/imath:= >=media-libs/openexr-3:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler:=[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) x11-base/xorg-proto
 DESCRIPTION=OpenMW-specific fork of OpenSceneGraph
 EAPI=8
 HOMEPAGE=https://github.com/OpenMW/osg
 INHERIT=cmake flag-o-matic lua-single wxwidgets
-IUSE=+collada curl dicom debug doc egl examples fltk fox gdal gif glut gstreamer +jpeg las lua openexr openinventor osgapps pdf +png +sdl sdl2 +svg tiff +truetype vnc wxwidgets xrandr +zlib +lua_single_target_lua5-1
+IUSE=+collada curl dicom debug doc egl examples fltk fox gdal gif gstreamer +jpeg las lua openexr openinventor osgapps pdf +png +sdl sdl2 +svg tiff +truetype vnc wxwidgets xrandr +zlib +lua_single_target_lua5-1
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=!dev-games/openscenegraph dev-libs/glib:2 media-libs/fontconfig media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( dev-libs/imath:= >=media-libs/openexr-3:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler:=[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
+RDEPEND=!dev-games/openscenegraph dev-libs/glib:2 media-libs/fontconfig media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( dev-libs/imath:= >=media-libs/openexr-3:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler:=[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? ( zlib ) sdl2? ( sdl )
 SLOT=0/162
 SRC_URI=https://github.com/OpenMW/osg/archive/69cfecebfb6dc703b42e8de39eed750a84a87489.tar.gz -> openscenegraph-openmw-3.6_p20221115.tar.gz
 _eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	baa4d385108ac87993edac956a916a36	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	70ec42843fec87d20fd94c67e77cdbff	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1bedde55f340570c6a711b4eb51bce8d
+_md5_=b2b8699fa987bd48c1b83c524cfd203c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 20371a540f85..6e278c775e16 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/python-rtmidi-1.5.6 b/metadata/md5-cache/dev-python/python-rtmidi-1.5.6
deleted file mode 100644
index 755cddf5a54c..000000000000
--- a/metadata/md5-cache/dev-python/python-rtmidi-1.5.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=<dev-python/cython-2.99[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig test? ( media-libs/rtmidi[alsa?,jack?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/meson-python-0.13.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] doc? ( || ( ( dev-lang/python:3.12 dev-python/sphinx[python_targets_python3_12(-)] dev-python/myst-parser[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/rtmidi[alsa?,jack?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-DESCRIPTION=Python bindings for media-libs/rtmidi implemented using Cython
-EAPI=8
-HOMEPAGE=https://pypi.org/project/python-rtmidi/ https://spotlightkid.github.io/python-rtmidi/
-INHERIT=distutils-r1 docs pypi
-IUSE=+alsa jack test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug doc
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=media-libs/rtmidi[alsa?,jack?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/python-rtmidi/python_rtmidi-1.5.6.tar.gz
-_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	docs	74475974eae5130ba3e19b31b8ae46b8	flag-o-matic	baa4d385108ac87993edac956a916a36	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	f6221c2f55e5e832be9919fe1711f33b	toolchain-funcs	70ec42843fec87d20fd94c67e77cdbff
-_md5_=3af1c6f90e87f2247392a16b1eae9115
diff --git a/metadata/md5-cache/dev-python/python-rtmidi-1.5.7 b/metadata/md5-cache/dev-python/python-rtmidi-1.5.7
index 1562c0fe5561..fa284a6052f6 100644
--- a/metadata/md5-cache/dev-python/python-rtmidi-1.5.7
+++ b/metadata/md5-cache/dev-python/python-rtmidi-1.5.7
@@ -1,4 +1,4 @@
-BDEPEND=<dev-python/cython-2.99[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig test? ( media-libs/rtmidi[alsa?,jack?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/meson-python-0.13.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] doc? ( || ( ( dev-lang/python:3.12 dev-python/sphinx[python_targets_python3_12(-)] dev-python/myst-parser[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] ) ) )
+BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig test? ( media-libs/rtmidi[alsa?,jack?] python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/meson-python-0.13.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] doc? ( || ( ( dev-lang/python:3.12 dev-python/sphinx[python_targets_python3_12(-)] dev-python/myst-parser[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] ) ) )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=media-libs/rtmidi[alsa?,jack?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 DESCRIPTION=Python bindings for media-libs/rtmidi implemented using Cython
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/python-rtmidi/python_rtmidi-1.5.7.tar.gz
 _eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	docs	74475974eae5130ba3e19b31b8ae46b8	flag-o-matic	baa4d385108ac87993edac956a916a36	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	f6221c2f55e5e832be9919fe1711f33b	toolchain-funcs	70ec42843fec87d20fd94c67e77cdbff
-_md5_=3af1c6f90e87f2247392a16b1eae9115
+_md5_=494ea2708945958670488d1c339541e0
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 1c49f8261bdf..daba58b21e53 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/editorconfig-geany-0.2 b/metadata/md5-cache/dev-util/editorconfig-geany-0.2
index dcfc0920187c..828c299fe481 100644
--- a/metadata/md5-cache/dev-util/editorconfig-geany-0.2
+++ b/metadata/md5-cache/dev-util/editorconfig-geany-0.2
@@ -11,4 +11,4 @@ RDEPEND=app-text/editorconfig-core-c:=
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-geany/archive/v0.2.tar.gz -> editorconfig-geany-0.2.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	70ec42843fec87d20fd94c67e77cdbff
-_md5_=869bf02c2dec60e4649753bbbd4f398c
+_md5_=3eaa0dcb4356326838c44f94e02ee252
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index adea8375602c..f58c5d7dc708 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.33 b/metadata/md5-cache/sys-cluster/charliecloud-0.35
index e0214799f7cf..d0b8a9367100 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.33
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.35
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=ch-image? ( python_single_target_python3_10? ( dev-python/lark[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lark[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) ) doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) net-misc/rsync )
+DEPEND=ch-image? ( python_single_target_python3_10? ( dev-python/lark[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lark[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lark[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] ) dev-vcs/git net-misc/rsync ) doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) net-misc/rsync )
 DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
 EAPI=8
 HOMEPAGE=https://hpc.github.io/charliecloud/
 INHERIT=autotools optfeature python-single-r1
-IUSE=ch-image doc python_single_target_python3_10 python_single_target_python3_11
+IUSE=ch-image doc python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) elibc_musl? ( sys-libs/argp-standalone )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) elibc_musl? ( sys-libs/argp-standalone )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/hpc/charliecloud/archive/v0.33.tar.gz -> charliecloud-0.33.tar.gz
+SRC_URI=https://github.com/hpc/charliecloud/archive/v0.35.tar.gz -> charliecloud-0.35.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	f6221c2f55e5e832be9919fe1711f33b	toolchain-funcs	70ec42843fec87d20fd94c67e77cdbff
-_md5_=d3b2e629063408c470b9412690f4b5be
+_md5_=e9b9fd07a59df8450e70285181c9b1f1
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-9999 b/metadata/md5-cache/sys-cluster/charliecloud-9999
index 8594681cd254..7fe1addc2da1 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-9999
+++ b/metadata/md5-cache/sys-cluster/charliecloud-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=ch-image? ( python_single_target_python3_10? ( dev-python/lark[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lark[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lark[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] ) ) doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) net-misc/rsync )
+DEPEND=ch-image? ( python_single_target_python3_10? ( dev-python/lark[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lark[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lark[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] ) dev-vcs/git net-misc/rsync ) doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) net-misc/rsync )
 DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
 EAPI=8
 HOMEPAGE=https://hpc.github.io/charliecloud/
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	f6221c2f55e5e832be9919fe1711f33b	toolchain-funcs	70ec42843fec87d20fd94c67e77cdbff
-_md5_=5a8a0c301dddeb8b43357f6a1731443a
+_md5_=e9b9fd07a59df8450e70285181c9b1f1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c55247f4e3b6..0d61d7e18e3a 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-11-01T21:10:03Z
+TIMESTAMP 2023-11-02T03:10:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVCvqtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVDEwpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAw3g/+KEw0zt9RVjk9pg8jtypXEQIhgJvym/TYopV/pkJPQd7hPMgZqZUiGjYj
-7bxczOIZWY3jt+7zmNdtjbnVN3seRMj3LImkAQdlKbZcHA1qBz5L1eLKnXJDHhSV
-Q5XOGOmxo1+oL4xSgfKhO8ltguMJBiTN1tOAq1aflxkbfjJ72+cxwD0CBBPPo/vi
-rgo7jBMozvT0yP3OSjlF/27bqnFvPMvcGG6R0YAHFxeQIXvk5/DOMs+Adq/ITugg
-Ymt35IqpjfxpYI7+LLrNqQv6OQiXppKvkTN/lte1XjrMEYgsM6iqkuIGUJVdkzbD
-kUbPMW01zGjtYwLafm/7VFVc3epV1gKiRuAixnqMQoXxKrsyA07vRQu/ReebGPsu
-oFVbDJMPjQbylPm5h0wL2I6RHsKRSRLpj9dNHEI/KXcEUNamg0eP69xkUbHOtMQt
-p0TFrQzn/1SwNQ37ETPb3qNGjws/cCsxy/qrU0ufBqtFmnkGLS0ENN5brvXrVHXO
-5Rzwqfc3gsMPlvvxn58DHfNa83JtUULLzqcjViccwrkXFJcopsC7Qj5W60BIFQUI
-NZufc/uR/DtV76UbGIUuw9XcnRGylBbb7b/dow2PfutgrpSHQOkGzue5B9ff8DvP
-IuT/ivp4cw7EQuYMf6TfwIISkzzI4x3eSvmrUXtQiMQVFRtCDek=
-=t/zF
+klBthRAAkm1+zlxZSXTNYHuQEsa8R4vQD9RjLpLIG6FCoFF2kuObZiJ+Y9HY/NT8
+liIO7CKRci4j7ac+iMiWVIjQrDWkJmc2LObnuBfbxFcZldRDBsBb9QbQDl4B9QCK
+aynYm958zgJ1IFwJSB6+NAG0WGf3NuUJA8GkjrgoyhEehwGDWRAyY9DQV1y/yRQl
+3yK236rZPzeDcwiOrk5JvrNmRF5klKv5D6g9pU7TJOpuwGI2mWT+QldMdCIu0vDE
+EfVdfkNHpJ8Zci3XykgRR3aHFPePpwOA9e+TMmiiJRwAffVrnOVfeytQr6bTVevv
+XpeqZNMJGjGjgIg2RskeS4ANdHQaA0oLrDXSrw6dmnAxO0ZWMlQ3uAC+AO0GDng+
+u6zNtaxJJ6vr0k1ZsGd05fDzkVJhB0ro0od+H92V1CXKNyKX+9ItMm/+kJ/uR2Zk
+KBktYGlY3cfzeJzjwU/EcFyYaFmKwxwiQHDbJ2atvqbnR+G3UOjvwZMd+4Qx8L6j
+pa87Gark/Ky+i3YmN1x5fiMzkTXuz0FWPMzciL13+t54he/nhOO3Q9oNkN/Km6VY
+L1cYa5TVcXNv0eNkO1/Rkg4/tbIolFLEQrIwKLtFqQC3zM5i0aawMQPZ2UrpmRGj
+Asoqd2dqvXBdA/T2/PMl8sT+07CxYXlBu9pXb27niEMecawPhKI=
+=dljk
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 510bf7cdc99a..0cc070874a6b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Nov 2023 21:09:59 +0000
+Thu, 02 Nov 2023 03:09:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 81a501d94a26..772825c854f9 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Nov  1 09:09:59 PM UTC 2023
+Thu Nov  2 03:09:58 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 91452ccb421d..ec6f12a6cfbc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Nov 2023 21:15:01 +0000
+Thu, 02 Nov 2023 03:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 004974fab88f..1e0d1ae1cca4 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e772875e51b9a7085f89783bfbd7452272c95550 1698872717 2023-11-01T21:05:17+00:00
+03f5ccbab4a7ea143eada03ac833948fda5a5ce6 1698890976 2023-11-02T02:09:36+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 085cbc4bbefa..6946c7917270 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1698873001 Wed 01 Nov 2023 09:10:01 PM UTC
+1698894601 Thu 02 Nov 2023 03:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 510bf7cdc99a..0ddde737e083 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Nov 2023 21:09:59 +0000
+Thu, 02 Nov 2023 03:09:58 +0000
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 67ac7d73230d..4968e8109aa9 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index f26c79f60d64..192a1d458d04 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,6 +1,6 @@
-DIST charliecloud-0.33.tar.gz 559786 BLAKE2B 46e8a488af5a27e6b52ae41118cea663cd6c01f8a24566576dbdc7bac99bd94ac50c0559da07a204c2e68ed46edb8c5a5e0bd26986b5bc960901457af632e134 SHA512 d6854873bdfca5512c54ba28ff70721442241a00cbec6d67c9693e946c6925d030773382c8ba9fc3ebcdfd52da56580e6c4e3ad7080d51d9844ad6f216f15e70
 DIST charliecloud-0.34.tar.gz 565976 BLAKE2B 0c86877bd3f17bf91d287f57b5e0844f7cb1777a499ea2bf67fb2cd5762f453239fe20afa6e4ba71acc98609c718028dd1e813a36aee881aa5c2cae79a65effd SHA512 5ede938a8015391758e0eef0b3661c12025cbac3e5153e2e5219fb4d50f8f78ac12076e4c3b658379a1521825372a0ed792a63210371cdbdad1e6631112e371d
-EBUILD charliecloud-0.33.ebuild 2417 BLAKE2B eb92fbf5ded6f827c9748263fa6d921254f7c9a2bf196ef7c69814e74e33032976d7ee5de2531f544f1d37fabacab5319aa0ea13c72cf463207c3bcba49801eb SHA512 15518863a6618c0145a08d832a180af4edac26c1cac45ae4153d27b4c4e7312927077541689f083e88ef5efaa370bce2349ddcd6f0c0df3c09f2643214865ca5
+DIST charliecloud-0.35.tar.gz 585756 BLAKE2B ade539aa3f94055f84e1b6de73d0bea7739ab764c31399f25adbff82faa62c3ee7e8745aa74bb6e997d6723d002780339f48be8d7218462d3eb95ad119a2b8a8 SHA512 40f5e5891f0df8379b637c26c3d86b66a61b48ee1e7985260b47aa4abeffc77c3690af59ae38072b53f6dd348da4574249187ba922fc7c03fb74a513524dc08a
 EBUILD charliecloud-0.34.ebuild 2402 BLAKE2B 29e3a534faeefaedd283ff344701b1402da830e75bf85395b657ec4699bb4832c805e1945ca4c1eea280326a0d58006a4fe06aa6a61342d6515d46bf58a9470e SHA512 eb3f54a7accee804b2831f3e10a3ac415abcf95985ef58d778fca68cdeddc2d08752217cdba1422d610fdd770bca8c5d393331086d2f8a30f39ce06e55a04454
-EBUILD charliecloud-9999.ebuild 2402 BLAKE2B 29e3a534faeefaedd283ff344701b1402da830e75bf85395b657ec4699bb4832c805e1945ca4c1eea280326a0d58006a4fe06aa6a61342d6515d46bf58a9470e SHA512 eb3f54a7accee804b2831f3e10a3ac415abcf95985ef58d778fca68cdeddc2d08752217cdba1422d610fdd770bca8c5d393331086d2f8a30f39ce06e55a04454
+EBUILD charliecloud-0.35.ebuild 2433 BLAKE2B 4877ba5a8569cc2cffeb43306427c75f9301dff4d69ac1d4fe4f3f3b5b9f692b22bc681f4771ca5293871f96261de4c51c4f8a163c6733def224c2d568dc7ce2 SHA512 59fddb991334061ed95efb89dc3a1d94f8544a4b29d0cb5788c8c420618aea38c393468094a367d5ab1e8225a512ce456bd612304b4867ba6e770d7fecb25c8b
+EBUILD charliecloud-9999.ebuild 2433 BLAKE2B 4877ba5a8569cc2cffeb43306427c75f9301dff4d69ac1d4fe4f3f3b5b9f692b22bc681f4771ca5293871f96261de4c51c4f8a163c6733def224c2d568dc7ce2 SHA512 59fddb991334061ed95efb89dc3a1d94f8544a4b29d0cb5788c8c420618aea38c393468094a367d5ab1e8225a512ce456bd612304b4867ba6e770d7fecb25c8b
 MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678
diff --git a/sys-cluster/charliecloud/charliecloud-0.33.ebuild b/sys-cluster/charliecloud/charliecloud-0.35.ebuild
index 7e84cbf18286..197f766fead6 100644
--- a/sys-cluster/charliecloud/charliecloud-0.33.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.35.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools optfeature python-single-r1
 
@@ -39,6 +39,8 @@ DEPEND="
 			dev-python/lark[${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 		')
+		dev-vcs/git
+		net-misc/rsync
 	)
 	doc? (
 		$(python_gen_cond_dep '
@@ -54,8 +56,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local econf_args=()
-	econf_args+=(
+	local econf_args=(
 		$(use_enable doc html)
 		$(use_enable ch-image)
 		# Libdir is used as a libexec-style destination.
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index 22a7048b73de..197f766fead6 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -39,6 +39,8 @@ DEPEND="
 			dev-python/lark[${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 		')
+		dev-vcs/git
+		net-misc/rsync
 	)
 	doc? (
 		$(python_gen_cond_dep '