From 8660a0ae8670d06426fb712ed83b0598abb34b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Tue, 25 Jun 2024 18:05:22 +0200 Subject: [PATCH] [dev-libs/mongo-c-driver] try fixing stable candidate and remove non-existant option --- dev-libs/mongo-c-driver/Manifest | 1 + .../mongo-c-driver-1.24.4.ebuild | 99 +++++++++++++++++++ .../mongo-c-driver-1.27.2.ebuild | 8 +- 3 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 dev-libs/mongo-c-driver/mongo-c-driver-1.24.4.ebuild diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest index e2c86f1..865c98c 100644 --- a/dev-libs/mongo-c-driver/Manifest +++ b/dev-libs/mongo-c-driver/Manifest @@ -1 +1,2 @@ +DIST mongo-c-driver-1.24.4.tar.gz 7916661 BLAKE2B e361b52bf16eed7437428b0481d792ecf2f9cc283fdd6f23916d4a3ffb1b7d7c9ea7a7c4cf5f369e21fb6d4f564b91e07ac2ee44656855993218593dc4f1c166 SHA512 3563c061565d17a76581e188f6e184d7e41f2729812c8815afd34e03ebe6c1d25d7498a2cb1b599a09d24f6268c36473ef5113a14c7585a1532c9abf2e56e936 DIST mongo-c-driver-1.27.2.tar.gz 7215536 BLAKE2B 960a846470f325c9b629f7578e474e7cf40a0cbf5493e4c4e487b00b119618085672d6276a5a277383ee7032c54e64dfc668d125268ae963211301ce8b1381b9 SHA512 b2b00aeafb3e639ced89e1e5fee6e3a72167322acbb49dce06514271af2041713373ce1b941bdf1b94a518e93f4baca1c55c5c6e5cec33ff72916dace2c2be09 diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4.ebuild new file mode 100644 index 0000000..5624c9e --- /dev/null +++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Client library written in C for MongoDB" +HOMEPAGE="https://github.com/mongodb/mongo-c-driver" +SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86" +IUSE="debug examples icu sasl ssl static-libs test" +REQUIRED_USE="test? ( static-libs )" + +# No tests on x86 because tests require dev-db/mongodb which don't support +# x86 anymore (bug #645994) +RESTRICT="x86? ( test ) + !test? ( test )" + +RDEPEND="app-arch/snappy:= + app-arch/zstd:= + >=dev-libs/libbson-${PV}[static-libs?] + dev-python/sphinx + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + sasl? ( dev-libs/cyrus-sasl:= ) + ssl? ( + dev-libs/openssl:= + )" +DEPEND="${RDEPEND} + test? ( + dev-db/mongodb + dev-libs/libbson[static-libs] + )" + +src_prepare() { + cmake_src_prepare + + # copy private headers for tests since we don't build libbson + if use test; then + mkdir -p src/libbson/tests/bson || die + cp src/libbson/src/bson/bson-*.h src/libbson/tests/bson/ || die + fi + + # remove doc files + sed -i '/^\s*install\s*(FILES COPYING NEWS/,/^\s*)/{d}' CMakeLists.txt || die + + # enable tests + sed -i '/message ("-- disabling test-libmongoc since using system libbson")/{d}' CMakeLists.txt || die + sed -i '/SET (ENABLE_TESTS OFF)/{d}' CMakeLists.txt || die + sed -i 's/message (FATAL_ERROR "System libbson built without static library target")/message (STATUS "System libbson built without static library target")/' CMakeLists.txt || die + sed -i 's##"bson/bson-private.h"#' src/libbson/tests/test-bson.c || die +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath + -DUSE_SYSTEM_LIBBSON=ON + -DENABLE_EXAMPLES=OFF + -DENABLE_ICU="$(usex icu ON OFF)" + -DENABLE_MAN_PAGES=ON + -DENABLE_MONGOC=ON + -DENABLE_SNAPPY=AUTO + -DENABLE_ZLIB=SYSTEM + -DENABLE_SASL="$(usex sasl CYRUS OFF)" + -DENABLE_SSL="$(usex ssl $(usex ssl OPENSSL) OFF)" + -DENABLE_STATIC="$(usex static-libs ON OFF)" + -DENABLE_TESTS="$(usex test ON OFF)" + -DENABLE_TRACING="$(usex debug ON OFF)" + -DENABLE_UNINSTALL=OFF + -DENABLE_ZSTD=ON + ) + + cmake_src_configure +} + +# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver +src_test() { + local PORT=27099 + mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \ + --setParameter enableTestCommands=1 --dbpath="${T}" \ + --logpath="${T}/mongod.log" || die + MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" \ + MONGOC_ENABLE_MAJORITY_READ_CONCERN=off \ + ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die + kill $(<"${T}/mongod.lock") +} + +src_install() { + if use examples; then + docinto examples + dodoc src/libmongoc/examples/*.c + fi + + cmake_src_install +} diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.27.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.27.2.ebuild index 5b436b5..8b3119f 100644 --- a/dev-libs/mongo-c-driver/mongo-c-driver-1.27.2.ebuild +++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.27.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/refs/tags/${PV}.tar.g LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86" -IUSE="debug examples icu +s3 sasl +ssl static-libs test +test-full" +IUSE="debug examples +s3 sasl +ssl static-libs test +test-full" REQUIRED_USE=" s3? ( ssl ) test? ( static-libs )" @@ -96,9 +96,9 @@ src_test() { export MONGOC_ENABLE_MAJORITY_READ_CONCERN=on LC_ALL=C \ mongod --setParameter enableTestCommands=1 \ - --enableMajorityReadConcern --port ${PORT} \ - --bind_ip 127.0.0.1 --nounixsocket --fork \ - --dbpath="${T}" --logpath="${T}/mongod.log" || die + --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket \ + --fork --dbpath="${T}"\ + --logpath="${T}/mongod.log" || die fi ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc \