diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 3671fb9..8c339e9 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,3 +1,3 @@
-DIST mongodb-5.0.30.gh.tar.gz 57312372 BLAKE2B 72b026115cf3c8b1b81857bc5bffcd5b72bae4b581a7ada598bc7bbe594f264f581212159788113c5709ab751dd8a57943a3cc9b78f0d31aeb50375fa1da2c28 SHA512 97642da12cf199fa3f17825b1eb20e4d9bc1f65c8950f54b36347af11b6964cdd2007d11b01147d0c253077ef14121de52517c1739b433b49a9cbbe2596d9d05
+DIST mongodb-5.0.31.gh.tar.gz 57334718 BLAKE2B 2594d29df996b27eff85baf923b57ffec17b47ab5bb90cdb6899178fc20b6e0c45649ad67cbc175ced76a079e13c495a6bffb39f813127aed6c4841df6c50d7e SHA512 126815f9bab0f0bd7095ce3032acc373a3f5f1e6b7c111026c4319e1a4c44b526d1f364ffeacdc982d4e2ed3073e6f2f1f24cce9f3126f90f7308a7e13b56242
 DIST mongodb-6.0.20.gh.tar.gz 87674161 BLAKE2B 6b900dec8b1ed5d62f77c87f13d7ddee4a03180f1e56f617bee436f7bf083185b3490220c27626293e31ed12c83740485cafdfe68e280a97a4eab51f4a69997c SHA512 77029dd8ae59817cb7b733124e91a9885bcc8b3c11446bc0bc7fcfaa4c8568b3de88e5eebbe4c72054c07107b5845aabe4c0e5f712f60b692c1088ce3e3e28a1
 DIST mongodb-7.0.15.gh.tar.gz 87140137 BLAKE2B e569fa4bbfdc631060071868872da57258ee1b43a6d79efb431baa33c88da405bc52f9b2b95290dbc93bc09b49cb0413b6013bdefba37a4e9acd75fccfe85e77 SHA512 79c7c3651944e37c624f8bfeb79d161b3f3f67ed8243f114f0ed943ced5f9734ef464b15a575ee6d83892728fb2b584fd943ff0dc8576c290a170c374331e6d8
diff --git a/dev-db/mongodb/mongodb-5.0.30.ebuild b/dev-db/mongodb/mongodb-5.0.31.ebuild
similarity index 95%
rename from dev-db/mongodb/mongodb-5.0.30.ebuild
rename to dev-db/mongodb/mongodb-5.0.31.ebuild
index a361c09..9e49b7e 100644
--- a/dev-db/mongodb/mongodb-5.0.30.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ 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
+inherit check-reqs eapi9-ver flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
 
 MY_PV=r${PV/_rc/-rc}
 MY_P=mongo-${MY_PV}
@@ -99,7 +99,7 @@ pkg_pretend() {
 	fi
 
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
+		if ver_replacing -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."
@@ -133,7 +133,7 @@ src_configure() {
 		VERBOSE=1
 		VARIANT_DIR=gentoo
 		MONGO_VERSION="${PV}"
-		MONGO_GIT_HASH="966efda23d779a86c76c34e1b13e561d68f2bb37"
+		MONGO_GIT_HASH="973237567d45610d6976d5d489dfaaef6a52c2f9"
 
 		--disable-warnings-as-errors
 		--force-jobs # Reapply #906897, fix #935274
diff --git a/dev-db/mongodb/mongodb-6.0.20.ebuild b/dev-db/mongodb/mongodb-6.0.20.ebuild
index 8072377..cda3255 100644
--- a/dev-db/mongodb/mongodb-6.0.20.ebuild
+++ b/dev-db/mongodb/mongodb-6.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,8 +10,8 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs flag-o-matic multiprocessing optfeature pax-utils python-any-r1 scons-utils \
-		systemd tmpfiles toolchain-funcs
+inherit check-reqs eapi9-ver flag-o-matic multiprocessing optfeature pax-utils python-any-r1 \
+		scons-utils systemd tmpfiles toolchain-funcs
 
 MY_PV=r${PV/_rc/-rc}
 MY_P=mongo-${MY_PV}
@@ -100,7 +100,7 @@ pkg_pretend() {
 	fi
 
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 5.0; then
+		if ver_replacing -lt 5.0; then
 			ewarn "To upgrade from a version earlier than the 5.0-series, you must"
 			ewarn "successively upgrade major releases until you have upgraded"
 			ewarn "to 5.0-series. Then upgrade to 6.0 series."
diff --git a/dev-db/mongodb/mongodb-7.0.15.ebuild b/dev-db/mongodb/mongodb-7.0.15.ebuild
index a9ca1a2..d0473fb 100644
--- a/dev-db/mongodb/mongodb-7.0.15.ebuild
+++ b/dev-db/mongodb/mongodb-7.0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,8 +10,8 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs flag-o-matic multiprocessing optfeature pax-utils python-any-r1 scons-utils \
-		systemd tmpfiles toolchain-funcs
+inherit check-reqs eapi9-ver flag-o-matic multiprocessing optfeature pax-utils python-any-r1 \
+		scons-utils systemd tmpfiles toolchain-funcs
 
 MY_PV=r${PV/_rc/-rc}
 MY_P=mongo-${MY_PV}
@@ -93,7 +93,7 @@ pkg_pretend() {
 	fi
 
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 6.0; then
+		if ver_replacing -lt 6.0; then
 			ewarn "To upgrade from a version earlier than the 6.0-series, you must"
 			ewarn "successively upgrade major releases until you have upgraded"
 			ewarn "to 6.0-series. Then upgrade to 7.0 series."