8 files changed, 2 insertions, 415 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index c895777b434e..d4f0600af7c4 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 05cb4e9a9c7f..1b6a32588385 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -8,7 +8,6 @@ AUX mongodb-4.4.8-gcc-13.patch 748 BLAKE2B d198b79704812aff95642a485c4a028d76c74
 AUX mongodb-4.4.8-no-compass.patch 1598 BLAKE2B af1944476041b3e5ea317f52adfced103f5b103484a4de4bb2a2d07ffcbc8b18a975f543e042c3563f1d46978496482ce7de653de8e4b943ef6ecf6e501d9f52 SHA512 0b8f5d085831180dec72ff81a37b4d537e550c8ea80d970b4af1ea6bc66b60ba957ff6506d2e21b9e5bc77b9812251dda33fae8a7c0cac4086141b5fb8ff4190
 AUX mongodb-5.0.2-boost-1.79.patch 2059 BLAKE2B 9edc95c6894e968b87b94d551a8d19017874d22f284cb00b75f4d6b090b9b0632e3dd68a4227be2ceec429635d47fc04f9aaf120544dec7d772751cf79387e37 SHA512 785367fafca3689e9441dcab64a8222156479d1ece2cde834fa44a90cfdecb9c21d6f41798b0ae0d04219d72eeced52f058e2afbf47eac184a143f3119653562
 AUX mongodb-5.0.2-fix-scons.patch 1298 BLAKE2B e2f77fa965328e61c2e5dcdbfce7317a2323aacd997c7b24cba570bd9909cad8dfd864208d2a33f3d9603c97dc1ad1218a8a83f0a1aecc129e25b54f22fba710 SHA512 a76f7eb91d63bed994f1bf15f4222f72290a4debfaf2da8cb17a593c616e7e919b9c7929fb05f47028854a7cc53264aa053198cbfdbbe182772dd8a994bc6a76
-AUX mongodb-5.0.2-glibc-2.34.patch 829 BLAKE2B c91913873bb2191d2a77fd54bc6f1f2b561dbfb05ee8507babfd8e6ce322a8cd746958328da7372b6aeb63d8830cfe518ac9c7ef24caf6a2c46219d49c8bcb15 SHA512 c12e65a2aecde49c0b1de3f4cbef086795115ec20b7aa217599a9bb1a985d0956f05a658958f949f554e809478680fafa66687a6879d0cd488d21a86df54a3de
 AUX mongodb-5.0.2-no-compass.patch 307 BLAKE2B 7386de453e7349662a1a6ae3f4735ed7519e02ff84444fd38b719d5ba5396fc9000fa83f924e385522e522de8b3330d7b4d7b1c1bcdca51d4fcce0738714b86d SHA512 07fe714a4256c13449e1e764c88d5051773aa9397228085a8d581cde91477dff2c3dc70ba801eb559af76ff19abf205d32c9510606a9bb26cebb33f68822e607
 AUX mongodb-5.0.2-skip-no-exceptions.patch 552 BLAKE2B e499cc0f0885e09b2c18ddb8ac5fb85a2bfa3c9a81d1b877b20f1fc8b1908df26faf330e386d688e6ea163e81e404170454d840539146d7d313b3dc8b7753c2e SHA512 6750b5d8427616b290d285959c0c43a28409349ae7b52153d524590a8a38c26c283acc25b82410853b5c87a4c74927cf5844580778d1ef4378cd1b035844dc97
 AUX mongodb-5.0.2-skip-reqs-check.patch 766 BLAKE2B 907dbab7e19cb159d5f7df36c725415612290889192bd1118fc445ee86d0bc58a03d4ff92d71d7c2c18e6c480fb542d8880980e3ed499ebbeae113a0b4c360d3 SHA512 29d4ff6de3a89c39ed0e3c54aa1e17fc3466ceb69dfbcfc62109ea2666ca98458b7b23ac82e4b5c9be77d5d82c69d5b213670b3a3367b13c3b8cab06cfacf4c2
