[dev-libs/mongo-c-driver] sync against pr version, docutils 0.22 patch

This commit is contained in:
2025-11-04 12:54:50 +01:00
parent 150dcb8bd1
commit e1d5dbf030
3 changed files with 61 additions and 29 deletions

View File

@@ -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/

View File

@@ -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
virtual/zlib:=
sasl? (
dev-libs/cyrus-sasl:=
>=dev-libs/libutf8proc-2.8.0:=[static-libs?]
sys-libs/zlib:=
sasl? ( dev-libs/cyrus-sasl:= )
)
ssl? ( dev-libs/openssl:= )
"
DEPEND="
@@ -54,7 +56,9 @@ DEPEND="
test? (
dev-libs/libbson[static-libs]
dev-libs/libmongocrypt[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,9 +75,9 @@ 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}
@@ -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
if use test-full; then
kill $(<"${T}/mongod.lock")
fi
}
src_install() {

View File

@@ -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?]
virtual/zlib:=
sasl? (
dev-libs/cyrus-sasl:=
>=dev-libs/libutf8proc-2.8.0:=[static-libs?]
sys-libs/zlib:=
sasl? ( dev-libs/cyrus-sasl:= )
)
ssl? ( dev-libs/openssl:= )
"
DEPEND="
${RDEPEND}
test? (
dev-libs/libbson[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,9 +72,9 @@ 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}
@@ -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
if use test-full; then
kill $(<"${T}/mongod.lock")
fi
}
src_install() {