diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 0c866cb..41cd0b6 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,2 +1,3 @@
+DIST mongo-c-driver-1.30.6-docs.tar.xz 124168 BLAKE2B 6e3133c9292935515d7200c7603e8f64d092e50e89501a0395d21a9a61af86090add8baefad54a2d25e949432a196544a9af8e4cb4bbcedb24e54b332a7c6c08 SHA512 91373a13164dbf001ed7bee7455e8187f2ac7912764df3248b21223aab5ebe88130a835b23d58edf54175ad8e19c8045ae3ad6e93348596196a0895a79cf8c1a
 DIST mongo-c-driver-1.30.6.tar.gz 7450898 BLAKE2B 242b41fed6b6155a35cb8dc696bc3d246795aa6df77c1eb2eb58c16fb603e4bcdf01cbdb382f68c4ede6d29186cdbfebab3fc2262b2acd9994f5f936ffc30e34 SHA512 3351fd784dcaffd5454776e8ebceae444634b525aee63ff1dc45a9f3a0ab5d0716b990bb0a0960553f76e64ac99b18a1f88bec6225f5c000aee48688b9d6d318
 DIST mongo-c-driver-1.30.6.tar.gz.asc 833 BLAKE2B 2be5cf50f50191a74213ae7400793a1b4142f34b4ef589eff90db4a00b66514142fe510e941b50a304590cdec256f6020ff1f8220c25fd6aa63444e24dd817c0 SHA512 93c82ba89d4d6741fbe3a92dc36c6fbca16c6d43e2d874261ab38736cba4d74dc6d20808aae9afe8e112a04a65ae27f301d45c9ab9d585f258e7f7fea219f1a1
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.30.6-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.30.6-r1.ebuild
index f0203cd..2e1153e 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.30.6-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.30.6-r1.ebuild
@@ -3,18 +3,17 @@
 
 EAPI=8
 
-# Generate using slight deviation from https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs as a template
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-: ${MONGOCDRIVER_DOCS_PREBUILT:=0}
+: ${MONGO_C_DRIVER_DOCS_PREBUILT:=0}
 
 # Default to generating man pages if no prebuilt; overridden later
-MONGOCDRIVER_DOCS_USEFLAG="+man"
+MONGO_C_DRIVER_DOCS_USEFLAG="+man"
 
-PYTHON_COMPAT=( python3_{11..14} pypy3_11 )
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mongo-c-driver.asc
 
-inherit cmake dot-a python-any-r1 verify-sig
+inherit cmake dot-a verify-sig
 
 DESCRIPTION="Client library written in C for MongoDB"
 HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
@@ -25,15 +24,15 @@ SRC_URI="
 	)
 "
 
-if [[ ${MONGOCDRIVER_DOCS_PREBUILT} == 1 ]] ; then
+if [[ ${MONGO_C_DRIVER_DOCS_PREBUILT} == 1 ]] ; then
 	SRC_URI+=" !man? ( https://people.znc.in/~dessa/gentoo/distfiles/${CATEGORY}/${PN}/${PN}-${PV}-docs.tar.xz )"
-	MONGOCDRIVER_DOCS_USEFLAG="man"
+	MONGO_C_DRIVER_DOCS_USEFLAG="man"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
-IUSE="debug examples ${MONGOCDRIVER_DOCS_USEFLAG} +s3 sasl +ssl static-libs test +test-full"
+IUSE="debug examples ${MONGO_C_DRIVER_DOCS_USEFLAG} +s3 sasl +ssl static-libs test +test-full"
 REQUIRED_USE="
 	s3? ( ssl )
 	test? ( static-libs )"
@@ -64,10 +63,8 @@ DEPEND="
 
 BDEPEND="
 	man? (
-		$(python_gen_any_dep '
-			<=dev-python/docutils-0.22[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-		')
+		<=dev-python/docutils-0.22
+		dev-python/sphinx
 	)
 	verify-sig? ( sec-keys/openpgp-keys-mongo-c-driver )
 "
@@ -77,11 +74,6 @@ PATCHES=(
 )
 
 
-python_check_deps() {
-	python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
 src_unpack() {
         if use verify-sig; then
                 verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
@@ -200,4 +192,9 @@ src_install() {
 
 	cmake_src_install
 	strip-lto-bytecode
+
+	# If USE=man, there'll be newly generated docs which we install instead.
+	if ! use man && [[ ${MONGO_C_DRIVER_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${PV}-docs/man*/*.[0-8]
+	fi
 }
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.30.6.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.30.6.ebuild
index 9354336..2952c74 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.30.6.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.30.6.ebuild
@@ -3,18 +3,17 @@
 
 EAPI=8
 
-# Generate using slight deviation from https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs as a template
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-: ${MONGOCDRIVER_DOCS_PREBUILT:=0}
+: ${MONGO_C_DRIVER_DOCS_PREBUILT:=1}
 
 # Default to generating man pages if no prebuilt; overridden later
-MONGOCDRIVER_DOCS_USEFLAG="+man"
+MONGO_C_DRIVER_DOCS_USEFLAG="+man"
 
-PYTHON_COMPAT=( python3_{11..14} pypy3_11 )
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mongo-c-driver.asc
 
-inherit cmake dot-a python-any-r1 verify-sig
+inherit cmake dot-a verify-sig
 
 DESCRIPTION="Client library written in C for MongoDB"
 HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
@@ -25,15 +24,15 @@ SRC_URI="
 	)
 "
 
-if [[ ${MONGOCDRIVER_DOCS_PREBUILT} == 1 ]] ; then
+if [[ ${MONGO_C_DRIVER_DOCS_PREBUILT} == 1 ]] ; then
 	SRC_URI+=" !man? ( https://people.znc.in/~dessa/gentoo/distfiles/${CATEGORY}/${PN}/${PN}-${PV}-docs.tar.xz )"
-	MONGOCDRIVER_DOCS_USEFLAG="man"
+	MONGO_C_DRIVER_DOCS_USEFLAG="man"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
-IUSE="debug examples ${MONGOCDRIVER_DOCS_USEFLAG} sasl +ssl static-libs test +test-full"
+IUSE="debug examples ${MONGO_C_DRIVER_DOCS_USEFLAG} sasl +ssl static-libs test +test-full"
 REQUIRED_USE="
 	test? ( static-libs )"
 
@@ -61,10 +60,8 @@ DEPEND="
 
 BDEPEND="
 	man? (
-		$(python_gen_any_dep '
-			<=dev-python/docutils-0.22[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-		')
+		<=dev-python/docutils-0.22
+		dev-python/sphinx
 	)
 	verify-sig? ( sec-keys/openpgp-keys-mongo-c-driver )
 "
@@ -74,11 +71,6 @@ PATCHES=(
 )
 
 
-python_check_deps() {
-	python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
 src_unpack() {
         if use verify-sig; then
                 verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
@@ -197,4 +189,9 @@ src_install() {
 
 	cmake_src_install
 	strip-lto-bytecode
+
+	# If USE=man, there'll be newly generated docs which we install instead.
+	if ! use man && [[ ${MONGO_C_DRIVER_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${PV}-docs/man*/*.[0-8]
+	fi
 }