Merge updates from master

58 files changed, 1044 insertions, 1433 deletions

diff --git a/app-arch/createrepo_c/Manifest b/app-arch/createrepo_c/Manifest
index c7761c91f6c3..a57a0c460da5 100644
--- a/app-arch/createrepo_c/Manifest
+++ b/app-arch/createrepo_c/Manifest
@@ -1,2 +1,3 @@
 DIST createrepo_c-1.1.2.tar.gz 638204 BLAKE2B d0fcd916709a4afaf9842ed2f7aed7dd0f179b787fa47f47273dcdeb1119ce4c6f110278bb9da5ec40ae6573c08621a55b884b02abf2bcd9955c1430dfb55743 SHA512 ffb811f28534e6bc1551602f8ba94d0e524e2ad2304dd608210588dbff7c60502660e3367e52927eba5ee03a8dd3f5eeea7f8450fc8c4e8aecced9bb349656fe
 DIST createrepo_c-1.1.3.tar.gz 638208 BLAKE2B 70ae65a7092dc9d47f6188c6bfdf70c04fc22e7179ede576f4e0050cfaa61acf736ccd70b04a88b46b459f87ff933dc30cf6eef23136673dde46dd52b7778f59 SHA512 5e7cb1312fbde6cecc54ee98c18925e28e77823240476b4f5468545a70dd07bec1d6fae65311904b068ff2e0ee824c1744f416064f5beb4af250a490269c7bbd
+DIST createrepo_c-1.1.4.tar.gz 638216 BLAKE2B 881ec936931e24b17e0af29ae830efe03e671ed0ec5d457d0f527288f3a71584fb8dc3daeea2a53ed8cfc54ba41f21115efe5ecdc30d9a7f71f29997c370cca3 SHA512 1690a1e8a133a7c0fb1d009444bedb2ee20feb08fc4788174b63e2b133fa89f612a8518ef411fbb6fcefc382575ccb497429702ab230dd10962379c7c604a434
diff --git a/app-arch/createrepo_c/createrepo_c-1.1.4.ebuild b/app-arch/createrepo_c/createrepo_c-1.1.4.ebuild
new file mode 100644
index 000000000000..afc050773235
--- /dev/null
+++ b/app-arch/createrepo_c/createrepo_c-1.1.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C implementation of createrepo"
+HOMEPAGE="https://github.com/rpm-software-management/createrepo_c"
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rpm-software-management/createrepo_c.git"
+else
+	SRC_URI="https://github.com/rpm-software-management/createrepo_c/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="legacy test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/drpm
+	app-arch/rpm
+	app-arch/xz-utils
+	app-arch/zchunk
+	app-arch/zstd:=
+	>=dev-db/sqlite-3.6.18:3
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/openssl:=
+	net-misc/curl
+	sys-apps/file
+	sys-libs/libmodulemd
+	sys-libs/zlib:=
+"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DRPM=ON
+		# As best I can tell, this enables distribution as a wheel. No need for this on gentoo!
+		-DENABLE_PYTHON=OFF
+		# Upstream enables some 'Legacy' stuff by default, let's put that behind a USE flag
+		-DENABLE_LEGACY_WEAKDEPS=$(usex legacy ON OFF)
+		-DWITH_LEGACY_HASHES=$(usex legacy ON OFF)
+		-DWITH_LIBMODULEMD=ON
+		-DWITH_ZCHUNK=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	# Tests have a magic target!
+	use test && cmake_src_compile tests
+}
+
+src_test() {
+	"${S}"_build/tests/run_tests.sh || die "Failed to run C library tests"
+}
diff --git a/app-arch/zchunk/Manifest b/app-arch/zchunk/Manifest
index 3ea0402f20fb..023691474ff1 100644
--- a/app-arch/zchunk/Manifest
+++ b/app-arch/zchunk/Manifest
@@ -1,2 +1,3 @@
 DIST zchunk-1.3.2.tar.gz 1508683 BLAKE2B a8b866d28e3a0f5bf5fda3b44f5f1d0589c374dd700d8c64497d729758e35ed1215367ff8b1114e436a776a419f1aa329f429016981f11c19fd0896db3520811 SHA512 32f3167db747a494373c03941450e8b6b7eb6ad6a07633ccb9dbd3176ffb79073746bbdf3f132605ad51de23b3b20434d1580cf7cd72e0b658263bb32359f5bc
 DIST zchunk-1.4.0.tar.gz 1513670 BLAKE2B 97fa848f7f760874f4a521153983fb8263680ff57f04644ed124aa1c81fcb36d068d489c83bd95e2e4e70efa79892a835c10be8b61a3674550e8218f23852ac4 SHA512 7fbe50182d46e4e8ce8730959cd97ea39b48dd77d034303435ce15caec194409984d435167d3b55769577d6be6c539573eddd9351f178377a756babc508d6281
+DIST zchunk-1.5.1.tar.gz 1513215 BLAKE2B 86bd98491bbc667f37c7471d2e9de92ff84126ad91aac7a70caae9a224c8b96cc048e47f4ae1e13b4216f46e269df6f22a4938335a8c9119dcb0a9c760b27ca5 SHA512 ecf37a6529e2df6f5cb4666fd8c9dbb4f4cb2ce69d5c58ab8ba614543d3c39e1b2c7b15d65659fd483efc3c599b2c17124813c9b1212559afd9d32f4bff4f72e
diff --git a/app-arch/zchunk/zchunk-1.5.1.ebuild b/app-arch/zchunk/zchunk-1.5.1.ebuild
new file mode 100644
index 000000000000..0759ca5b2011
--- /dev/null
+++ b/app-arch/zchunk/zchunk-1.5.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="File format designed for highly efficient deltas with good compression"
+HOMEPAGE="https://github.com/zchunk/zchunk"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zchunk/zchunk.git"
+else
+	SRC_URI="https://github.com/zchunk/zchunk/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/zstd:=
+	net-misc/curl
+	dev-libs/openssl:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
diff --git a/app-emacs/flycheck-guile/flycheck-guile-0.5-r100.ebuild b/app-emacs/flycheck-guile/flycheck-guile-0.5-r100.ebuild
new file mode 100644
index 000000000000..383e88c74016
--- /dev/null
+++ b/app-emacs/flycheck-guile/flycheck-guile-0.5-r100.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_COMPAT=( 2-2 3-0 )
+
+inherit elisp guile-single
+
+DESCRIPTION="Flycheck checker for the GNU Guile Scheme implementation"
+HOMEPAGE="https://github.com/flatwhatson/flycheck-guile/"
+SRC_URI="https://github.com/flatwhatson/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${GUILE_REQUIRED_USE}"
+
+BDEPEND="
+	app-emacs/flycheck
+	app-emacs/geiser-guile
+"
+RDEPEND="
+	${BDEPEND}
+	${GUILE_DEPS}
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|\"guild\"|\"${GUILD}\"|" -i "${PN}.el" || die
+}
+
+src_install() {
+	elisp_src_install
+}
diff --git a/app-emacs/geiser-guile/geiser-guile-0.28.3-r100.ebuild b/app-emacs/geiser-guile/geiser-guile-0.28.3-r100.ebuild
new file mode 100644
index 000000000000..e9dcfb14efeb
--- /dev/null
+++ b/app-emacs/geiser-guile/geiser-guile-0.28.3-r100.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_COMPAT=( 2-2 3-0 )
+
+inherit elisp guile-single
+
+DESCRIPTION="Guile's implementation of the Geiser protocols"
+HOMEPAGE="https://gitlab.com/emacs-geiser/guile/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/emacs-geiser/guile.git"
+else
+	SRC_URI="https://gitlab.com/emacs-geiser/guile/-/archive/${PV}/guile-${PV}.tar.bz2
+		-> ${P}.tar.bz2"
+	S="${WORKDIR}/guile-${PV}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+REQUIRED_USE="${GUILE_REQUIRED_USE}"
+
+BDEPEND="
+	app-emacs/geiser
+	app-emacs/transient
+"
+RDEPEND="
+	${BDEPEND}
+	${GUILE_DEPS}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-guile-scheme-src-dir.patch" )
+
+DOCS=( readme.org )
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed -e "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" \
+		-e "s|t \"guile\"|t \"${GUILE}\"|" \
+		-i "${PN}.el" || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITEETC}/${PN}"
+	doins -r src
+}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 0198bda8a776..9effb377f4bd 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,2 +1,2 @@
 DIST elasticsearch-7.17.16-no-jdk-linux-x86_64.tar.gz 168795535 BLAKE2B 642ae6f07db953e7fa783dcd63c6dcebab61e85ea600bede09e9596bf9dee2d71c43e5c28b80bd4c091d792ed3a95d10cc75ffb1074ad4b3cfceb081ed25027f SHA512 3755373f5068a08e4619b4e922bc2d3d97d41791dbf5aa84564574fc84abee9c567b16095cf0e11d48910627e3c183ff1193bf2d5ade59891bea2b3f994aa7df
-DIST elasticsearch-8.14.3-linux-x86_64.tar.gz 588481989 BLAKE2B 6c85d0ff9a7920a085adcf594d649bddbac1289a30607500e26c410c22c36ff61c389576c77079bcaf0af4ef035bfbf60b1742e694d499c99f7a93b82129a850 SHA512 5c9df84b225e4a80d6f86d84e4f9afaa23fd51c0f62827d085957447057361db3c3adc485eaec18f6c98615739babf2e5c7c4cc2a7a6351c79f384150c293391
+DIST elasticsearch-8.15.1-linux-x86_64.tar.gz 605974468 BLAKE2B 8fc2476cd2629cf8bcd9c2183763aba1880f76357809f661da9c3df6538bdf7bc21e897356cb4e35084ef1333120539e494893177fffe0aaa1e7ea4cc3f52fcd SHA512 3eced0f59446f60170b7ab3372f58bbda713e2166bb936ef0f74a027e579565b469d3f8888715638e6dfc3e98f88e1b73f7de8a6fc37be236ade4a099f9cc808
diff --git a/app-misc/elasticsearch/elasticsearch-8.14.3.ebuild b/app-misc/elasticsearch/elasticsearch-8.15.1.ebuild
index f024f4b1ce68..f024f4b1ce68 100644
--- a/app-misc/elasticsearch/elasticsearch-8.14.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-8.15.1.ebuild
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 6d641d70ec1d..4fb44c181f4b 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -24,12 +24,8 @@ DIST bash-5.2.tar.gz 10950833 BLAKE2B 51b196e710794ebad8eac28c31c93eb99ac1a7db30
 DIST bash-5.2.tar.gz.sig 95 BLAKE2B 2991b7c46ef1cdca08062f419be47fca7551f4c5d9aad8a5c1da74974f5e7707d23914b4cecf9b6c9610471146b2c49b611bb62a5d974f1c37cceb77b719851c SHA512 a161664f124f906be32709f66702f8f780e6d52e558ea45e71ec60a959c9435ff68477ee65a0a9f6c0051d5592f5044fb3b410cf3cd3ae5a8a323789b01be258
 DIST bash-5.3-alpha.tar.gz 11195025 BLAKE2B b3325f6927d7dde86aae165891317b972f0b9814e134676b3d7d3aea81ce4d4cad1a01f160e290352072153ad3568ee21701a35190ef5e6274b3c03fc95c8d42 SHA512 52354eb7cd71330192ec76fdda04bcacf758a312e89b45558db5f5345f19b0d8e54732049934958cf89786f5bd7c538d88859eb8d8d22dabfc9ec7305263d10e
 DIST bash-5.3-alpha.tar.gz.sig 95 BLAKE2B 69c8b33fe2a40498662ef084967701cff1926086785a41d6f49a3c2e2b9908499226d3d970bdb6397a74d3ccc22acb3651261ad2a421799eb135c64a78af8589 SHA512 c9587da66457e2010b0852c6dbf5949821a543b7f1b616a4d016df3477913e2a655c57289e83adeeb31b8b8afca22313e3af76cf727b93932d33a889c1263c20
