dev-libs/mongo-c-driver: bump to 1.16.2

Closes: https://bugs.gentoo.org/714164
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 0e15101cd2aeebd3f8e8e8a1c07ea32dc91c96e7..539559f914e9a6cfee799b3428073ba84d1bd7ea 100644 (file)
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -10,6 +10,7 @@ DIST mongo-c-driver-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0
 DIST mongo-c-driver-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a49af102d44c8fb7678db82a41f915c984e95f5301f533dde63139221cb6e161fa5053b9fcc33080abe1095d9c35 SHA512 454670a145a5f2272daa5ca88f2e7d7e42c9b7df62dfc29b3c4b602ef8f819a740890c40872fa47dc411cc5ef9a34b55a6feea3657a802a5be378c4dbe79f42d
 DIST mongo-c-driver-1.14.0.tar.gz 6573651 BLAKE2B 0b1157473554a5aa49e61cf1c85dc7b1f1917581e661a4295876d4c93e72137b4c7c04e1b7545ba7272706499dbe868a36f1c888d2d07a8176f1c4dc01f9fa5f SHA512 99ca4001341d044a8ffc02a5d7175d40f8a998bdaad15a668a7db0558fa616ec18152faeda6da7f28b34c5d2cf4b649180c9390d2229e1342b6c4f6742816994
 DIST mongo-c-driver-1.15.1.tar.gz 6699867 BLAKE2B afb75b6f50173bbe161a37a5cd3afd7d2ce3d9ab73019e2a27e2b15b0be0a54c5e3b423dda2e6d65b85ff7c1dbbd883f3a0e0ebc244a13c531d2c39297d9a5e9 SHA512 7544900809dd008da110b412acc1e5e42ea908d804fdf3bced8100e48f1695844605407c9733b285b8833b636bcaec8687df25a01c9749612c61df2325214fe5
+DIST mongo-c-driver-1.16.2.tar.gz 6888287 BLAKE2B 40d2b73f495a8c71ca8b3c39c1b3c85b4a01ea088428967ed49f4758ef749e3288b046bde767a83aad022933f30f7307a4be65141f477bb1dcf912b4099129d6 SHA512 0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a
 DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c19a5b8722a2ed69fdf046c35973c9bedcc1686065e4355db28afc83c1415872eee2972a6fb3f21647d2cafce12706adc0 SHA512 23844ffe20580998308aa9c8409afcb87dccde874077eefc6806b705e5de5743846ba0513f3a3fe83147fc47842ab8c7438ad1de5f3f55b81586b9e19046aabf
 DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
 DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76

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
new file mode 100644 (file)
index 0000000..47cce86
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-enable-tests.patch
@@ -0,0 +1,35 @@
+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 <bson/bson.h>
+ #include <bson/bcon.h>
+-#include <bson/bson-private.h>
++#include "bson/bson-private.h"
+ #include <fcntl.h>
+ #include <time.h>
+ 

diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-single-doc-job.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-single-doc-job.patch
new file mode 100644 (file)
index 0000000..933081b
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-single-doc-job.patch
@@ -0,0 +1,22 @@
+diff --git a/build/cmake/SphinxBuild.cmake b/build/cmake/SphinxBuild.cmake
+index a7f49d7..804ad44 100644
+--- a/build/cmake/SphinxBuild.cmake
++++ b/build/cmake/SphinxBuild.cmake
+@@ -40,7 +40,7 @@ function (sphinx_build_html target_name doc_dir)
+       ${CMAKE_COMMAND} -E env
+       "PYTHONDONTWRITEBYTECODE=1"
+       ${SPHINX_EXECUTABLE}
+-         -j ${NPROCS} -qEW -b html
++         -j 1 -qEW -b html
+          -c "${CMAKE_CURRENT_SOURCE_DIR}"
+          "${CMAKE_CURRENT_SOURCE_DIR}"
+          "${SPHINX_HTML_DIR}"
+@@ -133,7 +133,7 @@ function (sphinx_build_man target_name)
+       ${CMAKE_COMMAND} -E env
+       "PYTHONDONTWRITEBYTECODE=1"
+       ${SPHINX_EXECUTABLE}
+-         -j ${NPROCS} -qEW -b man
++         -j 1 -qEW -b man
+          -c "${CMAKE_CURRENT_SOURCE_DIR}"
+          "${CMAKE_CURRENT_SOURCE_DIR}"
+          "${SPHINX_MAN_DIR}"

diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
new file mode 100644 (file)
index 0000000..66adfaf
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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 ~hppa ~s390 ~x86"
+IUSE="debug examples icu libressl sasl ssl static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+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? (
+               !libressl? ( dev-libs/openssl:0= )
+               libressl? ( dev-libs/libressl:0= )
+       )"
+DEPEND="${RDEPEND}
+       test? (
+               dev-db/mongodb
+               dev-libs/libbson[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 )"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-1.14.0-no-docs.patch"
+       "${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson
+       "${FILESDIR}/${PN}-1.16.2-single-doc-job.patch"
+)
+
+src_prepare() {
+       cmake-utils_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
+}
+
+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 $(usex libressl LIBRESSL 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-utils_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-utils_src_install
+}