diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest index 2e83e1e3a78a9..2c0f873b0ad40 100644 --- a/dev-libs/mongo-c-driver/Manifest +++ b/dev-libs/mongo-c-driver/Manifest @@ -1,2 +1 @@ -DIST mongo-c-driver-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606 DIST mongo-c-driver-1.24.4.tar.gz 7916661 BLAKE2B e361b52bf16eed7437428b0481d792ecf2f9cc283fdd6f23916d4a3ffb1b7d7c9ea7a7c4cf5f369e21fb6d4f564b91e07ac2ee44656855993218593dc4f1c166 SHA512 3563c061565d17a76581e188f6e184d7e41f2729812c8815afd34e03ebe6c1d25d7498a2cb1b599a09d24f6268c36473ef5113a14c7585a1532c9abf2e56e936 diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch deleted file mode 100644 index d33fba105ab05..0000000000000 --- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3371dae..a6edf0f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -380,10 +380,6 @@ if (ENABLE_MONGOC) - - endif () - --install (FILES COPYING NEWS README.rst THIRD_PARTY_NOTICES -- DESTINATION ${CMAKE_INSTALL_DATADIR}/mongo-c-driver --) -- - if (ENABLE_UNINSTALL) - if (WIN32) - if (ENABLE_MONGOC) diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-enable-tests.patch deleted file mode 100644 index 47cce862c8bb1..0000000000000 --- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-enable-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1a2b7ba..26fbe9b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -161,8 +161,6 @@ if (ENABLE_BSON STREQUAL SYSTEM) - endif () - - message ("-- libbson found version \"${bson-1.0_VERSION}\"") -- message ("-- disabling test-libmongoc since using system libbson") -- SET (ENABLE_TESTS OFF) - - if (ENABLE_STATIC MATCHES "ON|AUTO") - set (MONGOC_ENABLE_STATIC ON) -@@ -174,7 +172,7 @@ if (ENABLE_BSON STREQUAL SYSTEM) - endif () - set (BSON_LIBRARIES mongo::bson_shared) - if (NOT TARGET mongo::bson_static) -- message (FATAL_ERROR "System libbson built without static library target") -+ message (STATUS "System libbson built without static library target") - endif () - set (BSON_STATIC_LIBRARIES mongo::bson_static) - endif () -diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c -index c949d22..4d5a47f 100644 ---- a/src/libbson/tests/test-bson.c -+++ b/src/libbson/tests/test-bson.c -@@ -17,7 +17,7 @@ - - #include - #include --#include -+#include "bson/bson-private.h" - #include - #include - diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0-r1.ebuild deleted file mode 100644 index e2bf1455e7902..0000000000000 --- a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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?] - sys-libs/zlib:= - icu? ( dev-libs/icu:= ) - sasl? ( dev-libs/cyrus-sasl:= ) - ssl? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND} - test? ( - dev-db/mongodb - dev-libs/libbson[static-libs] - )" -BDEPEND=" - dev-python/sphinx -" - -PATCHES=( - "${FILESDIR}/${PN}-1.14.0-no-docs.patch" - "${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson -) - -src_prepare() { - cmake_src_prepare - - # sphinx's -Werror - sed -i -e 's:-qEW:-qE:' build/cmake/SphinxBuild.cmake || die - - # 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 -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath - -DENABLE_BSON=SYSTEM - -DENABLE_EXAMPLES=OFF - -DENABLE_ICU="$(usex icu ON OFF)" - -DENABLE_MAN_PAGES=ON - -DENABLE_MONGOC=ON - -DENABLE_SNAPPY=SYSTEM - -DENABLE_ZLIB=SYSTEM - -DENABLE_SASL="$(usex sasl CYRUS OFF)" - -DENABLE_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 \ - --dbpath="${T}" --logpath="${T}/mongod.log" || die - MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../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 -}