@@ -18,17 +17,12 @@ AUX mongodb.conf-r3 722 BLAKE2B c053bf101f5e3e38cc68f2bcbe7fb66ed9e55da9382d2412
 AUX mongodb.confd-r3 473 BLAKE2B b9d812cfb424309e117cf5c43ba8ee7bd4dadac78d6ebd1b0d3c2cdd04d14b334c8f2e26ee24c5ede1a8fe6500bda1b39a5422a3bc1eb8a2c4a8dde038db7997 SHA512 8a90fb39ad16837458a2add25a9b9059e2b356794cfbf3cb35c9ecd6a584ee300c67b49b5261e062eaf7aac593588e2871e5cf76ab2287e58ea342436d0afe56
 AUX mongodb.initd-r3 438 BLAKE2B 9d846579cc11145ff2fc8de47d32f8f1971a44633bd197cd46d622e084d9a6eed4b277105430f126af90dd55224b5c3ee8c0a286a42922fe68cdb0b6758b9338 SHA512 480514b3285c0239421cc7b6a485cb2b7d650e507befe5281ac7aaf2094dd0afbba457df8a8bc2af3f1815b2e268ed85f1634a07e00a9b2024f79ab5e60ad040
 AUX mongodb.logrotate 205 BLAKE2B d47c211207e599d9b7f56dd9579d3a9eec577ad0efc07dd6980747b6aa59eec930b760f956dd6e180681c684e4507eb12cc88a985e506f77e0c3162ef7df4675 SHA512 8c089b1a11f494e4148fb4646265964c925bf937633a65e395ee1361d42facf837871dd493a9a2e0f480ae0e0829dbd3ed60794c5334e2716332e131fc5c2c51
-AUX mongodb.service 220 BLAKE2B ea55bb2f08066d7399e9e66f981f86395f6a177faa198c66f93ea2965ea80d61c170336a4f49fc7f1f855d3abd5e7cf3862d58a2be4a7708c0582fb4ff80b255 SHA512 177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9
 AUX mongodb.service-r1 239 BLAKE2B 4e2da934120da54034e2dd030cdd349e7fa9a22293f3d06ced3c0fa7e6b158303fa753b0bda8ff896139172f988224c6cdab98542445eff79fef122bdabd0db5 SHA512 3e268dddcdd4d78f6bb64167fb84ab3eb60b019058ecce44063d616ce6451fbf317316bb7630a5440792e9cd071674edad8e8093e07f9d07e823aca114cb1b81
 AUX mongos.conf-r2 648 BLAKE2B 420bebfafc1ef4af4b90580077a803fe30f37d63eca6509e7381ca5fcf4e5bc31e136dfc72b653b4d942fdeda058f9fcecc3dcbec9c61e2c82ac3324b9fc0f44 SHA512 5aa8ced8d83572358e008c0df45dbe72a2e9c0003c9f49514d6b91bf9b75d4fb48b189ffe00d14e5675679943a05215a9873c5c9bde9ab1be4ed4813e75714e3
 AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac2120c5018e6ec4c38b5ca22d19caea593834416c63609c69a8294227fb6b30200b41dfb29799cc5c1b4 SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb
 AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144
-DIST mongodb-src-r4.4.10.tar.gz 50636024 BLAKE2B 4b840e1a17b3fcba32d30c649d981b1e2b1d5dd98deab99be599fd5d2aa70b75ff4225542d8da095ec4cb4615f9ccccfa455129d71ed39549efde0a025d7dac4 SHA512 afc04f90e03ec64fd74bdfe2bf33aaa5fc148811af91a8437dfb81fd3a784eedd80128886db99e247ec7e09dc5a73cf34f908ab927942648e15c8f12af6b64e2
 DIST mongodb-src-r4.4.20.tar.gz 50883098 BLAKE2B 3ef2fddc4d926e372033449a14b0a71c606b6f8a9bb6767ff32c8da5a9287bf2972fae9dd83eab3ad934b1341c3edeed7708afd46f9a096819e9eca48aca40f5 SHA512 70b264b6a6f3ec16c8b0750d47026928f6250cb7a1a64d980c400ffbcc3af1b9c6301fe098d209fb8461cba4534b7c2edffdcdeb0548e627da107cc23d9a6b9c
 DIST mongodb-src-r5.0.16.tar.gz 56217257 BLAKE2B d78704c0cff4f8c1da20fdc5e083634c6dbe539136de58410ae6b86c9c5cd8044926425545ae07a7011a5febec5abb6f67773b8e539a4ac16daa1ad0ffc6a070 SHA512 d5fccd6cd3ee3f70457bd96a8eff66ca9872df37e196f1baf26993b6c080297d77504020e5554eaf3a2e92bb2730a467226b4bef47ab7fdc4de247d91c0143eb