-DIST bash-5.3_alpha_p20240815-cf694865de527e597de5a906643a74037341a431.tar.xz 8537760 BLAKE2B df370a28aa40af0cf108f9578c81ef53cf175e97ca9b5cdca85fa8de99df81a0f58950c20e7af0180ee420218b04b9e9f721fef42b292e6b3261aa4846cabf55 SHA512 dd552214404aa1410954f3b4e3da5e744001eda2b6a613f52177bbfdff19c094a7406673dcfc1dfa653895a221969c2edcf8362556cdeadbd0cf16a610fcd191
-DIST bash-5.3_alpha_p20240821-e327891b52513bef0b34aac625c44f8fa6811f53.tar.xz 15948864 BLAKE2B c8afaa735df7dc75bf0f3b4b07c25bf9ac0cb23d7fe10451b4a39e821d3fd308384760e16d6e2256601f938f3665a1d0cdbd2638806b63029906f2ae5d646091 SHA512 e3291af9bb0c66ba6d0c52db446e51bc628933f132ab7654eb803da02ec7bf6e57bf6d13e65a25fe1c07b518e5d68a9b3526ca4e157ba3cc3d091b3c4f1fea43
-DIST bash-5.3_alpha_p20240823-2e01122fe78eb5a42c9b9f3ca46b91f895959675.tar.xz 8541288 BLAKE2B 64cf9fc5873b925558a7aa2e2a0e76f9f326ab0606b720e8684021e540bcd992307d146b9c5d2e3f1e2779a372874753c9dd8cf7296e1013470f53e70082fc5a SHA512 3a8a5b522ac082c081ababee84cf2f1f1518c9a397a1b612de40c6e07a3104c74561eb5db75e74eec742284665667135eba5eb975d8599c3e89eeafa7383b5e4
-DIST bash-5.3_alpha_p20240828-2610d40b32301cd7256bf1dfc49c9f8bfe0dcd53.tar.xz 8542760 BLAKE2B 1d06b9837e3c1a23f34f6fcc3ec919b824d28a01301e459d602cad7bde1568299e1bc01abb94f4cade96450e19ebaf85b14a7dbb6e7d8d6b38006bae5a755c5f SHA512 eff12dbf54744c3a528cc0aa5395739221ba722b08c06b9fdf5d3f93b18b9d9e2505d91abac76510b33231075b629df7a53ddf99539e8bf3b13dc2982d532e47
-DIST bash-5.3_alpha_p20240904-5576c26da8e0ad74048203398acb493c65fd3476.tar.xz 8543756 BLAKE2B 797a97c92fcef0f675c091c4fa0d9fb12f4bed75150985ba34c99b934b77821dfa57300fc9085d606ca57fb868c3b17a04d71090eb6a0fb0f711acf5901d2fa4 SHA512 634005182fc43d752f8af6d5ff04c2612ae3e5ecd9cf5fe83a53c9242df5efead0b1c4c6142a2546566d2abd81277e7133ee8e9ca19eb179b679cf8574945403
 DIST bash-5.3_alpha_p20240911-bc5ddc8698d56df588fd99864a650b834426ccf7.tar.xz 8544476 BLAKE2B 05985908b330081485fa89f4bf89ecad01f20d94dd925dcc103b3759a35629535bee5d3ebdb8673b77b9ebba813861db2be65cabdd1b637e608cd247537f7add SHA512 c648af06d1e73eea1823d144ee269e4b05ad5d9286f18eae4cd4d2c78072e23ad2c5eaebbf619c7b9aa03e4c52676130a8a105198166a18a14d0676fce938764
+DIST bash-5.3_alpha_p20240920-8d74195d7f379c6adaee217f50d60d0c8f79ad8c.tar.xz 8545628 BLAKE2B f7afc427b7872b9e6b1b51a1ff5fb67fd855e9ef29dcde17a16bd2cdef4418d80a63e963829698b831214c3dadccf5af76b9de763066512aa602e526103a8d4f SHA512 3db3b80cafedebf8f397c36b2595ce226dbe928d1df01edaf58803bcad0fa38f95dc25e409f4ca0175e10a77a9e15d7cbc42b1527f85b0cb8e6cb6be75a9c711
 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
 DIST bash205b-003 2356 BLAKE2B b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399
@@ -444,3 +440,13 @@ DIST bash52-031 1159 BLAKE2B dac378115906e21fc754267c42e129e2374c9b63f879d1717d7
 DIST bash52-031.sig 95 BLAKE2B 50e5c0b3afb0ffc8b1863bde645316d7c7c49e8b396041ca1dcf269c50b532aaccf0c3fb5a5e64036ece9054d8ccf78f7e829ecf0fbdcf8531ba57230b129f1c SHA512 f656d8fbbe79450fbf193e5c2aebc85cfc425703495f2925aa774d5c0e742ebf523c191264673c6dd76fa6071c39d5155698687475eb634cd6553e86266f91a5
 DIST bash52-032 1529 BLAKE2B 55aab849da0fcc69ab3516d9d7ff2858b5f15cbeaddf66282f43f272b52d646c2c41c2ceef632a2ae8f13c25d92e85f49fbc6de989ed4f6ac4bb7bea7fc59a5d SHA512 9eb277d2d92b9ec49f70582e52305bc45b425b189ba2a15c51c537e07ccf9cb894c1ca44fa399b04297fe51027aff7f169f41efe2d60895ca55c421c0778ef32
 DIST bash52-032.sig 95 BLAKE2B 23a5cd003c957932d0c0192b63a5e8e7366bf939c3f54ff91b444e3729607c88677fdf4a5b435e47da4a64624b10d8696e4e950fac8fbb6932bb4c64506d1f9f SHA512 d3b08c3d0efee81a8507b530405a886259438bfc4c2ab984dbe80d30177775aacf6448a2673f0bd274fe46c938a8b8d46844d3794374bafce63f7c1d8bf4efe1
+DIST bash52-033 2131 BLAKE2B 67d334ac5874b785e449cde3b8e3999fd6fa91da847d7ee28320959ed4db5a0e841681eed29fe2fab20dbb8ff4894d86b04c44435ced1be44a67ca117bc9093e SHA512 698b7917c0c7147ef4d7a6f488013c10b4156b7f6bfda6e974010728eb17bfaae3666cfabe361afe7693fe9480bf44ec9ba6e73e7b572bf438f072d04ab6d4bc
+DIST bash52-033.sig 95 BLAKE2B 6ce2cb4678e74df48ec7e03ba95228d2d4171d5592512d55bee4c92a6b61215fb2782218ed0ca5a87f5241a71889cb32f1dbc15c50c73874f4de152996672547 SHA512 180d104cd3705cf5179ae25ad04955d9bcacd53aa2aeebf6e3b4bf9553b2e4a96ccaad776bdc92c8119911e4a834a81047bda34f33a467604745b05cb95be5bf
+DIST bash52-034 4134 BLAKE2B d01dc67397e7d85087bcbe5aeddd1a57afc3980e52f53ed8246211d8b282894650b563e52079132f8265da7370c13a76dffefd0a04bcefb7cc2a46575e50672b SHA512 4891a417a5aadb3249c89dcfce66ac6c42e06cfa9e85c86bde82472ac0b27c58e49650aa69b10333e7b7d6ff0b7f557054b72919c45359402060e0ab491a96ac
+DIST bash52-034.sig 95 BLAKE2B 124e05e5b51593a4ab56dd77d63e1bc863161eec55e99d9a954fb95e406e20a11c489dc049128a9ece6bce03124b7f6da41af925a9c188bfbcdb9f4b7a9deddc SHA512 fe32a1ce5207faa731efd25ae7ddb080852f6980f871b692dc8ff1c7671656d4bc6eaa04e435530a9ba19728686e33dd253c2843106fd15388e5c389f667d3d0
+DIST bash52-035 3413 BLAKE2B 308bdea38fc42c5267046b4e6a1603dc2379b4c92856c9c3431db655a48704887b1d405ba6a4640404d1e06ef30baffaf0fb4e55b015ec5479f9edde170e73e9 SHA512 100fa9fe308fb98b1985f915e0298d4d62ec57612af2c42acf08b86343c1f570c92890c6b6e355340ef6ed14cfd6849dbf1d3908602fcfae1369a9d52c11d4fd
+DIST bash52-035.sig 95 BLAKE2B 086e3d7250900ba783fb579481c2943092a46571eed3d848289924b3cea9a1cbdcde89282da9e123b115f849ace2bac7930b6095bb848f8c1397d41c4b176fe1 SHA512 d43f228e1515469961c99cd0cc2968ceeb6b1d59a30787a72822d37bee53546d8654deee84abfe336bfae1adffa4f24153b56abbe1a9a54c52bedfd4c3d4b4ff
+DIST bash52-036 5941 BLAKE2B e86b0df8ea7ace1ce4bc6f269de389f2f85fbe20e59e6a1e88abe99b5497382e441c9e9ba9f74c97512e0852179fc35dc781bd0da3ab664c60bed2d5d7f20f19 SHA512 d27a582172309087da82be97fab2b80163918d2c98659eda9686a13a5a567927ea260cd46daaed0cf22bde453575e94570b0545f0be9b8ea56576df8dac3b18a
+DIST bash52-036.sig 95 BLAKE2B 5ed270f26471e08456f73498ea8110c514b8e1bae424182f4cf530ab6e4f89a7946cabd3f7dd703f4f4bab7de9c73922e7be688df18df485cd64a33ce98df223 SHA512 7a26b606ab0d7a5716ac49bd1492e3b3480c3764aaec64e1763a2beda7a962c81a4066887c950b3bdd1ada317b790bd985f8b858e78c7cb8eb4a2bd02f1b07cd
+DIST bash52-037 2835 BLAKE2B 4af190d53b498d6d4403f64f39060f1add17edfe3e48b4b58a4377d1e96caa93017aed3df7011a64c99fd908af967603ed287e6bbb0380a8569d170779d8f26a SHA512 3e104dff63dabceea2f56f9dc58869d48a71ce61c3c8aff4f289d2f4a47d4325e70178d520c265a25ddb2227e0b78f08177fcd594470e5e81f4116aad282b4de
+DIST bash52-037.sig 95 BLAKE2B e3cfa89933fe59159a44dc20832406d3c42e28ac0c33674bf369a2f20a1d9de3e985bd178640f17be7b45a4fe3f96c72f80124384cec42fa263eb95586150a3b SHA512 437a69a167a4b889fca40b03eb2dcaa1ddc53db8fde924a6f8bcd21c3ac0c7629cb87b7bc08fa3b16f46b05c6a198a01dce6af3d2b761429345acd361df105dd
diff --git a/app-shells/bash/bash-5.3_alpha_p20240821.ebuild b/app-shells/bash/bash-5.2_p37.ebuild
index fbf88a2f037e..c87093ac3a12 100644
--- a/app-shells/bash/bash-5.3_alpha_p20240821.ebuild
+++ b/app-shells/bash/bash-5.2_p37.ebuild
@@ -15,22 +15,22 @@ MY_PV=${MY_PV/_/-}
 MY_P=${PN}-${MY_PV}
 MY_PATCHES=()
 
-# Determine the patchlevel.
+# Determine the patchlevel. See ftp://ftp.gnu.org/gnu/bash/bash-5.2-patches/.
 case ${PV} in
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
 	9999|*_alpha*|*_beta*|*_rc*)
 		# Set a negative patchlevel to indicate that it's a pre-release.
 		PLEVEL=-1
 		;;
-	*_p*)
-		PLEVEL=${PV##*_p}
-		;;
 	*)
 		PLEVEL=0
 esac
 
 # The version of readline this bash normally ships with. Note that we only use
 # the bundled copy of readline for pre-releases.
-READLINE_VER="8.3_alpha"
+READLINE_VER="8.2_p1"
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
@@ -39,15 +39,6 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
 	EGIT_BRANCH=devel
 	inherit git-r3
-elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-	# It can be useful to have snapshots in the pre-release period once
-	# the first alpha is out, as various bugs get reported and fixed from
-	# the alpha, and the next pre-release is usually quite far away.
-	#
-	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
-	BASH_COMMIT="e327891b52513bef0b34aac625c44f8fa6811f53"
-	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
-	S=${WORKDIR}/${PN}-${BASH_COMMIT}
 else
 	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
 
@@ -61,7 +52,6 @@ else
 	done
 
 	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
-	S=${WORKDIR}/${MY_P}
 
 	unset -v my_urls my_p my_patch_idx my_patch_ver
 fi
@@ -70,6 +60,8 @@ if [[ ${GENTOO_PATCH_VER} ]]; then
 	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
 fi
 
