From e1d5dbf03081ada7798ff74f63cf8e630bd653c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Tue, 4 Nov 2025 12:54:50 +0100
Subject: [PATCH] [dev-libs/mongo-c-driver] sync against pr version, docutils
 0.22 patch

---
 .../mongo-c-driver-1.30.6-docutils-0.22.patch | 24 +++++++++++++
 .../mongo-c-driver-1.30.6-r1.ebuild           | 34 +++++++++++--------
 .../mongo-c-driver-1.30.6.ebuild              | 32 +++++++++--------
 3 files changed, 61 insertions(+), 29 deletions(-)
 create mode 100644 dev-libs/mongo-c-driver/files/mongo-c-driver-1.30.6-docutils-0.22.patch

diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.30.6-docutils-0.22.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.30.6-docutils-0.22.patch
new file mode 100644
index 0000000..786ec4f
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.30.6-docutils-0.22.patch
@@ -0,0 +1,24 @@
+https://jira.mongodb.org/browse/CDRIVER-6133
+--- a/src/libmongoc/doc/conf.py
++++ b/src/libmongoc/doc/conf.py
+@@ -133,7 +133,7 @@
+ .. |qenc:is-experimental| replace::
+ 
+     is part of the experimental
+-    `Queryable Encryption <queryable-encryption_>`_ API and may be subject
++    `Queryable Encryption <queryable-encryption_>` API and may be subject
+     to breaking changes in future releases.
+ 
+ .. |qenc:opt-is-experimental| replace::
+@@ -190,10 +190,10 @@
+     :cmake:command:`find_package() <command:find_package>`
+ 
+ .. |bson_t-storage-ptr| replace::
+-    non-``NULL`` pointer to `overwritable storage <bson_lifetimes_>`_ for a :symbol:`bson_t`
++    non-``NULL`` pointer to `overwritable storage <bson_lifetimes_>` for a :symbol:`bson_t`
+ 
+ .. |bson_t-opt-storage-ptr| replace::
+-    maybe-``NULL`` pointer to `overwritable storage <bson_lifetimes_>`_ for a :symbol:`bson_t`
++    maybe-``NULL`` pointer to `overwritable storage <bson_lifetimes_>` for a :symbol:`bson_t`
+ 
+ .. _mongodb_docs_cdriver: https://www.mongodb.com/docs/languages/c/c-driver/current/
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 2e1153e..232a8fd 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
@@ -6,7 +6,7 @@ EAPI=8
 # 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)
-: ${MONGO_C_DRIVER_DOCS_PREBUILT:=0}
+: ${MONGO_C_DRIVER_DOCS_PREBUILT:=1}
 
 # Default to generating man pages if no prebuilt; overridden later
 MONGO_C_DRIVER_DOCS_USEFLAG="+man"
@@ -31,7 +31,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~riscv ~x86"
 IUSE="debug examples ${MONGO_C_DRIVER_DOCS_USEFLAG} +s3 sasl +ssl static-libs test +test-full"
 REQUIRED_USE="
 	s3? ( ssl )
@@ -44,9 +44,11 @@ RDEPEND="
 	app-arch/zstd:=
 	~dev-libs/libbson-${PV}[static-libs?]
 	>=dev-libs/libmongocrypt-1.12.0
-	>=dev-libs/libutf8proc-2.8.0:=[static-libs?]
-	sys-libs/zlib:=
-	sasl? ( dev-libs/cyrus-sasl:= )
+	virtual/zlib:=
+	sasl? (
+		dev-libs/cyrus-sasl:=
+		>=dev-libs/libutf8proc-2.8.0:=[static-libs?]
+	)
 	ssl? ( dev-libs/openssl:= )
 "
 DEPEND="
@@ -54,7 +56,9 @@ DEPEND="
 	test? (
 		dev-libs/libbson[static-libs]
 		dev-libs/libmongocrypt[static-libs]
-		dev-libs/libutf8proc[static-libs]
+		sasl? (
+			dev-libs/libutf8proc[static-libs]
+		)
 		test-full? (
 			dev-db/mongodb
 		)
@@ -63,7 +67,7 @@ DEPEND="
 
 BDEPEND="
 	man? (
-		<=dev-python/docutils-0.22
+		dev-python/docutils
 		dev-python/sphinx
 	)
 	verify-sig? ( sec-keys/openpgp-keys-mongo-c-driver )
@@ -71,14 +75,14 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/mongo-c-driver-1.30.6-cmake4.patch
+	"${FILESDIR}"/mongo-c-driver-1.30.6-docutils-0.22.patch
 )
 
-
 src_unpack() {
-        if use verify-sig; then
-                verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-        fi
-        default
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+	default
 }
 
 src_prepare() {
@@ -177,11 +181,11 @@ src_test() {
 			--logpath="${T}/mongod.log" || die
 	fi
 
-#	../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc \
-#	--skip-tests "${FILESDIR}/skip-tests.txt" || die
 	# parallel tests cause failures.
 	cmake_src_test -j1
-	kill $(<"${T}/mongod.lock")
+	if use test-full; then
+		kill $(<"${T}/mongod.lock")
+	fi
 }
 
 src_install() {
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 2952c74..16eae02 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
@@ -31,7 +31,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~riscv ~x86"
 IUSE="debug examples ${MONGO_C_DRIVER_DOCS_USEFLAG} sasl +ssl static-libs test +test-full"
 REQUIRED_USE="
 	test? ( static-libs )"
@@ -42,16 +42,20 @@ RDEPEND="
 	app-arch/snappy:=
 	app-arch/zstd:=
 	~dev-libs/libbson-${PV}[static-libs?]
-	>=dev-libs/libutf8proc-2.8.0:=[static-libs?]
-	sys-libs/zlib:=
-	sasl? ( dev-libs/cyrus-sasl:= )
+	virtual/zlib:=
+	sasl? (
+		dev-libs/cyrus-sasl:=
+		>=dev-libs/libutf8proc-2.8.0:=[static-libs?]
+	)
 	ssl? ( dev-libs/openssl:= )
 "
 DEPEND="
 	${RDEPEND}
 	test? (
 		dev-libs/libbson[static-libs]
-		dev-libs/libutf8proc[static-libs]
+		sasl? (
+			dev-libs/libutf8proc[static-libs]
+		)
 		test-full? (
 			dev-db/mongodb
 		)
@@ -60,7 +64,7 @@ DEPEND="
 
 BDEPEND="
 	man? (
-		<=dev-python/docutils-0.22
+		dev-python/docutils
 		dev-python/sphinx
 	)
 	verify-sig? ( sec-keys/openpgp-keys-mongo-c-driver )
@@ -68,14 +72,14 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/mongo-c-driver-1.30.6-cmake4.patch
+	"${FILESDIR}"/mongo-c-driver-1.30.6-docutils-0.22.patch
 )
 
-
 src_unpack() {
-        if use verify-sig; then
-                verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-        fi
-        default
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+	default
 }
 
 src_prepare() {
@@ -174,11 +178,11 @@ src_test() {
 			--logpath="${T}/mongod.log" || die
 	fi
 
-#	../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc \
-#	--skip-tests "${FILESDIR}/skip-tests.txt" || die
 	# parallel tests cause failures.
 	cmake_src_test -j1
-	kill $(<"${T}/mongod.lock")
+	if use test-full; then
+		kill $(<"${T}/mongod.lock")
+	fi
 }
 
 src_install() {