-DIST mongodb-src-r5.0.5.tar.gz 54862473 BLAKE2B aafa693da904177a11067603f3835e2ee69abcdb206c2d36983633baa6008b861efeb590880098557e224cd7d6ac8fb23e4e9c63724d76bf90422862c99cdfe9 SHA512 318e58285c8a88fc3a4467ba8c1e6487a2aec403db02c50dbdb53df9a6671b9ea2417c8ee8212b205d642327d0d4bdd76f4bc9543c47e53115dfb981ef73f63e
-EBUILD mongodb-4.4.10-r1.ebuild 5207 BLAKE2B 6c90fd8a69ac3aae5054bd0fd13b996b24eb14e891ffec618be02eddcc94eec3edb534b83383c813bf62aab680d4e5f38760c279b0a101b47dc99a3cde6db924 SHA512 506996d9c9aec1cd427dd6304a387a157bb31b2c84e14dd8a9699e21a9e8ba1e2c4c6ff0bae064230661c49ee1b5ed2ece42a8239fff4a7af15b26a684b3a523
 EBUILD mongodb-4.4.20.ebuild 5163 BLAKE2B d16896702139ef2f6a575fabf89ac14e599702d5c789ef6996511f92ad99c5a5a7fa9de1a4baaa88eddfa97dd6c429f47e5476e752189108ae0f19e57c8f0815 SHA512 72e79072c1baef203bc5f669152b2511dbc9a1f0f877ffb640faefa2dc2f458e8999b375b58a3f6e8658de32b04270f17a93eb22c449185fd5e48cf765c5641b
 EBUILD mongodb-5.0.16-r1.ebuild 5557 BLAKE2B d982b0a03358f122c6e5788cb988eb33182432df7507439f6b65c6ce587c076e42480c6aca18904520ca2b5440333a5916c1dacbe48ebe8e55d2ef441a5e6d71 SHA512 13deaa8d209993efee1cfa1a8aeff47758691e69045324b9b7cee051c87d1c9613eceb45894fd788cbbd23e25cbb4b82b6fbce6e3718e02364b16c492f01da6f
