gentoo Easter resync : 12.04.2020

4 files changed, 155 insertions, 0 deletions

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 7f74ced5e769..e60896f450bd 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -7,6 +7,8 @@ AUX mongo-c-driver-1.13.0-no-uninstall.patch 866 BLAKE2B de38a7659be91d293b33c03
 AUX mongo-c-driver-1.13.1-drop-failing-test.patch 842 BLAKE2B ce51289a0e16e9c5fdd072081b85bfd7fcc2d5450a5c34f148f8b81a0ab13e7e79f7ffdbfb7f951566f3fd5af28c2f9cd0b491af91d2d8f3a89312189760c056 SHA512 77a0ea5dcc76ce1fd18a15ae910fa1507282f36f47068b357cac3ae63f4a4368da848dd077747080f423e80a34665dd677f083eab6c16d258e75d5c2f99817fa
 AUX mongo-c-driver-1.14.0-enable-tests.patch 849 BLAKE2B ddae62c9f8d6f94f3c8f2bc48921f1825d8cef150026ea4a1047455901c9224c32f3ef2fdf9b426e73f752207fe9fc617c16547e0a2b7c4526350ba76358947c SHA512 4044c9580fb570640f1bd0e53c55a0699b5a22a93b78e2165ca08a0f99c6f09823e012021f86ff0b9ac2e1a2364b15b9eef77740833130ee08b4aed15afdb98d
 AUX mongo-c-driver-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
+AUX mongo-c-driver-1.16.2-enable-tests.patch 1167 BLAKE2B 750a692000dcb2abfc38d477dfa5df091ade3ffdf6c72f7a71e0c2da17c8ec875fefa6f049a7f57cfafdcebd7fe044fb6d68582b33845debd877de4760b86e57 SHA512 fb44a8f33f7905dfa71cc5bc0a9198872f008b499af3102f289fe46b57504abbf3eb4ec337d916dac1bd0284e3e955c4a7e75db1256e5b32e628443ffc447f29
+AUX mongo-c-driver-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1dc63673cbe0e25dc21e32cb418abeeb65ef2569d2e794e8141be5f6489f53423e1bf8dc70c343b18388b258f7179e97de0b9fb9abb3 SHA512 3a2e93b80ca63a8d13c10f1a530140ba2647676d1f955957833d71e50c05fba6a45400e294b2bbe324a1af9403ab07fdc1947e70835878e782252a2bad9276dd
 DIST mongo-c-driver-0.7.1.tar.gz 108537 BLAKE2B 29d7f6680d700d15d02b3d5deefbdc27b4e0841a2ac30205ed148216d15e95fe487f4cea4decacdf573a4ce78248cfd12cba72b9dbf90065e127fa7fb56cad27 SHA512 5c6996dc47ecbe4d77971e3aa983a877e7de736bf358c467808eceba8b1a5eea342376249cdc682a034fc7ec39290d234527cec3c3732686f184281a72aec724
 DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84571c717e5d6f288d79d3862e7f15f131604648595ca0e12200352a7fbf40652803afd0f60a80eac657b9853a1de51173 SHA512 7b61ac4b1b154ee1f518eddb2bbc0cdafe0da8786eed4475e5703c2a735ec5a09efde59f5bfa45fb226cbce24d8c0ba0de403d8fc3e561c0e48507dfb07962b1
 DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
@@ -19,6 +21,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
@@ -35,6 +38,7 @@ EBUILD mongo-c-driver-1.13.0-r1.ebuild 2447 BLAKE2B 9d78225d7dfad62360686f37b607
 EBUILD mongo-c-driver-1.13.1.ebuild 2482 BLAKE2B a023ec4ab0d023c30e6f664eb1209136429c19321f07fbdf7def6b2fcb7d66f873fd394d48db98f08f2466c4c46a9fbba8f8a48e57a355b09c2d9e4582d1ebda SHA512 f587c3e03233039d8869b5d75b8fd1cee617da4a1b4fd6acd97a043c78a7604320c42e78e5e21df0783da98092252e4301011804384988df548449a350e89a47
 EBUILD mongo-c-driver-1.14.0.ebuild 2551 BLAKE2B 63c599838498a5893429ff5def20a62f50205e9c6eb8cbc09fd32bcdacd8b70531cc46041023999a634f990c4982a3b94a027cef2314e1b6d5e0a8edb8d9768a SHA512 3ad5c4651b4c3d00c9c01159648750f46cc52e8c9c910ca5534518c7ee7255bba6069ef5a26f5734d52b7a978cdf089ffac52af10fcc15c41a573e6cd6f7fcb6
 EBUILD mongo-c-driver-1.15.1.ebuild 2536 BLAKE2B b4d2263f92d32b3605188b6ea91d8dd1a3100ad13e73c300b6efe5a684483a9669c389d591c6681c5f6a2a1501bbc1d2fc4c1db88533c868ca1b4fe30348203c SHA512 393ffad442d3db5ad0661459f3ef9cbe9d37a5087079436ac6c534dee378d207c802f928b6dbef13626d6c77026971215c52413e8ea7bf21167f74526b9b6560
+EBUILD mongo-c-driver-1.16.2.ebuild 2501 BLAKE2B 70f6e83f3a3220b56755a495581adfceedb5ee69bd6f919b5f14a2203d7ac86cc55555b7e845f330e12c7ff24d137297676febb65cddbfaf1df6da2b8b7d33db SHA512 8706ebc5bf7a8961d16b5a4f70c01983bc65f3ecbf67816935e54eb81a2422bd5914b350798deceeffeccdeaf311bb3615480160d1a366d2275f07ff2877a96d
 EBUILD mongo-c-driver-1.3.5.ebuild 2171 BLAKE2B 62807837e21c6ce5c098fb5160aae99b01d6dd01550d3bd837ca727616036ec453a9e37f0b4ae71979bdce01344a265d0ccc23d324d9827084bfc302b980a6d1 SHA512 1b22d611b3c235883d4115fbf82d800fae0fd81453d2b4dff8abe8dbeab065b04e2abd506ad6050c10862a7bb7f28cc7ad41b08bf16a53598c20eabcaaec4cd8
 EBUILD mongo-c-driver-1.6.2.ebuild 2070 BLAKE2B b2a25755c6a37247c42f41134684387b2e584a241a411fce98c96f057ef18c050bc4e8ec3aadc4de716fa7369ca797ca75cf9ac2fb39d3dba0827190d9cad2be SHA512 22a44789068ec7277d10feb6d41b82526b09aad1213ae8b9827131e63df1d78ce07704f295178cfa085a6c6c645f7d456150caca51265b00dd8bf6cca2c6f42c
 EBUILD mongo-c-driver-1.8.2.ebuild 2128 BLAKE2B ef502986fe7b125c8abd168119797b89706209b0f6c7a2f99dbf4a0e9de93687babc79d504e366ba4bdad52215e2f5c4c72f259f81ea3bd70c627591389cf9dc SHA512 87607915dab15ffbe9f2dea28a243d14ec5c20d7290fd9018a57a7e31cbe4bc62b731f236da06d246823b070ea2230b588159a8001e792ce7273f492452811fb
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
index 000000000000..47cce862c8bb
--- /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
index 000000000000..933081b32a31
--- /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
index 000000000000..66adfafad3a1
--- /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
+}