+S=${WORKDIR}/${MY_P}
+
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
@@ -101,6 +93,11 @@ PATCHES=(
 
 	# Patches to or from Chet, posted to the bug-bash mailing list.
 	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
+	"${FILESDIR}/${PN}-5.2_p15-random-ub.patch"
+	"${FILESDIR}/${PN}-5.2_p15-configure-clang16.patch"
+	"${FILESDIR}/${PN}-5.2_p21-wpointer-to-int.patch"
+	"${FILESDIR}/${PN}-5.2_p32-memory-leaks.patch"
+	"${FILESDIR}/${PN}-5.2_p32-read-delimiter-in-invalid-mbchar.patch"
 )
 
 pkg_setup() {
@@ -122,8 +119,6 @@ src_unpack() {
 
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
-	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-		default
 	else
 		if use verify-sig; then
 			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
@@ -179,10 +174,6 @@ src_configure() {
 	# may misbehave at runtime.
 	unset -v YACC
 
-	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
-	# upstream to Chet by email.
-	filter-lto
-
 	myconf=(
 		--disable-profiling
 
diff --git a/app-shells/bash/bash-5.3_alpha_p20240823.ebuild b/app-shells/bash/bash-5.3_alpha_p20240823.ebuild
deleted file mode 100644
index 9f651548a1b2..000000000000
--- a/app-shells/bash/bash-5.3_alpha_p20240823.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic toolchain-funcs prefix verify-sig
-
-# Uncomment if we have a patchset.
-#GENTOO_PATCH_DEV="sam"
-#GENTOO_PATCH_VER="${PV}"
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-MY_PATCHES=()
-
-# Determine the patchlevel.
-case ${PV} in
-	9999|*_alpha*|*_beta*|*_rc*)
-		# Set a negative patchlevel to indicate that it's a pre-release.
-		PLEVEL=-1
-		;;
-	*_p*)
-		PLEVEL=${PV##*_p}
-		;;
-	*)
-		PLEVEL=0
-esac
-
-# The version of readline this bash normally ships with. Note that we only use
-# the bundled copy of readline for pre-releases.
-READLINE_VER="8.3_alpha"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
-	EGIT_BRANCH=devel
-	inherit git-r3
-elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-	# It can be useful to have snapshots in the pre-release period once
-	# the first alpha is out, as various bugs get reported and fixed from
-	# the alpha, and the next pre-release is usually quite far away.
-	#
-	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
-	BASH_COMMIT="2e01122fe78eb5a42c9b9f3ca46b91f895959675"
-	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
-	S=${WORKDIR}/${PN}-${BASH_COMMIT}
-else
-	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
-
-	# bash-5.1 -> bash51
-	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
-
-	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
-		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
-		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
-		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
-	done
-
-	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
-	S=${WORKDIR}/${MY_P}
-
-	unset -v my_urls my_p my_patch_idx my_patch_ver
-fi
-
-if [[ ${GENTOO_PATCH_VER} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:=
-	nls? ( virtual/libintl )
-"
-if (( PLEVEL >= 0 )); then
-	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-	${DEPEND}
-"
-# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
-BDEPEND="
-	pgo? ( dev-util/gperf )
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-# EAPI 8 tries to append it but it doesn't exist here.
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-	# Patches to or from Chet, posted to the bug-bash mailing list.
-	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
-)
-
-pkg_setup() {
-	# bug #7332
-	if is-flag -malign-double; then
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-
-	if use bashlogger; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	local patch
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-		default
-	else
-		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
-
-			for patch in "${MY_PATCHES[@]}"; do
-				verify-sig_verify_detached "${patch}"{,.sig}
-			done
-		fi
-
-		unpack "${MY_P}.tar.gz"
-
-		if [[ ${GENTOO_PATCH_VER} ]]; then
-			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Include official patches.
-	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
-
-	# Clean out local libs so we know we use system ones w/releases. The
-	# touch utility is invoked for the benefit of config.status.
-	if (( PLEVEL >= 0 )); then
-		rm -rf lib/{readline,termcap}/* \
-		&& touch lib/{readline,termcap}/Makefile.in \
-		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
-		|| die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches, bug #407985.
-	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
-	&& touch -r . doc/* \
-	|| die
-
-	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
-	rm tests/run-jobs || die
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local -a myconf
-
-	# Upstream only test with Bison and require GNUisms like YYEOF and
-	# YYERRCODE. The former at least may be in POSIX soon:
-	# https://www.austingroupbugs.net/view.php?id=1269.
-	# configure warns on use of non-Bison but doesn't abort. The result
-	# may misbehave at runtime.
-	unset -v YACC
-
-	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
-	# upstream to Chet by email.
-	filter-lto
-
-	myconf=(
-		--disable-profiling
-
-		# Force linking with system curses ... the bundled termcap lib
-		# sucks bad compared to ncurses.  For the most part, ncurses
-		# is here because readline needs it.  But bash itself calls
-		# ncurses in one or two small places :(.
-		--with-curses
-
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h.
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	use nls || myconf+=( --disable-nls )
-
-	if (( PLEVEL >= 0 )); then
-		# Historically, we always used the builtin readline, but since
-		# our handling of SONAME upgrades has gotten much more stable
-		# in the PM (and the readline ebuild itself preserves the old
-		# libs during upgrades), linking against the system copy should
-		# be safe.
-		# Exact cached version here doesn't really matter as long as it
-		# is at least what's in the DEPEND up above.
-		export ac_cv_rl_version=${READLINE_VER%%_*}
-
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
-	else
-		# Disable the plugins logic by hand since bash doesn't provide
-		# a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
-		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
-	fi
-
-	# bug #444070
-	tc-export AR
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	local -a pgo_generate_flags pgo_use_flags
-	local flag
-
-	# -fprofile-partial-training because upstream notes the test suite isn't
-	# super comprehensive.
-	# https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
-	if use pgo; then
-		pgo_generate_flags=(
-			-fprofile-update=atomic
-			-fprofile-dir="${T}"/pgo
-			-fprofile-generate="${T}"/pgo
-		)
-		pgo_use_flags=(
-			-fprofile-use="${T}"/pgo
-			-fprofile-dir="${T}"/pgo
-		)
-		if flag=$(test-flags-CC -fprofile-partial-training); then
-			pgo_generate_flags+=( "${flag}" )
-			pgo_use_flags+=( "${flag}" )
-		fi
-	fi
-
-	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
-	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
-
-	# Build Bash and run its tests to generate profiles.
-	if (( ${#pgo_generate_flags[@]} )); then
-		# Used in test suite.
-		unset -v A
-
-		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
-
-		if tc-is-clang; then
-			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
-		fi
-
-		# Rebuild Bash using the profiling data we just generated.
-		emake clean
-		emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
-		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others
-	fi
-}
-
-src_test() {
-	# Used in test suite.
-	unset -v A
-
-	default
-}
-
-src_install() {
-	local d f
-
-	default
-
-	my_prefixify() {
-		while read -r; do
-			if [[ $REPLY == *$1* ]]; then
-				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
-			fi
-			printf '%s\n' "${REPLY}" || ! break
-		done < "$2" || die
-	}
-
-	dodir /bin
-	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
-
-	insinto /etc/bash/bashrc.d
-	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
-	newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r1.bash 10-gentoo-title.bash
-	if [[ ! ${EPREFIX} ]]; then
-		doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash
-	fi
-
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc}; do
-		newins "${FILESDIR}/dot-${f}" ".${f}"
-	done
-
-	if use plugins; then
-		exeinto "/usr/$(get_libdir)/bash"
-		set -- examples/loadables/*.o
-		doexe "${@%.o}"
-
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples; then
-		for d in examples/{functions,misc,scripts,startup-files}; do
-			exeinto "/usr/share/doc/${PF}/${d}"
-			docinto "${d}"
-			for f in "${d}"/*; do
-				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
-					doexe "${f}"
-				else
-					dodoc "${f}"
-				fi
-			done
-		done
-	fi
-
-	# Install bash_builtins.1 and rbash.1.
-	emake -C doc DESTDIR="${D}" install_builtins
-	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
-	doman "${T}"/rbash.1
-
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
-		mkdir -p -- "${EROOT}"/etc/bash \
-		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
-		|| die
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-
-	# If /bin/sh does not exist, provide it.
-	if [[ ! -e ${EROOT}/bin/sh ]]; then
-		ln -sf -- bash "${EROOT}"/bin/sh || die
-	fi
-
-	read -r old_ver <<<"${REPLACING_VERSIONS}"
-	if [[ ! $old_ver ]]; then
-		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r8"; then
-		return
-	fi
-
-	while read -r; do ewarn "${REPLY}"; done <<'EOF'
-Files under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
-
-Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
-characteristics of the operating environment, it may contain a command to set
-the terminal's window title. Those who were already choosing to customise the
-PROMPT_COMMAND variable are now advised to append their commands like so:
-
-PROMPT_COMMAND+=('custom command goes here')
-
-Gentoo no longer defaults to having bash set the window title in the case
-that the terminal is controlled by sshd(8), unless screen is launched on the
-remote side or the terminal reliably supports saving and restoring the title
-(as alacritty, foot and tmux do). Those wanting for the title to be set
-regardless may adjust ~/.bashrc - or create a custom /etc/bash/bashrc.d
-drop-in - to set PROMPT_COMMMAND like so:
-
-PROMPT_COMMAND=(genfun_set_win_title)
-
-Those who would prefer for bash never to interfere with the window title may
-now opt out of the default title setting behaviour, either with the "unset -v
-PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
-EOF
-}
diff --git a/app-shells/bash/bash-5.3_alpha_p20240828.ebuild b/app-shells/bash/bash-5.3_alpha_p20240828.ebuild
deleted file mode 100644
index e1886c3f1cd0..000000000000
--- a/app-shells/bash/bash-5.3_alpha_p20240828.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic toolchain-funcs prefix verify-sig
-
-# Uncomment if we have a patchset.
-#GENTOO_PATCH_DEV="sam"
-#GENTOO_PATCH_VER="${PV}"
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-MY_PATCHES=()
-
-# Determine the patchlevel.
-case ${PV} in
-	9999|*_alpha*|*_beta*|*_rc*)
-		# Set a negative patchlevel to indicate that it's a pre-release.
-		PLEVEL=-1
-		;;
-	*_p*)
-		PLEVEL=${PV##*_p}
-		;;
-	*)
-		PLEVEL=0
-esac
-
-# The version of readline this bash normally ships with. Note that we only use
-# the bundled copy of readline for pre-releases.
-READLINE_VER="8.3_alpha"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
-	EGIT_BRANCH=devel
-	inherit git-r3
-elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-	# It can be useful to have snapshots in the pre-release period once
-	# the first alpha is out, as various bugs get reported and fixed from
-	# the alpha, and the next pre-release is usually quite far away.
-	#
-	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
-	BASH_COMMIT="2610d40b32301cd7256bf1dfc49c9f8bfe0dcd53"
-	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
-	S=${WORKDIR}/${PN}-${BASH_COMMIT}
-else
-	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
-
-	# bash-5.1 -> bash51
-	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
-
-	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
-		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
-		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
-		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
-	done
-
-	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
-	S=${WORKDIR}/${MY_P}
-
-	unset -v my_urls my_p my_patch_idx my_patch_ver
-fi
-
-if [[ ${GENTOO_PATCH_VER} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:=
-	nls? ( virtual/libintl )
-"
-if (( PLEVEL >= 0 )); then
-	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-	${DEPEND}
-"
-# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
-BDEPEND="
-	pgo? ( dev-util/gperf )
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-# EAPI 8 tries to append it but it doesn't exist here.
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-	# Patches to or from Chet, posted to the bug-bash mailing list.
-	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
-)
-
-pkg_setup() {
-	# bug #7332
-	if is-flag -malign-double; then
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-
-	if use bashlogger; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	local patch
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-		default
-	else
-		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
-
-			for patch in "${MY_PATCHES[@]}"; do
-				verify-sig_verify_detached "${patch}"{,.sig}
-			done
-		fi
-
-		unpack "${MY_P}.tar.gz"
-
-		if [[ ${GENTOO_PATCH_VER} ]]; then
-			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Include official patches.
-	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
-
-	# Clean out local libs so we know we use system ones w/releases. The
-	# touch utility is invoked for the benefit of config.status.
-	if (( PLEVEL >= 0 )); then
-		rm -rf lib/{readline,termcap}/* \
-		&& touch lib/{readline,termcap}/Makefile.in \
-		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
-		|| die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches, bug #407985.
-	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
-	&& touch -r . doc/* \
-	|| die
-
-	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
-	rm tests/run-jobs || die
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local -a myconf
-
-	# Upstream only test with Bison and require GNUisms like YYEOF and
-	# YYERRCODE. The former at least may be in POSIX soon:
-	# https://www.austingroupbugs.net/view.php?id=1269.
-	# configure warns on use of non-Bison but doesn't abort. The result
-	# may misbehave at runtime.
-	unset -v YACC
-
-	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
-	# upstream to Chet by email.
-	filter-lto
-
-	myconf=(
-		--disable-profiling
-
-		# Force linking with system curses ... the bundled termcap lib
-		# sucks bad compared to ncurses.  For the most part, ncurses
-		# is here because readline needs it.  But bash itself calls
-		# ncurses in one or two small places :(.
-		--with-curses
-
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h.
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	use nls || myconf+=( --disable-nls )
-
-	if (( PLEVEL >= 0 )); then
-		# Historically, we always used the builtin readline, but since
-		# our handling of SONAME upgrades has gotten much more stable
-		# in the PM (and the readline ebuild itself preserves the old
-		# libs during upgrades), linking against the system copy should
-		# be safe.
-		# Exact cached version here doesn't really matter as long as it
-		# is at least what's in the DEPEND up above.
-		export ac_cv_rl_version=${READLINE_VER%%_*}
-
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
-	else
-		# Disable the plugins logic by hand since bash doesn't provide
-		# a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
-		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
-	fi
-
-	# bug #444070
-	tc-export AR
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	local -a pgo_generate_flags pgo_use_flags
-	local flag
-
-	# -fprofile-partial-training because upstream notes the test suite isn't
-	# super comprehensive.
-	# https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
-	if use pgo; then
-		pgo_generate_flags=(
-			-fprofile-update=atomic
-			-fprofile-dir="${T}"/pgo
-			-fprofile-generate="${T}"/pgo
-		)
-		pgo_use_flags=(
-			-fprofile-use="${T}"/pgo
-			-fprofile-dir="${T}"/pgo
-		)
-		if flag=$(test-flags-CC -fprofile-partial-training); then
-			pgo_generate_flags+=( "${flag}" )
-			pgo_use_flags+=( "${flag}" )
-		fi
-	fi
-
-	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
-	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
-
-	# Build Bash and run its tests to generate profiles.
-	if (( ${#pgo_generate_flags[@]} )); then
-		# Used in test suite.
-		unset -v A
-
-		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
-
-		if tc-is-clang; then
-			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
-		fi
-
-		# Rebuild Bash using the profiling data we just generated.
-		emake clean
-		emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
-		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others
-	fi
-}
-
-src_test() {
-	# Used in test suite.
-	unset -v A
-
-	default
-}
-
-src_install() {
-	local d f
-
-	default
-
-	my_prefixify() {
-		while read -r; do
-			if [[ $REPLY == *$1* ]]; then
-				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
-			fi
-			printf '%s\n' "${REPLY}" || ! break
-		done < "$2" || die
-	}
-
-	dodir /bin
-	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
-
-	insinto /etc/bash/bashrc.d
-	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
-	newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r1.bash 10-gentoo-title.bash
-	if [[ ! ${EPREFIX} ]]; then
-		doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash
-	fi
-
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc}; do
-		newins "${FILESDIR}/dot-${f}" ".${f}"
-	done
-
-	if use plugins; then
-		exeinto "/usr/$(get_libdir)/bash"
-		set -- examples/loadables/*.o
-		doexe "${@%.o}"
-
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples; then
-		for d in examples/{functions,misc,scripts,startup-files}; do
-			exeinto "/usr/share/doc/${PF}/${d}"
-			docinto "${d}"
-			for f in "${d}"/*; do
-				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
-					doexe "${f}"
-				else
-					dodoc "${f}"
-				fi
-			done
-		done
-	fi
-
-	# Install bash_builtins.1 and rbash.1.
-	emake -C doc DESTDIR="${D}" install_builtins
-	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
-	doman "${T}"/rbash.1
-
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
-		mkdir -p -- "${EROOT}"/etc/bash \
-		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
-		|| die
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-
-	# If /bin/sh does not exist, provide it.
-	if [[ ! -e ${EROOT}/bin/sh ]]; then
-		ln -sf -- bash "${EROOT}"/bin/sh || die
-	fi
-
-	read -r old_ver <<<"${REPLACING_VERSIONS}"
-	if [[ ! $old_ver ]]; then
-		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r8"; then
-		return
-	fi
-
-	while read -r; do ewarn "${REPLY}"; done <<'EOF'
-Files under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
-
-Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
-characteristics of the operating environment, it may contain a command to set
-the terminal's window title. Those who were already choosing to customise the
-PROMPT_COMMAND variable are now advised to append their commands like so:
-
-PROMPT_COMMAND+=('custom command goes here')
-
-Gentoo no longer defaults to having bash set the window title in the case
-that the terminal is controlled by sshd(8), unless screen is launched on the
-remote side or the terminal reliably supports saving and restoring the title
-(as alacritty, foot and tmux do). Those wanting for the title to be set
-regardless may adjust ~/.bashrc - or create a custom /etc/bash/bashrc.d
-drop-in - to set PROMPT_COMMMAND like so:
-
-PROMPT_COMMAND=(genfun_set_win_title)
-
-Those who would prefer for bash never to interfere with the window title may
-now opt out of the default title setting behaviour, either with the "unset -v
-PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
-EOF
-}
diff --git a/app-shells/bash/bash-5.3_alpha_p20240904.ebuild b/app-shells/bash/bash-5.3_alpha_p20240904.ebuild
deleted file mode 100644
index 1842c6cf14d9..000000000000
--- a/app-shells/bash/bash-5.3_alpha_p20240904.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic toolchain-funcs prefix verify-sig
-
-# Uncomment if we have a patchset.
-#GENTOO_PATCH_DEV="sam"
-#GENTOO_PATCH_VER="${PV}"
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-MY_PATCHES=()
-
-# Determine the patchlevel.
-case ${PV} in
-	9999|*_alpha*|*_beta*|*_rc*)
-		# Set a negative patchlevel to indicate that it's a pre-release.
-		PLEVEL=-1
-		;;
-	*_p*)
-		PLEVEL=${PV##*_p}
-		;;
-	*)
-		PLEVEL=0
-esac
-
-# The version of readline this bash normally ships with. Note that we only use
-# the bundled copy of readline for pre-releases.
-READLINE_VER="8.3_alpha"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
-	EGIT_BRANCH=devel
-	inherit git-r3
-elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-	# It can be useful to have snapshots in the pre-release period once
-	# the first alpha is out, as various bugs get reported and fixed from
-	# the alpha, and the next pre-release is usually quite far away.
-	#
-	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
-	BASH_COMMIT="5576c26da8e0ad74048203398acb493c65fd3476"
-	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
-	S=${WORKDIR}/${PN}-${BASH_COMMIT}
-else
-	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
-
-	# bash-5.1 -> bash51
-	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
-
-	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
-		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
-		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
-		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
-	done
-
-	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
-	S=${WORKDIR}/${MY_P}
-
-	unset -v my_urls my_p my_patch_idx my_patch_ver
-fi
-
-if [[ ${GENTOO_PATCH_VER} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:=
-	nls? ( virtual/libintl )
-"
-if (( PLEVEL >= 0 )); then
-	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-	${DEPEND}
-"
-# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
-BDEPEND="
-	pgo? ( dev-util/gperf )
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-# EAPI 8 tries to append it but it doesn't exist here.
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-	# Patches to or from Chet, posted to the bug-bash mailing list.
-	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
-)
-
-pkg_setup() {
-	# bug #7332
-	if is-flag -malign-double; then
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-
-	if use bashlogger; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	local patch
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-		default
-	else
-		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
-
-			for patch in "${MY_PATCHES[@]}"; do
-				verify-sig_verify_detached "${patch}"{,.sig}
-			done
-		fi
-
-		unpack "${MY_P}.tar.gz"
-
-		if [[ ${GENTOO_PATCH_VER} ]]; then
-			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Include official patches.
-	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
-
-	# Clean out local libs so we know we use system ones w/releases. The
-	# touch utility is invoked for the benefit of config.status.
-	if (( PLEVEL >= 0 )); then
-		rm -rf lib/{readline,termcap}/* \
-		&& touch lib/{readline,termcap}/Makefile.in \
-		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
-		|| die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches, bug #407985.
-	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
-	&& touch -r . doc/* \
-	|| die
-
-	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
-	rm tests/run-jobs || die
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local -a myconf
-
-	# Upstream only test with Bison and require GNUisms like YYEOF and
-	# YYERRCODE. The former at least may be in POSIX soon:
-	# https://www.austingroupbugs.net/view.php?id=1269.
-	# configure warns on use of non-Bison but doesn't abort. The result
-	# may misbehave at runtime.
-	unset -v YACC
-
-	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
-	# upstream to Chet by email.
-	filter-lto
-
-	myconf=(
-		--disable-profiling
-
-		# Force linking with system curses ... the bundled termcap lib
-		# sucks bad compared to ncurses.  For the most part, ncurses
-		# is here because readline needs it.  But bash itself calls
-		# ncurses in one or two small places :(.
-		--with-curses
-
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h.
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	use nls || myconf+=( --disable-nls )
-
-	if (( PLEVEL >= 0 )); then
-		# Historically, we always used the builtin readline, but since
-		# our handling of SONAME upgrades has gotten much more stable
-		# in the PM (and the readline ebuild itself preserves the old
-		# libs during upgrades), linking against the system copy should
-		# be safe.
-		# Exact cached version here doesn't really matter as long as it
-		# is at least what's in the DEPEND up above.
-		export ac_cv_rl_version=${READLINE_VER%%_*}
-
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
-	else
-		# Disable the plugins logic by hand since bash doesn't provide
-		# a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
-		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
-	fi
-
-	# bug #444070
-	tc-export AR
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	local -a pgo_generate_flags pgo_use_flags
-	local flag
-
-	# -fprofile-partial-training because upstream notes the test suite isn't
-	# super comprehensive.
-	# https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
-	if use pgo; then
-		pgo_generate_flags=(
-			-fprofile-update=atomic
-			-fprofile-dir="${T}"/pgo
-			-fprofile-generate="${T}"/pgo
-		)
-		pgo_use_flags=(
-			-fprofile-use="${T}"/pgo
-			-fprofile-dir="${T}"/pgo
-		)
-		if flag=$(test-flags-CC -fprofile-partial-training); then
-			pgo_generate_flags+=( "${flag}" )
-			pgo_use_flags+=( "${flag}" )
-		fi
-	fi
-
-	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
-	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
-
-	# Build Bash and run its tests to generate profiles.
-	if (( ${#pgo_generate_flags[@]} )); then
-		# Used in test suite.
-		unset -v A
-
-		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
-
-		if tc-is-clang; then
-			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
-		fi
-
-		# Rebuild Bash using the profiling data we just generated.
-		emake clean
-		emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
-		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others
-	fi
-}
-
-src_test() {
-	# Used in test suite.
-	unset -v A
-
-	default
-}
-
-src_install() {
-	local d f
-
-	default
-
-	my_prefixify() {
-		while read -r; do
-			if [[ $REPLY == *$1* ]]; then
-				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
-			fi
-			printf '%s\n' "${REPLY}" || ! break
-		done < "$2" || die
-	}
-
-	dodir /bin
-	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
-
-	insinto /etc/bash/bashrc.d
-	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
-	newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r1.bash 10-gentoo-title.bash
-	if [[ ! ${EPREFIX} ]]; then
-		doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash
-	fi
-
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc}; do
-		newins "${FILESDIR}/dot-${f}" ".${f}"
-	done
-
-	if use plugins; then
-		exeinto "/usr/$(get_libdir)/bash"
-		set -- examples/loadables/*.o
-		doexe "${@%.o}"
-
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples; then
-		for d in examples/{functions,misc,scripts,startup-files}; do
-			exeinto "/usr/share/doc/${PF}/${d}"
-			docinto "${d}"
-			for f in "${d}"/*; do
-				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
-					doexe "${f}"
-				else
-					dodoc "${f}"
-				fi
-			done
-		done
-	fi
-
-	# Install bash_builtins.1 and rbash.1.
-	emake -C doc DESTDIR="${D}" install_builtins
-	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
-	doman "${T}"/rbash.1
-
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
-		mkdir -p -- "${EROOT}"/etc/bash \
-		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
-		|| die
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-
-	# If /bin/sh does not exist, provide it.
-	if [[ ! -e ${EROOT}/bin/sh ]]; then
-		ln -sf -- bash "${EROOT}"/bin/sh || die
-	fi
-
-	read -r old_ver <<<"${REPLACING_VERSIONS}"
-	if [[ ! $old_ver ]]; then
-		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r8"; then
-		return
-	fi
-
-	while read -r; do ewarn "${REPLY}"; done <<'EOF'
-Files under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
-
-Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
-characteristics of the operating environment, it may contain a command to set
-the terminal's window title. Those who were already choosing to customise the
-PROMPT_COMMAND variable are now advised to append their commands like so:
-
-PROMPT_COMMAND+=('custom command goes here')
-
-Gentoo no longer defaults to having bash set the window title in the case
-that the terminal is controlled by sshd(8), unless screen is launched on the
-remote side or the terminal reliably supports saving and restoring the title
-(as alacritty, foot and tmux do). Those wanting for the title to be set
-regardless may adjust ~/.bashrc - or create a custom /etc/bash/bashrc.d
-drop-in - to set PROMPT_COMMMAND like so:
-
-PROMPT_COMMAND=(genfun_set_win_title)
-
-Those who would prefer for bash never to interfere with the window title may
-now opt out of the default title setting behaviour, either with the "unset -v
-PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
-EOF
-}
diff --git a/app-shells/bash/bash-5.3_alpha_p20240815.ebuild b/app-shells/bash/bash-5.3_alpha_p20240920.ebuild
index 62dd88eaa832..be89015cd24e 100644
--- a/app-shells/bash/bash-5.3_alpha_p20240815.ebuild
+++ b/app-shells/bash/bash-5.3_alpha_p20240920.ebuild
@@ -45,7 +45,7 @@ elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
 	# the alpha, and the next pre-release is usually quite far away.
 	#
 	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
-	BASH_COMMIT="cf694865de527e597de5a906643a74037341a431"
+	BASH_COMMIT="8d74195d7f379c6adaee217f50d60d0c8f79ad8c"
 	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
 	S=${WORKDIR}/${PN}-${BASH_COMMIT}
 else
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 1e1ca709506f..faee34557daa 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,2 +1,3 @@
 DIST aiohttp-3.10.5.tar.gz 7524360 BLAKE2B 57ca70d1a075ae7f9ba9b86a19be52e05e88518e28baefb16e852ce83707bfbad9cb06af08a2cea3371349649e85ab6dfb3426ee2759a4e84456041373575a8b SHA512 bb932d24b3ce332d8a232ef3bf1fbe9b0a7df9986ad5e81d5f41bc31a81204653e5250c4f0ee77a9eeb53d404bd907b12977d31caae54c00ef0146350629e750
+DIST aiohttp-3.10.6rc2.tar.gz 7538723 BLAKE2B 3de1cb0bfa9fea7ec8bcdab5a7850de700cb73b7a066ab269743e2bdbf84066e4555515dc81aea7c84be10ed9fc9487610577b44db164e49e61f19155c4dda35 SHA512 311f9ba7cafc7f1211c5c1859e235e0fd6941c32c77bfd0b74472dcf4b599b145fcc9e8496cb00300ae45c994d7b53082f39bc42a2a1cec304b92f9ce8109822
 DIST aiohttp-3.9.5.tar.gz 7504841 BLAKE2B f051ee88d45952219f72d542f1c6d0cc33c699c6c5fb5dbe3bc054ee4d0e03121b219c8c8524fd1236a8b878329b0997b8afe07d6c66074102d4a2052a8738ff SHA512 da11468a2f131275593395b052700a99cf79055a32d48327dca0f58547ad30add8cd0a375dbd831e2f06fe7a739183251e4ad69c16f3d141799bbed45a8a5dc4
diff --git a/dev-python/aiohttp/aiohttp-3.10.6_rc2.ebuild b/dev-python/aiohttp/aiohttp-3.10.6_rc2.ebuild
new file mode 100644
index 000000000000..fe5aa190cb8a
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.10.6_rc2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="HTTP client/server for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/aiohttp/
+	https://pypi.org/project/aiohttp/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.12.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<dev-python/async-timeout-5[${PYTHON_USEDEP}]
+		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		test-rust? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# increase the timeout a little
+	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
+	sed -i -e 's:-Werror::' Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	# workaround missing files
+	mkdir tools || die
+	> requirements/cython.txt || die
+	> tools/gen.py || die
+	chmod +x tools/gen.py || die
+	# force rehashing first
+	emake requirements/.hash/cython.txt.hash
+	> .update-pip || die
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+		# python_on_whales is not packaged
+		tests/autobahn/test_autobahn.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+		# broken by irrelevant deprecation warnings
+		tests/test_circular_imports.py::test_no_warnings
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			# upstream unconditionally blocks building C extensions
+			# on PyPy3 but the test suite needs an explicit switch,
+			# sigh
+			local -x AIOHTTP_NO_EXTENSIONS=1
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin
+	rm -rf aiohttp || die
+	epytest -m "not internal and not dev_mode" \
+		-p rerunfailures --reruns=5
+}
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index ee45ec812186..2a8bcfbba4d8 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1 +1,2 @@
 DIST alembic-1.13.2.tar.gz 1206463 BLAKE2B edff3a244fa37556cd656e60940d94e7df75b6c67aa4199b673851b5b06e84dbf51e53f2ac9781465aa923c0019fcd33a9c3b4da90d64f583956e390ca1f5fa7 SHA512 c4952123ba00403bb030606c736dab8d5494b01662d02914fb0d10d0c1d99b27a97cc4a800cdfa32d53870031c46e351f97815e337c71f3a0a824b6403bd75cf
+DIST alembic-1.13.3.tar.gz 1921223 BLAKE2B 25f0dcc806e5988e54f2557bce31bdb50ff94ea6a312fa71a82f61114b4b34a5a2b8003c8174d77a4e202c60d84f8cad4b61c048b093e2159a6dd85ca8f38ce1 SHA512 5661098833a4314484a6e7ea4cdea9755ed84982eaa914972265943c8b62e17d5a2831d323d238c4a37d71de61251388d43f5b419e2c592753f6bdc5fc463563
diff --git a/dev-python/alembic/alembic-1.13.3.ebuild b/dev-python/alembic/alembic-1.13.3.ebuild
new file mode 100644
index 000000000000..cf8af9852135
--- /dev/null
+++ b/dev-python/alembic/alembic-1.13.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		sys-libs/timezone-data
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# setup.cfg contains -p no:warnings in addopts which triggers
+	# datetime.utcfromtimestamp() deprecation warning as an error in py3.12
+	epytest -o addopts=
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 876f2cd9cff9..ebbc7a5d2c01 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1 +1,2 @@
+DIST bandit-1.7.10.tar.gz 4228540 BLAKE2B ca1fdbd5061a635520500cb583b739d19335920eeb89661c7ddf2a2c3a97d3c55c2ce7797be984dd1dba2613a38d6b2e0bbcfde655f9d4ed76582ce831e4b42e SHA512 c9c5d098186a23f856f4bdecdebfe863f7ddce8627608b80c62a537416d2aa91666a95c304f5cdde43ff1a41e1f6a58b30dce1042159a1ea74b8b5c9a8ee381a
 DIST bandit-1.7.9.tar.gz 4225771 BLAKE2B e5d20fbf4c3a33b092c23ad356dad39543ccea4d552687b97350cb6fe960dfa004cbef627ee0e0911da147ed53c6eb57046ec57c76858c58e772bf81e2c2b82e SHA512 a71e3eb359fad952afc9e210795fb8cc6fe178305bb837e002af83eccc4a958664b69422ba93d7d72b24089ba3142667ca17909d712db1b447e78d6f7f4c9634
diff --git a/dev-python/bandit/bandit-1.7.10.ebuild b/dev-python/bandit/bandit-1.7.10.ebuild
new file mode 100644
index 000000000000..608a06da92cc
--- /dev/null
+++ b/dev-python/bandit/bandit-1.7.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="
+	https://github.com/PyCQA/bandit/
+	https://pypi.org/project/bandit/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/GitPython-3.1.30[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
+		>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index f40d7caf80b5..03535b280e16 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -4,3 +4,4 @@ DIST cfn_lint-1.13.0.tar.gz 2378100 BLAKE2B a1fa12fe13df1f3f8c5e533c138036df7e2e
 DIST cfn_lint-1.14.0.tar.gz 2380297 BLAKE2B 27c72256f5ca353e40adb22c90754e37624962529a07e5f7b2af06a3c270d9a6b6e9721b1906de8992363dd42b66cba1b11f9e3c0f09e02cbd8c6f202f24eda8 SHA512 708d7776bc45bd5da722fda30b028f9ce403384ff584b0ea0aca47e1a002ddbb53845dc33db23ddb91e1b2984aee2a3c992c47357622c80a2954a9327c17ebae
 DIST cfn_lint-1.14.1.tar.gz 2432006 BLAKE2B c59b5767dec67dd16a31878e2d9684b2aed77e20a7b6218c4fe4905667c2f031bfdd37e9a4e91090831bcf52891508d7b19bccc65cfdb3979e556f1a6b126408 SHA512 6277700dd6e7855bb555d920ce99085463495a8dae4d23d2310033ac3261edc7f134ef09ea170cbae7d6a1c321ab90e4fd397bdff3fadc5eef0ec3da065ad787
 DIST cfn_lint-1.14.2.tar.gz 2426350 BLAKE2B 65000d9201e66159d66e374a48cee6bfb330503ecdd72ecf325a3254a31f7fd9d78714b75b69b2e3a763eb4a2cf7eabad1e459dbb2ed4a46a3a21ba8551830b6 SHA512 ea7e558b4cd6ff844f25c88cfa46daefaee34ab10a209f4adc8ccc079bc4c361d917227aa60f747e9e821336ad21a9cdde114a0ce900fdf4f4c49eb7b83635c8
+DIST cfn_lint-1.15.0.tar.gz 2340540 BLAKE2B 4cf6e93e97442691d97107144d560ece21281321cc1e694c386a4f012fcdf7b563707812f4130933bd23262c88bb045f8fb3bb7b9be2ebdc012b111f3d7df8b0 SHA512 80305de541924c7a46dfbb5f3a5a84422071726584e7e43b5be76151d6b2e012ffbaba2b448b476a5dca41f55ab5f95b8e45554158f820755495686ae1a55d3f
diff --git a/dev-python/cfn-lint/cfn-lint-1.15.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.15.0.ebuild
new file mode 100644
index 000000000000..086f03ea08df
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.15.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.91.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+		# different graphviz version?
+		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/dep-logic/Manifest b/dev-python/dep-logic/Manifest
index e36b86b2be91..25f97e521dfe 100644
--- a/dev-python/dep-logic/Manifest
+++ b/dev-python/dep-logic/Manifest
@@ -1 +1,2 @@
 DIST dep_logic-0.4.6.tar.gz 35010 BLAKE2B 180d977bcd3ffb6b0c47c4260318f5cc7457644d97352e0c7b6906a249e80ad3a1f3a5c9558cba4d10e6352babfdd1b0b3ee2ae2d3cd25cd2796ab3bc130ad8d SHA512 668b00661af185d558929f1cb0d2c281c9af112ead23866359683fe505f25a512c4acb5f6aaa0d7a855f1c5b3c6c16b8d969de043cfceeab196304b0a8452e18
+DIST dep_logic-0.4.9.tar.gz 35463 BLAKE2B 696ef391d9b793172bbfe18a692989565bb9cbf067ccfdff27e2d46331ff86a67ce8cb858e4bf64bb6ec6d37e77249991070b6386530a6fbe25cc4837b63c54a SHA512 29d5d415b65cabfbec69da900f6f23e9ba899624eabbe32712a5fd4c347233708b3d108a1df7fc26eb12c2b79b814da699dd9574abbf58e7a41ab248ee9913d4
diff --git a/dev-python/dep-logic/dep-logic-0.4.9.ebuild b/dev-python/dep-logic/dep-logic-0.4.9.ebuild
new file mode 100644
index 000000000000..cf3afe5c232e
--- /dev/null
+++ b/dev-python/dep-logic/dep-logic-0.4.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python dependency specifications supporting logical operations"
+HOMEPAGE="
+	https://github.com/pdm-project/dep-logic/
+	https://pypi.org/project/dep-logic/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-python/packaging-22[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index f1a6db3ccd8a..e5abd0a3046f 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,2 +1,3 @@
 DIST emoji-2.12.1.gh.tar.gz 503707 BLAKE2B 75d81d99cbb5c89b3f63ccee57f20e13cae4b3d1bda5257c2f5382a6595d62c1159ecd51862b96ff6a5d9c920dfece6346d1ed36c2a6567d7c50eed69c5ac373 SHA512 98c1ecf986c7623122c9d101c82f7667d30b58b6e45c834f2644bae1659c67755dd9a4f025111b74508267861ad155131d4aefb8f951566f6950e64e7d3a3d24
 DIST emoji-2.13.0.gh.tar.gz 630971 BLAKE2B b657c4ffd1a71ce7f278d000ab273d25149822959529036aadca67d19f4ebbcc4941ee7c0f973981b7ab7bd569e34a02867f016d1e7106a4f5f042b30afe4be7 SHA512 2eb41f157af1ea2bd98fcae2c3914dd5dde158ca5c2f3c5fb1353abcca51071e6ce29867921506e0c48d359056b38bf33988206e950361b83b9c92079d78e6bd
+DIST emoji-2.13.2.gh.tar.gz 631138 BLAKE2B 8a4c1c98b2053623a10b71bd0a5a41e10687917e2120107c5e01ec75125a11b4f07dd0457186cb20b53c841e2bb04168f5ccef7577afcae474349072dec9ed48 SHA512 2d2962de896986f1f3ecab9d9e56e2aa5b47062214699285ca5e83ecd10b0c1ce3158ed4e1a6e3976c4f905ae207d351f67b4ff59bde279b5c85895610116bf6
diff --git a/dev-python/emoji/emoji-2.13.2.ebuild b/dev-python/emoji/emoji-2.13.2.ebuild
new file mode 100644
index 000000000000..64f8c79c701c
--- /dev/null
+++ b/dev-python/emoji/emoji-2.13.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Emoji for Python"
+HOMEPAGE="
+	https://github.com/carpedm20/emoji/
+	https://pypi.org/project/emoji/
+"
+SRC_URI="
+	https://github.com/carpedm20/emoji/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 47f0caba5947..8a01f36aa7e0 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,2 +1,3 @@
 DIST fonttools-4.53.0.gh.tar.gz 3847778 BLAKE2B 31cf6e495441aeee90f96d6f96b9eedb581f3ee7e5e6f00f7df41547738e7da24d58b4aeac691c44961f842bbf347b32965b052d84ced88c7ade9c0d95c0367a SHA512 f810c428680c4203af3450c4a4b3a1d0f3f5e06ec7d7aac65e1e4aadf5d1e98f9efa5fed75388c8b0a0dcef5094d9b0586c0a71587360bafc91ad683a961698a
 DIST fonttools-4.53.1.gh.tar.gz 3850978 BLAKE2B 9c6b5af2cbde939b82043e29ffbbb23434c7b4bb7d7ce68385de701cdf97792bfb58b39acf5e0843493d4b4c3b70f76df6194c9a2ba4f4dfa7ec46155b9f8ce0 SHA512 c51a439c4c760bc929359ff3010612d00280ff1bfa8e6dd5248f181b3244239b82089727b4b6c81594fec57407f4c20f95497e0e26fe0e75fde30f8680022d07
+DIST fonttools-4.54.0.gh.tar.gz 3858868 BLAKE2B edd02f52d094223e4217a85cab10c7c384977cf7a57abaab401b73c8a0fc638b4e23fa44f7f3a728824bc67888ebb7136a3bdce08efe99434d0b07347fc188b6 SHA512 0840c8fbcabd5555c2226bb89cba306e5b792c4ed92063f7c32c26616d9e4b061ae782177a1181a9e891a686ca6265796e50ed7c0acf8c82051697a8618f7623
diff --git a/dev-python/fonttools/fonttools-4.54.0.ebuild b/dev-python/fonttools/fonttools-4.54.0.ebuild
new file mode 100644
index 000000000000..80efba1ec9e3
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.54.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="
+	https://github.com/fonttools/fonttools/
+	https://pypi.org/project/fonttools/
+"
+SRC_URI="
+	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+RDEPEND="
+	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local -x FONTTOOLS_WITH_CYTHON=$(usex native-extensions)
+	[[ ${EPYTHON} == pypy3 ]] && FONTTOOLS_WITH_CYTHON=0
+	distutils-r1_python_compile
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# flaky test
+		Tests/ttLib/woff2_test.py::WOFF2ReaderTest::test_get_normal_tables
+	)
+
+	if [[ ${EPYTHON} == pypy3 ]] &&
+		has_version "dev-python/pyxattr[${PYTHON_USEDEP}]" &&
+		{
+			has_version "<dev-python/pypy3_10-exe-7.3.13_p2" ||
+			has_version "<dev-python/pypy3_10-exe-bin-7.3.13_p2"
+		}
+	then
+		EPYTEST_DESELECT+=(
+			# affected by a bug in PyPy/pyxattr
+			# https://github.com/iustin/pyxattr/issues/41
+			Tests/t1Lib/t1Lib_test.py::ReadWriteTest::test_read_with_path
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest \
+		-p rerunfailures --reruns=5 \
+		Tests fontTools || die -n "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
index 2ddb522a6b5c..82f5ca607fb5 100644
--- a/dev-python/pdm/Manifest
+++ b/dev-python/pdm/Manifest
@@ -1,2 +1,2 @@
-DIST pdm-2.18.1.tar.gz 2629023 BLAKE2B e1d165d7e00c28cd9153492c66fba108b3e200226c94db77f12cfd8896eb07f76f9ecdb734dbbcdc840648ed0ad9749556efe61db98cfcc2ae395f5788f9aabf SHA512 06751e71a514b4c8ea18abade7fa216ede454a772f5fff371af776222ac288c43365d1758ad52ceaa65734de2308e96560b1ac1a9f67586d93f6c70550b0e49e
 DIST pdm-2.18.2.tar.gz 2629592 BLAKE2B 74b128e60409ab7d374a195f30124802af7cdd1c2857d2b925e633a974e752706236570b6ec1fa0827a081427156e7bb858a0385696ce6fe49ace83cd5aea95f SHA512 87187e0b036e7f462bd23e92a4dbf402a3b9ced6679acc08b0645369d463d2bb257853858f7e7bc2416749dd2233e94aaaa206febe0aa35b80e6d23dde88b7b8
+DIST pdm-2.19.1.tar.gz 2637357 BLAKE2B 55116766dc1dc45e4e1f3720cd62dc5cb8e3c662aa0d4999918a02cfaa4db24b81e9fdc363d516b2b967141829be6006bd3f9401b0074c1aa29ff9d644ef9540 SHA512 e13d0b91437478f392f1b4ae319155b79aa103082733b63288187239705706dc9bce8014cd85d5895cd9d75944dbdb8141606098ccc511644ed3d83f93abf6cd
diff --git a/dev-python/pdm/pdm-2.18.1.ebuild b/dev-python/pdm/pdm-2.19.1.ebuild
index 36ec2130f35a..603ffb324045 100644
--- a/dev-python/pdm/pdm-2.18.1.ebuild
+++ b/dev-python/pdm/pdm-2.19.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/platformdirs[${PYTHON_USEDEP}]
 	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/truststore[${PYTHON_USEDEP}]
+	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
 	dev-python/virtualenv[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-python/httpx[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index a33e877a4ed1..717b01490965 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-httpx-0.30.0.tar.gz 36959 BLAKE2B b56f0e51558ffa6eb0c0af61aa3633a8e358f8c78916d101f1de853f683136a68e195bf0af099bbc6766198b4136a560ffd2676d9a49f0b350882896a61d935a SHA512 6aadb544bda5003156bf9c0fa309a166636dc87aea033d9a48ee10e1e8b77e6cb52350930e97cab89cff7c10111d5e26d1d74cd33f0a6c54e34c3fb7ef72ea05
 DIST pytest_httpx-0.31.0.tar.gz 38352 BLAKE2B 0e9ad5507ad4fe209dcf6a0b0077b0a16eb534fd3c6abe0f2e89f8b1bdc4761274e200ed8497da6df89778cccbea4af6ed06ca5fa61ba4cdd9b1164d540a09be SHA512 4c2fa27b0a6f4677dd237bd10661e668c1cb587ffa8196c715a4a66d85c47007813687b27afc217a6e20deb2b5ab013fa4b43bfe41590b6b17fdd85370aee34a
 DIST pytest_httpx-0.31.1.tar.gz 38816 BLAKE2B 4e5fde73f0cf47a425b9ee666a13cbb01b2ef43b0c4c9c389e700000c5f3cb74b0e210da0de891b10c2e6aa51da018047ae9d61ceddac2f2be46295982e96fd7 SHA512 bd8a90bc3989a948a8420cd57a14cee7933b1207430286d8814c28c3f65238d6ea0abb43e9ed60fad06b40855d90438c62c57ba91c24590bcccd1698e0df1edf
+DIST pytest_httpx-0.31.2.tar.gz 40320 BLAKE2B 3043f407c66fa72f38c39c86a7e85cf4a177b21bbaaeee2002291111ac4345bf6a9095d2c96e15b5966c0d94f5a29fe376d72ae2876ec5a174701d8c81aadb9a SHA512 22612da764f20f6ca2d3883d687b41e36fc7336048c1106a0839c2e2fa408d1ff3b57c9776010c6ee06b05dc470a34f6c9d1fc3fd97fd4b71c810f513bddf6d7
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild
new file mode 100644
index 000000000000..eab60d4c7025
--- /dev/null
+++ b/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Send responses to HTTPX using pytest"
+HOMEPAGE="
+	https://colin-b.github.io/pytest_httpx/
+	https://github.com/Colin-b/pytest_httpx/
+	https://pypi.org/project/pytest-httpx/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
+	=dev-python/pytest-8*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index baf7b69d574e..fedd7bff4170 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1 +1,2 @@
 DIST python-bugzilla-3.2.0.tar.gz 114279 BLAKE2B 4d2d7bfaab08dfeb4334462334f23f952b43255e656b0e39eff29bfc206529062c86c79b8c83110fbc5c3970bba40663318b65e208c1b10fb04ab6fb474eeb95 SHA512 215945a0ffd637be5567839303a738a0eef74427838bf0074a5f0ab6022306f47fc0dd5c43a3513b627fb458711f38046321ee9c2c3d43b61ffc577d6dd12375
+DIST python_bugzilla-3.3.0.tar.gz 120711 BLAKE2B 29b6b52c3907606ea474b2f21276fcc6ee307aec315787fe7910e2df16b8e571cff78e133326520f28574bce8d99fc2331e6341fd8fe09edbc9d61d4dcc72856 SHA512 e8e015575a4d2540e351628099642d586bfeefdc8fca0b1e2de802db4ef91b26952d84b5073ef39a6e3a54b181b1937f169c4477267f777f5a9551a5757cacbf
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild
new file mode 100644
index 000000000000..db39feec1c3d
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
+HOMEPAGE="
+	https://github.com/python-bugzilla/python-bugzilla/
+	https://pypi.org/project/python-bugzilla/
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		sys-apps/file[python,${PYTHON_USEDEP}]
+	)
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index aeacfac51ea5..34f3f6741e2c 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,2 +1,3 @@
+DIST rapidfuzz-3.10.0.tar.gz 57942780 BLAKE2B 3510ef495e9eb2a158eae73526e109809a9487ce48a70189b0c6f25957e46a6a640f1d0f9ef00203ea7730a2ba2b1086db9faf20434c92afb6b7205057aa5c22 SHA512 88e92ac4bfd72288546265c4d3957ce672f314f08f39b11ba21c267b07797eec45315af788f94152a4704e0782df77fbcb40ef6773be7d3a5d3684fd7230e437
 DIST rapidfuzz-3.9.6.tar.gz 1596107 BLAKE2B e108320e05ad3ad194b1ffa05d5fddc5bb6080e73ecb031117a0552d5685734870af4a87503022fceadf3fd38b31e71f85c05483b4aaaf4a9d7358d4566699b4 SHA512 015b947dcfd12ee48c7592ac2fc204833d8aa8e43110dab12dff7650e9f309a9a2017d2faf89b3c154cead23d9dc7fc1658f0ff5d2f8b5b3c73b2c97f021c7d9
 DIST rapidfuzz-3.9.7.tar.gz 1596228 BLAKE2B ba3188748dc408cbe91718e890fd67e9ee47feacfe2b307038d7bfc6ffdb7aebb016b2276b591a1fd3a5c59df29a1b55a9555505f938638907d11deec9575f98 SHA512 b1a50f3ff0af044e0aa57a053bcefb3227dce2ed17b94ed82afe72203c6e858221c5ca955e4f190a0cb7adaeada11fab7fa5958e1c439deec60d96899207269d
diff --git a/dev-python/rapidfuzz/metadata.xml b/dev-python/rapidfuzz/metadata.xml
index e69b40da9b2f..b9e1b20ae859 100644
--- a/dev-python/rapidfuzz/metadata.xml
+++ b/dev-python/rapidfuzz/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">rapidfuzz/RapidFuzz</remote-id>
-		<remote-id type="pypi">rapidfuzz</remote-id>
+		<remote-id type="pypi">RapidFuzz</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.10.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.10.0.ebuild
new file mode 100644
index 000000000000..833f7d5ba897
--- /dev/null
+++ b/dev-python/rapidfuzz/rapidfuzz-3.10.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=scikit-build-core
+PYPI_PN=RapidFuzz
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
+HOMEPAGE="
+	https://github.com/rapidfuzz/RapidFuzz/
+	https://pypi.org/project/RapidFuzz/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# all these are header-only libraries
+DEPEND="
+	>=dev-cpp/taskflow-3.0.0
+	>=dev-cpp/rapidfuzz-cpp-3.0.5
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/cython-3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# sterilize build flags
+	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
+	# remove bundled libraries
+	rm -r extern || die
+	# force recythonization
+	find src -name '*.cxx' -delete || die
+	# do not require exact taskflow version
+	sed -i -e '/Taskflow/s:3\.7\.0::' CMakeLists.txt || die
+
+	distutils-r1_src_prepare
+
+	export RAPIDFUZZ_BUILD_EXTENSION=1
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index b331a1891bae..4ccc16fbe7cd 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -2,3 +2,4 @@ DIST starlette-0.38.2.gh.tar.gz 2847558 BLAKE2B 8416b4c0ab06be3cd0a90916cbd6682f
 DIST starlette-0.38.4.gh.tar.gz 2571795 BLAKE2B 0a4d9856b3bf51a2d86b36bec74df7845209d0e6b0cc5865180d498e60b5d29ad8fe32e5137c3b7f6e69ee805f3fa2544c338715401fcb6cb46aaf7030e3334f SHA512 853b1562f90f487306c23753b4ec41f099b3115bdc64a5b87d0db43374ce86a6546c4845fcd924965a7566ca7b52e6ab768825bb05830967f7f860e3a32a00ac
 DIST starlette-0.38.5.gh.tar.gz 2569392 BLAKE2B 9ad32478b22cc743652eda43ad71e6b43af9a1c9b42614a16b5fbae282cfdf5e1c092717bb35711d256e75249cf8705d3545289236c78382673f87a9706b7599 SHA512 1ad5ddb497eb35c8b0b2569218b7e98cb4bee0fc2497912aa86bc75fd894264f8d30c886313cc4aa6dd02a24197d71dbd0640b7e2f0a472ce1002ee5cba5ae59
 DIST starlette-0.38.6.gh.tar.gz 2569402 BLAKE2B 1d580aa6d5f9782a0f3688f3ebde59ca0a8ec8756b3c05c9d9465af0ead346a566b28e14d068392d6d16a55a22a0c77adc3c99f781003df0b5963cfbb0e01514 SHA512 eeaf3c573e587ce4eec8c10f879b20059e0ca4f14c04865a744a8aefe1b3f51327a291e36db312d119b9df51475584b20d8407332a8817eee5b387255d4826d6
+DIST starlette-0.39.0.gh.tar.gz 2571995 BLAKE2B 8db760feac7b61bf7e438bff20f7eeb21b91c20fffb7b72c630bbf453d1e3f0e679d7a7726d1a1e7438586da63b950679781ca76abbdaf5d21489a4cc555c896 SHA512 f75cc19178b11a10d43e4b206ab89ca053907bfe5143f46d26c8d6b5e254263fe77a8ed760dfcb3e7f229fc3dc08df8f8bc914db454f012cda81edfb7d06613c
diff --git a/dev-python/starlette/starlette-0.39.0.ebuild b/dev-python/starlette/starlette-0.39.0.ebuild
new file mode 100644
index 000000000000..366226d021e8
--- /dev/null
+++ b/dev-python/starlette/starlette-0.39.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="The little ASGI framework that shines"
+HOMEPAGE="
+	https://www.starlette.io/
+	https://github.com/encode/starlette/
+	https://pypi.org/project/starlette/
+"
+# no docs or tests in sdist, as of 0.27.0
+SRC_URI="
+	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/python-multipart-0.0.7[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+: ${EPYTEST_TIMEOUT:-180}
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# Unpackaged 'databases' dependency
+		tests/test_database.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p anyio
+}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 6649713796d3..66d552d453cc 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1 +1,2 @@
 DIST translate-3.13.3.gh.tar.gz 1172858 BLAKE2B e7b2f711faec3876fdc082aae02716beaa45934f2ad308433c20020e69b72850e0a9d32c7cb57e32b4fdc8b39334a358b8f289c83744882728616122f07cf8f7 SHA512 f435306b34a2a200df5b648a1354444ac5fd76872f36062704b2c8abf52b8b1e1d570afbcf4b50cb1d815abfcf85b05630e8bc02f908a83f3fea90188c76c6f7
+DIST translate-3.13.4.gh.tar.gz 1173494 BLAKE2B 878da77378e4ca1a27c3053812b4f70c1decc55523421daa1716f10c4af9cc1d3d1a601bf076f343eaf34c661355af84dc2d173411779942e83eb4d7e64280f9 SHA512 44d0ee7d5e8b177034385bbc323539b8d53ef7a01d2431ea9c58a8df24ccc5f55af15f245b584db225e194b796d0281dec73ed66f50f8749cf949cb0a4c95277
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild
new file mode 100644
index 000000000000..84540c3968c4
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_P=translate-${PV}
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="
+	https://github.com/translate/translate/
+	https://pypi.org/project/translate-toolkit/
+"
+SRC_URI="
+	https://github.com/translate/translate/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	>=dev-python/wcwidth-0.2.10[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+# Technically, the test suite also has undeclared dependency
+# on dev-python/snapshottest but all the tests using it are broken
+# anyway, so we skip them.
+BDEPEND="
+	test? (
+		dev-python/phply[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# unfortunately, this bad quality package doesn't support XDG_DATA_DIRS
+	# correctly, so we need to reassemble all data files in a single directory
+	local -x XDG_DATA_HOME=${T}/share
+	cp -r translate/share "${T}/" || die
+	cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+		# all tests based on snapshottest are broken and I'm too tired
+		# to figure this out
+		tests/translate/tools/test_pocount.py::test_{cases,output}
+		tests/translate/tools/test_junitmsgfmt.py::test_output
+	)
+	local EPYTEST_IGNORE=(
+		# unpackaged fluent.*
+		tests/translate/storage/test_fluent.py
+		# changes directory and does not change it back, sigh
+		tests/odf_xliff/test_odf_xliff.py
+	)
+
+	if ! use ini; then
+		EPYTEST_IGNORE+=(
+			translate/convert/test_ini2po.py
+			translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		EPYTEST_IGNORE+=(
+			translate/storage/test_subtitles.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr
+	doins -r translate/share
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index f1dda7826fcc..180ff00a6226 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,5 +1,6 @@
 DIST yarl-1.10.0.tar.gz 158919 BLAKE2B 07560c311c6388555fa10b94490576a0a5352be0ab511173624ca89322ad28281f7995593bc57c195a181dc4b80a5e3866b029294d9ce1d8ab0100036105636b SHA512 8854d04c5beb0cca37b32f0dec370ecf1309fc4f13f6c1c7da02bd9c49d9a8f95cb24218d3ba4e06bbf3d62226d69c87cf8ec8af71506a5680fb837dafba4d24
 DIST yarl-1.11.0.tar.gz 160812 BLAKE2B 166b919d866b2f224517a3b6ad728627aee2171b10f4b53e6a04ab2379cfcbe0105e5c1d4f43b5946b52164b5d8be6a6394a0468a6a9b06507603c4f65c5963b SHA512 826825786a6d8fd9de628fb89b053024e455a3c6fa8e56e059214b7bcdffc41451d8ac6b3d89fc123c3657287d3f8c3d475cb8ea733353bf9c2794b7e79b7bdf
 DIST yarl-1.11.1.tar.gz 162095 BLAKE2B 2fc83033411ec3c1d2a8c4f6b2cbd1fab977a7dd58d4e736e8ecd2a0ddc75ca6db76aa6b7b63ced7b8a29e213caa93ba2858557f1455be705926b8d6efb6e1eb SHA512 a64bc1d9fa93029c54c359cf3667cf2fc1cf35cbea69911521af998bf43852a092844fa206bf3b31d38d2c8ad14f9eab7358020350cda22826486c317abf09f1
+DIST yarl-1.12.1.tar.gz 163223 BLAKE2B 9d295c9e018ef15f3b089327006ea7dda7689b6ad7730caa716265cb5fd433fbc2bfd61f30be3f53a28a77102c4e04d87b2f4684aaaa3979f2e9f5e4dba8da6b SHA512 3e27c9ee9c416b4c8eb68ec425cba5d913cc7193670a0abb454551170c711b50b96bd6e10cee9fa34456e57d6a9d18852082a3789243b123ed22c9838b8e9eac
 DIST yarl-1.9.11.tar.gz 156445 BLAKE2B a5af473f7e66b1a4e9f97a4ff4e323764a05289e899926c803af16df985d47bdce7aa87d0099015c3a6033eb5cb942feab9879ea135076fdecdfc3d0afa98b94 SHA512 226a357f202693bece39136d595a444221fdde2727bc9d5fe392ccd80e86c6a35cee7d0882c66649b288efae5b3ae4ba1bcabb9844b8f47654c9ccbacc8337c0
 DIST yarl-1.9.4.tar.gz 141869 BLAKE2B 367eac4674bf1190122f10bb1dc1c4f3d5e4263e1d95ff2b871067d55a894dc19a6bb5a6c673d1bed28b3c5f77c704799568edfe639d50f0ae10313eb847352d SHA512 e4f7917f1625b40125abae9a13d61795f97e8cf489735e15cf58476e97c3bcf840b1452482f1f7a737fbb2bdd1dc7bbcfa882d0a7f76a27dfb3aea72b7a66c82
diff --git a/dev-python/yarl/yarl-1.12.1.ebuild b/dev-python/yarl/yarl-1.12.1.ebuild
new file mode 100644
index 000000000000..4732f61f415a
--- /dev/null
+++ b/dev-python/yarl/yarl-1.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/expandvars[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}
diff --git a/dev-scheme/guile/guile-1.8.8-r100.ebuild b/dev-scheme/guile/guile-1.8.8-r101.ebuild
index 86d059372f29..293a556c0096 100644
--- a/dev-scheme/guile/guile-1.8.8-r100.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r101.ebuild
@@ -128,10 +128,8 @@ src_install() {
 	mv "${ED}"/usr/share/aclocal/guile{,-"${SLOT}"}.m4 || die
 	find "${ED}" -name '*.la' -delete || die
 
-	# GUILE_LOAD_PATH for TeXmacs (bug #23493)
 	newenvd - "50guile${SLOT}" <<-EOF
 	PKG_CONFIG_PATH="${GUILE_PCDIR}"
-	GUILE_LOAD_PATH="${EPREFIX}/usr/share/guile/${SLOT}"
 	EOF
 
 	# necessary for registering slib, see bug 206896
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 5a6ebdcede8a..53b40163c216 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1339,9 +1339,9 @@ distutils_pep517_install() {
 					ninjaopts = shlex.split(os.environ["NINJAOPTS"])
 					print(json.dumps({
 						"build.tool-args": ninjaopts,
+						"build.verbose": True,
 						"cmake.args": ";".join(sys.argv[1:]),
 						"cmake.build-type": "${CMAKE_BUILD_TYPE}",
-						"cmake.verbose": True,
 						"install.strip": False,
 					}))
 				EOF
diff --git a/games-fps/alephone-durandal/Manifest b/games-fps/alephone-durandal/Manifest
index 8c577f82cfda..5d03c7d5ae56 100644
--- a/games-fps/alephone-durandal/Manifest
+++ b/games-fps/alephone-durandal/Manifest
@@ -1 +1 @@
-DIST Marathon2-20221126-Data.zip 29711060 BLAKE2B aa65a575a2b36a9b07cfc978042aa31485e2e02de7886fc7505ca430e7c8e67d1b2b9a77578777abe1042192f82bd7a40f2ab5e848d6a5d4a2e48ddd0b8f075d SHA512 18911eb415b66d6a698c56a6343eb319d9fd2baa34b408d26e0800f2028e0a5724556530beda8660b5f6b071e1544ad7ee59307888e6d021c7628c295e813147
+DIST Marathon2-20240822-Data.zip 28902408 BLAKE2B a0b2f0c565bd11b0f9360198f121d86ada6d76b2a49cce95a46285674135ec79ecaa267305804b167130603f791956c1aed03d653f1a0768301bdb5148b0e718 SHA512 65cedbc20b70f2ae6382e5dfa28cf1c108c4726b75d7c25fccae8e0d29a0cf60e8bdc8eca23fb4224131527e5be3dca732f4af22389ca61b2e531121969589db
diff --git a/games-fps/alephone-durandal/alephone-durandal-20221126.ebuild b/games-fps/alephone-durandal/alephone-durandal-20240822.ebuild
index ae8fcfa41812..2de0830a6d26 100644
--- a/games-fps/alephone-durandal/alephone-durandal-20221126.ebuild
+++ b/games-fps/alephone-durandal/alephone-durandal-20240822.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/games-fps/alephone-infinity/Manifest b/games-fps/alephone-infinity/Manifest
index 9c29ddec2a66..468e85562091 100644
--- a/games-fps/alephone-infinity/Manifest
+++ b/games-fps/alephone-infinity/Manifest
@@ -1 +1 @@
-DIST MarathonInfinity-20221126-Data.zip 32204262 BLAKE2B 35292a53b9983411c4fd07f4c424950c8d2588132f75153ce88d6b97fbb43638985be3f254c7ce847a5eb63fbaf757a0b3914d23fd3025bd1f4d8a7f374691da SHA512 8e245618d0ed9ed3b7944360fa2db36f9cc255510c04c8d45f168a43ed398965ebc5551b604cc59b51b37cacbf41ac0e4aaced046704cb095dadd4e585d2763a
+DIST MarathonInfinity-20240822-Data.zip 31852152 BLAKE2B 8360a413a9d813b315d7c012965fa54ad480a99dad4e44135d2e4fbab96fa92b604f9004a0a0456f86fbda070c28c7fb504ad2d7aa7347eeb53633b036320d75 SHA512 354dac31983d5ff516c8326fdb915411d06b27a6e3089c0ced9723d1604aacce2e1cb299e1c59cbea06180c388472a8757091582c232693ae7c219bd9bb774a9
diff --git a/games-fps/alephone-infinity/alephone-infinity-20221126.ebuild b/games-fps/alephone-infinity/alephone-infinity-20240822.ebuild
index 4c0369226bad..05045fa23f0e 100644
--- a/games-fps/alephone-infinity/alephone-infinity-20221126.ebuild
+++ b/games-fps/alephone-infinity/alephone-infinity-20240822.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/games-fps/alephone-marathon/Manifest b/games-fps/alephone-marathon/Manifest
index 3f12b7f3582d..6b10ce162178 100644
--- a/games-fps/alephone-marathon/Manifest
+++ b/games-fps/alephone-marathon/Manifest
@@ -1 +1 @@
-DIST Marathon-20221126-Data.zip 26473388 BLAKE2B 16e93da81942c77ff399364d16a9b554c9f13320f08604006dc991b0be24db69d2a6496c45053d2ebb66628f3f2024d09953cec565d6fbdf8d6380f593f47e3e SHA512 4fcf16fcf0a04ccb5ce1fc4dc0ef95a09ff9010f444438c830977490401d3ca01e10d1ffe429df804d3ed6683e8b8f5aed982ca5a3e3049a23b074c783fb7c61
+DIST Marathon-20240822-Data.zip 26408514 BLAKE2B 81459b2bd3718fc4b87d8da512da202912847673ee912467d7aee871bede0f5163cccdf0836f39968dd6c93cff443684491189281ad90b10ae9d0a77e45a8f24 SHA512 b834b181c9451d003c1e87844faf7c56e827e48475d66ac644f4387227ec40f5199758c3a517334c10ae3938f51ecf453d40cc99ff0a95614c5888a6b5cfb196
diff --git a/games-fps/alephone-marathon/alephone-marathon-20221126.ebuild b/games-fps/alephone-marathon/alephone-marathon-20240822.ebuild
index 020967a4d7da..a1e8facfaa52 100644
--- a/games-fps/alephone-marathon/alephone-marathon-20221126.ebuild
+++ b/games-fps/alephone-marathon/alephone-marathon-20240822.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index 24554b54aee2..b0c649044f7d 100644
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1 +1 @@
-DIST release-20230119.tar.gz 6968352 BLAKE2B 06bc87b4c2bc6a311ee90f854f7c35fb4da2862c417b192a4364dbd38cac9c0c02c4439abf07e6bc7c2d68899fae4dd938464896039943f1fa6ae5a4a644260f SHA512 d1ede53c20a24b74f5525e2e8c09fdbbb05fa0262bbd8f6c1abe6c3698cdfd1dea2436487ec8f64c79a7e1f150367e40ea48838f8a42031b45c0b1498a0e77d1
+DIST alephone-20240822.tar.gz 9146694 BLAKE2B 236997765085c520b90399cffba04a5edeb54810e1d0b614ded183addf7520727b6750971cdc70215e211547514209b01c7e515c4e1e7296e18c99c1a79ff958 SHA512 e00dbc4cb84c40c666554114c47f3eff59ab6fbc101d45d20ae510d9cc2ef1d75300f2554f61396939d030d1fd5ff237b512c6e34ae779523b93e206368bec3d
diff --git a/games-fps/alephone/alephone-20230119.ebuild b/games-fps/alephone/alephone-20240822.ebuild
index 895dc7325c50..7219486b5808 100644
--- a/games-fps/alephone/alephone-20230119.ebuild
+++ b/games-fps/alephone/alephone-20240822.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
 	EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
 else
-	SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+	SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-release-${PV}"
 	KEYWORDS="~amd64"
 fi
@@ -20,19 +20,15 @@ fi
 LICENSE="GPL-3+ BitstreamVera OFL-1.1"
 SLOT="0"
 
-IUSE="alsa curl speex upnp"
+IUSE="curl upnp"
 
-# ffmpeg covers most audio/video use cases and the package doesn't configure
-# with alternatives enabled (media-libs/smpeg)
-# When resolved upstream,
-# !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
-# with an appropriate REQUIRED_USE may be added.
-# See https://github.com/Aleph-One-Marathon/alephone/issues/85
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/zziplib:=
+	media-libs/openal
 	media-libs/libpng
 	media-libs/libsdl2
+	media-libs/libsndfile
 	media-libs/sdl2-image[png]
 	media-libs/sdl2-net
 	media-libs/sdl2-ttf
@@ -40,12 +36,7 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/opengl
 	virtual/glu
-	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
 	upnp? ( net-libs/miniupnpc )
 "
 
@@ -57,31 +48,25 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${P}-c99.patch" )
-
 src_prepare() {
 	default
 	eautoreconf
 }
 
 src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/873298
-	# https://github.com/Aleph-One-Marathon/alephone/issues/475
+	# With LTO enabled enemies are not visible
+	# https://github.com/Aleph-One-Marathon/alephone/issues/518
 	filter-lto
-
-	econf \
-		--enable-lua \
-		--enable-opengl \
-		--with-ffmpeg \
-		--without-mad \
-		--without-smpeg \
-		--without-sndfile \
-		--without-vorbis \
-		$(use_with alsa) \
-		$(use_with curl) \
-		$(use_with speex) \
+	my_econf=(
+		--enable-opengl
+		--with-ffmpeg
+		--with-png
+		--with-sdl_image
+		--with-zzip
+		$(use_with curl)
 		$(use_with upnp miniupnpc)
+	)
+	econf "${my_econf[@]}"
 }
 
 src_compile() {
diff --git a/games-fps/alephone/alephone-99999999.ebuild b/games-fps/alephone/alephone-99999999.ebuild
index 9a32dc2729ec..7219486b5808 100644
--- a/games-fps/alephone/alephone-99999999.ebuild
+++ b/games-fps/alephone/alephone-99999999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
 	EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
 else
-	SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+	SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-release-${PV}"
 	KEYWORDS="~amd64"
 fi
@@ -20,19 +20,15 @@ fi
 LICENSE="GPL-3+ BitstreamVera OFL-1.1"
 SLOT="0"
 
-IUSE="alsa curl speex upnp"
+IUSE="curl upnp"
 
-# ffmpeg covers most audio/video use cases and the package doesn't configure
-# with alternatives enabled (media-libs/smpeg)
-# When resolved upstream,
-# !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
-# with an appropriate REQUIRED_USE may be added.
-# See https://github.com/Aleph-One-Marathon/alephone/issues/85
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/zziplib:=
+	media-libs/openal
 	media-libs/libpng
 	media-libs/libsdl2
+	media-libs/libsndfile
 	media-libs/sdl2-image[png]
 	media-libs/sdl2-net
 	media-libs/sdl2-ttf
@@ -40,12 +36,7 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/opengl
 	virtual/glu
-	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
 	upnp? ( net-libs/miniupnpc )
 "
 
@@ -63,23 +54,19 @@ src_prepare() {
 }
 
 src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/873298
-	# https://github.com/Aleph-One-Marathon/alephone/issues/475
+	# With LTO enabled enemies are not visible
+	# https://github.com/Aleph-One-Marathon/alephone/issues/518
 	filter-lto
-
-	econf \
-		--enable-lua \
-		--enable-opengl \
-		--with-ffmpeg \
-		--without-mad \
-		--without-smpeg \
-		--without-sndfile \
-		--without-vorbis \
-		$(use_with alsa) \
-		$(use_with curl) \
-		$(use_with speex) \
+	my_econf=(
+		--enable-opengl
+		--with-ffmpeg
+		--with-png
+		--with-sdl_image
+		--with-zzip
+		$(use_with curl)
 		$(use_with upnp miniupnpc)
+	)
+	econf "${my_econf[@]}"
 }
 
 src_compile() {
diff --git a/games-fps/alephone/files/alephone-20230119-c99.patch b/games-fps/alephone/files/alephone-20230119-c99.patch
deleted file mode 100644
index 7340e1fb2be0..000000000000
--- a/games-fps/alephone/files/alephone-20230119-c99.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://github.com/Aleph-One-Marathon/alephone/pull/405
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Sat, 28 Jan 2023 18:03:51 +1100
-Subject: [PATCH] use designated initialisers for SDL_ffmpegCodec*
-
-These were failing to compile under clang16 as the old `audioBitrate`
-was being jammed into `crf`, causing an incompatible integer conversion.
---- a/Source_Files/FFmpeg/SDL_ffmpeg.c
-+++ b/Source_Files/FFmpeg/SDL_ffmpeg.c
-@@ -155,41 +155,55 @@ int SDL_ffmpegDecodeVideoFrame( SDL_ffmpegFile*, AVPacket*, SDL_ffmpegVideoFrame
- 
- const SDL_ffmpegCodec SDL_ffmpegCodecAUTO =
- {
--    -1,
--    720, 576,
--    1, 25,
--    6000000,
--    -1, -1,
--    -1,
--    2, 48000,
--    192000,
--    -1, -1
-+    .videoCodecID=-1,
-+    .width=720,
-+    .height=576,
-+    .framerateNum=1,
-+    .framerateDen=25,
-+    .videoBitrate=6000000,
-+    .videoMinRate=-1,
-+    .videoMaxRate=-1,
-+    .audioCodecID=-1,
-+    .channels=2,
-+    .sampleRate=48000,
-+    .cpuCount=-1,
-+    .audioQuality=-1
- };
- 
-+
-+
- const SDL_ffmpegCodec SDL_ffmpegCodecPALDVD =
- {
--    AV_CODEC_ID_MPEG2VIDEO,
--    720, 576,
--    1, 25,
--    6000000,
--    -1, -1,
--    AV_CODEC_ID_MP2,
--    2, 48000,
--    192000,
--    -1, -1
-+    .videoCodecID=AV_CODEC_ID_MPEG2VIDEO,
-+    .width=720,
-+    .height=576,
-+    .framerateNum=1,
-+    .framerateDen=25,
-+    .videoBitrate=6000000,
-+    .videoMinRate=-1,
-+    .videoMaxRate=-1,
-+    .audioCodecID=AV_CODEC_ID_MP2,
-+    .channels=2,
-+    .sampleRate=48000,
-+    .cpuCount=-1,
-+    .audioQuality=-1
- };
- 
- const SDL_ffmpegCodec SDL_ffmpegCodecPALDV =
- {
--    AV_CODEC_ID_DVVIDEO,
--    720, 576,
--    1, 25,
--    6553600,
--    -1, -1,
--    AV_CODEC_ID_DVAUDIO,
--    2, 48000,
--    256000,
--    -1, -1
-+    .videoCodecID=AV_CODEC_ID_DVVIDEO,
-+    .width=720,
-+    .height=576,
-+    .framerateNum=1,
-+    .framerateDen=25,
-+    .videoBitrate=6553600,
-+    .videoMinRate=-1,
-+    .videoMaxRate=-1,
-+    .audioCodecID=AV_CODEC_ID_DVAUDIO,
-+    .channels=2,
-+    .sampleRate=48000,
-+    .cpuCount=-1,
-+    .audioQuality=-1
- };
- 
- SDL_ffmpegFile* SDL_ffmpegCreateFile()
-@@ -2269,4 +2283,4 @@ int SDL_ffmpegDecodeVideoFrame( SDL_ffmpegFile* file, AVPacket *pack, SDL_ffmpeg
- /**
- \endcond
- */
--#endif
-\ No newline at end of file
-+#endif
diff --git a/media-fonts/intel-one-mono/Manifest b/media-fonts/intel-one-mono/Manifest
index 9677aa3c7951..83cfac8fb373 100644
--- a/media-fonts/intel-one-mono/Manifest
+++ b/media-fonts/intel-one-mono/Manifest
@@ -1 +1 @@
-DIST intel-one-mono-1.3.0.zip 354382 BLAKE2B 1216f8075fd4137696c65f33a208d70f611991c4663228b151dd54ad0b43dff54073bb944c2390bcd04ab15d7894c552089f867aefd7500faeb23c8e2bb87fc7 SHA512 3c4803d103cd3f6dcd5caf020cefc665812f4859151e399c6e7a547f8c62e1e6b0ab5c9b4a79e20fbb41af435d01ced955db8429d4174b429de79782a8d6503a
+DIST intel-one-mono-1.4.0.zip 563509 BLAKE2B 28f574e8b629d0fa78ba51f26efa1fcfb908d6c0399a6d86f359dcb9d1d5d5c7cb62ab05ea208b69cc2d4bceb2f0aba87c5114a6c97f46751d95bf047023cdfe SHA512 a6dcaae5eccf78c841061d20f999a24b4f70adf9e1c60cb8c9be1d5fe3a3782e042b17250c4c65f8ececa5f5fc24a0db91d4460ef9da943774811e2cd7dac729
diff --git a/media-fonts/intel-one-mono/intel-one-mono-1.3.0.ebuild b/media-fonts/intel-one-mono/intel-one-mono-1.4.0.ebuild
index 5d69d2d80dbe..3f6c50fa297a 100644
--- a/media-fonts/intel-one-mono/intel-one-mono-1.3.0.ebuild
+++ b/media-fonts/intel-one-mono/intel-one-mono-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/profiles/package.mask b/profiles/package.mask
index 67f664d6bc6b..5552619278de 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -270,6 +270,8 @@ dev-scheme/guile:1.8
 dev-scheme/guile:2.2
 dev-scheme/guile:3.0
 >=dev-build/make-4.4.1-r100
+>=app-emacs/flycheck-guile-0.5-r100
+>=app-emacs/geiser-guile-0.28.3-r100
 >=app-office/gnucash-5.8-r100
 >=app-office/texmacs-2.1-r100
 >=app-shells/gash-0.3.0-r100