-EBUILD mongodb-5.0.5-r2.ebuild 5305 BLAKE2B 0a9abf9575ecf1ee0cec238a4e352560e4067cf5e9ddc39fa4ea94a7c89b3dc25abcde414d27220c220044cd7c58df0f38580ec0a494e5e5d6b1ae217dd9fe21 SHA512 d2f807ce50f107706f426d0b51a6d189084779eacc8c7b5c8122b841d922ed03b337ed23beb2af49dd92f16e7d8dcb7c5e7aa477ac531413ba2346d7409a61e4
 MISC metadata.xml 919 BLAKE2B 59d8c500d1b14701caa3feef86c2377c3a2cb870bc218f8aaf993ddcf22f0b75e3b34715446900b6aaf03404387b67c5a23df3d47a64cc7b280a6bfc93f6de45 SHA512 af222eae62fc327ac2ff9f8bf2727ab8f1199a0aabb7fa9a1bd229bd817b9260fe6357ae0ca9d7184bcbc865e2a91195c84efecb430436a0bdb207910850cdda
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch b/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch
deleted file mode 100644
index b9c5241be374..000000000000
--- a/dev-db/mongodb/files/mongodb-5.0.2-glibc-2.34.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h
-index 7b15bb56..4d8f73ad 100644
---- a/src/mongo/stdx/thread.h
-+++ b/src/mongo/stdx/thread.h
-@@ -105,10 +105,7 @@ private:
-     //   .                     N   Y :      4,344 |  13,048 |     7,352
-     //   .                     Y   Y :      4,424 |  13,672 |     8,392
-     //   ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt )
--    static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10;
--
--    static constexpr std::size_t kStackSize =
--        std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ});
-+    static constexpr std::size_t kStackSize = std::size_t{64} << 10;
-     std::unique_ptr<std::byte[]> _stackStorage = std::make_unique<std::byte[]>(kStackSize);
- 
- #else   // !MONGO_HAS_SIGALTSTACK
diff --git a/dev-db/mongodb/files/mongodb.service b/dev-db/mongodb/files/mongodb.service
deleted file mode 100644
index 78d551183838..000000000000
--- a/dev-db/mongodb/files/mongodb.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=High-performance, schema-free document-oriented database
-After=network.target
-
-[Service]
-User=mongodb
-ExecStart=/usr/bin/mongod --quiet --config /etc/mongodb.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild b/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
deleted file mode 100644
index 22874d9fd185..000000000000
--- a/dev-db/mongodb/mongodb-4.4.10-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-SCONS_MIN_VERSION="3.3.1"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 -riscv"
-IUSE="debug kerberos lto ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
-	acct-user/mongodb
-	>=app-arch/snappy-1.1.3:=
-	>=dev-cpp/yaml-cpp-0.6.2:=
-	dev-libs/boost:=[nls]
-	>=dev-libs/libpcre-8.42[cxx]
-	app-arch/zstd:=
-	dev-libs/snowball-stemmer:=
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.11:=
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	ssl? (
-		>=dev-libs/openssl-1.0.1g:0=
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	debug? ( dev-util/valgrind )"
-BDEPEND="
-	$(python_gen_any_dep '
-		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
-		>=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-"
-PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-4.4.8-no-compass.patch"
-	"${FILESDIR}/${PN}-4.4.1-boost.patch"
-	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
-	"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
-	"${FILESDIR}/${PN}-4.4.10-boost-1.79.patch"
-	"${FILESDIR}/${PN}-4.4.10-no-force-lld.patch"
-	"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	if use test; then
-		python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
-		python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
-	fi
-
-	python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
-			ewarn "To upgrade from a version earlier than the 4.2-series, you must"
-			ewarn "successively upgrade major releases until you have upgraded"
-			ewarn "to 4.2-series. Then upgrade to 4.4 series."
-		else
-			ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-		--use-system-zstd
-	)
-
-	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use lto && scons_opts+=( --lto=on )
-	use ssl && scons_opts+=( --ssl )
-
-	# Needed to avoid forcing FORTIFY_SOURCE
-	# Gentoo's toolchain applies these anyway
-	scons_opts+=( --runtime-hardening=off )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	ewarn "Tests may hang with FEATURES=usersandbox"
-	"${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
-	dobin build/install/bin/{mongo,mongod,mongos}
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/mongos.initd-r3" mongos
-	newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		diropts -m0750 -o mongodb -g mongodb
-		keepdir "${x}"
-	done
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
deleted file mode 100644
index 33dcd7a556ab..000000000000
--- a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-SCONS_MIN_VERSION="3.3.1"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 -riscv"
-CPU_FLAGS="cpu_flags_x86_avx"
-IUSE="debug kerberos lto mongosh ssl +tools ${CPU_FLAGS}"
-
-# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
-# resmoke needs python packages not yet present in Gentoo
-RESTRICT="test"
-
-RDEPEND="acct-group/mongodb
-	acct-user/mongodb
-	>=app-arch/snappy-1.1.3:=
-	>=dev-cpp/yaml-cpp-0.6.2:=
-	dev-libs/boost:=[nls]
-	>=dev-libs/libpcre-8.42[cxx]
-	app-arch/zstd:=
-	dev-libs/snowball-stemmer:=
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.11:=
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	ssl? (
-		>=dev-libs/openssl-1.0.1g:0=
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	debug? ( dev-util/valgrind )"
-BDEPEND="
-	$(python_gen_any_dep '
-		>=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-"
-PDEPEND="
-	mongosh? ( app-admin/mongosh-bin )
-	tools? ( >=app-admin/mongo-tools-100 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.1-boost.patch"
-	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
-	"${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
-	"${FILESDIR}/${PN}-5.0.2-no-compass.patch"
-	"${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
-	"${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
-	"${FILESDIR}/${PN}-5.0.2-boost-1.79.patch"
-	"${FILESDIR}/${PN}-5.0.5-no-force-lld.patch"
-	"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
-	"${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
-	"${FILESDIR}/${PN}-4.4.8-gcc-13.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	# Bug 809692
-	if use amd64 && ! use cpu_flags_x86_avx; then
-		eerror "MongoDB 5.0 requires use of the AVX instruction set"
-		eerror "https://docs.mongodb.com/v5.0/administration/production-notes/"
-		die "MongoDB requires AVX"
-	fi
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
-			ewarn "To upgrade from a version earlier than the 4.4-series, you must"
-			ewarn "successively upgrade major releases until you have upgraded"
-			ewarn "to 4.4-series. Then upgrade to 5.0 series."
-		else
-			ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die
-
-	# remove compass
-	rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--jobs="$(makeopts_jobs)"
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-		--use-system-zstd
-	)
-
-	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use lto && scons_opts+=( --lto=on )
-
-	scons_opts+=( --ssl=$(usex ssl on off) )
-
-	# Needed to avoid forcing FORTIFY_SOURCE
-	# Gentoo's toolchain applies these anyway
-	scons_opts+=( --runtime-hardening=off )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die
-}
-
-src_install() {
-	dobin build/install/bin/{mongo,mongod,mongos}
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/mongos.initd-r3" mongos
-	newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		diropts -m0750 -o mongodb -g mongodb
-		keepdir "${x}"
-	done
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index f1330b83d7cb..f09a5bf3237c 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -3,6 +3,6 @@ AUX unixODBC-2.3.9-clang16.patch 9332 BLAKE2B 8037f82286ae4a94698803530647ffb6d2
 DIST unixODBC-2.3.11.tar.gz 1752585 BLAKE2B fa1502d7b83c8c10ee9d54b23281096156a3e3ec893b81acf125cd95c1de0f4ae7657ab3b4c5214a5c6a0fc9209e53cd9acdf6f99e65840e0a05366182af5600 SHA512 dddc32f90a7962e6988e1130a8093c6fb8b9ff532cad270d572250324aecbc739f45f9d8021d217313910bab25b08e69009b4f87456575535e93be1f46f5f13d
 DIST unixODBC-2.3.9.tar.gz 1676145 BLAKE2B f4078f9266cea753b6f78d234290efe95a6fa9551088a6ce352b0b6ac5391bf2724f872dcc2df0368e98befd24f995ab4eb6958a34bb080b0f6d08993991a0b7 SHA512 6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb
 EBUILD unixODBC-2.3.11.ebuild 2067 BLAKE2B 371a4c5836be221a84ecd62f36477772f8140b36eab8ed27ed2cbb4a41afa42070ab3c5b709e7680c9b3b03c6e6c901de0b36ba00b1e0d366cd0ffef3efbe829 SHA512 b1adeffa94592318f78de1f5282bd8c492b7152587458f94b8314371e91a4ff4fdc1a6025439d2884821b766415910070e96b4e416496974abeee8be7ca22094
-EBUILD unixODBC-2.3.9-r1.ebuild 1943 BLAKE2B 83e00240c3a6ad673a8c44385174adbbf22544b4d115968d12e779612d5928afca7ca92472458c6461f47eb451b91b49f5f8c8252778acf4de0821a394bb1a62 SHA512 cca8ca8b817e256ac2776f5b80cf69143ee5e621194ee211320cb33866cdd5c2b92e5513ca7e839354432432d03ab39dc33c23846616a38d006b4083aa99e95d
+EBUILD unixODBC-2.3.9-r1.ebuild 1941 BLAKE2B a83e1e194a5761c3265b5310a10cef4212d95bc1ce0bb8b42948caf55e1b817a29a325514367a8e3cd369246182127f27d7f6c9ccf3b83e63ca582a172c9bfd6 SHA512 5cb2bd787359997319859b48dc09b3c1bcc12ac4631d45c572cf63f07f3e39f35c2424c0d40259d9f332ce722e735043af8482141a594a661ff61e787fe83351
 EBUILD unixODBC-2.3.9.ebuild 1823 BLAKE2B eb9beb124808cc49f19ced7301b4ced73451ae73b1551a250e163d1081658f8531a21e6c3165067f46d88ea09914a6329dae880a7486c7a41797535b66d26f7a SHA512 75250bf39439732fca97e50ca4df4973027a0f08022e5ae5ebea51f3c436a0e3c53f66e7221a84ec2396833b991fbbd0e9b05f3b6b6cd77d5ad01a89bbfeca89
 MISC metadata.xml 479 BLAKE2B 298fd55d5c29508598a3e221f0d3b850b3f2e195885460c5a9cb9d4111d9246576d1ae0c8c586f6484931ea2b8b9a2e0127db5e4c01c456e66fb66436b62f2aa SHA512 a751b3121ce1298c50e4f66ce8c654d578be088fdf52490a4149d380053bef287736d27ef1b430fef789019cc1e0f53904cafc6c292d984a78da105a493be6a5
diff --git a/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild
index 358fe39580f4..6402d92becf6 100644
--- a/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="