gentoo resync : 28.04.2019

4 files changed, 137 insertions, 0 deletions

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 7c291970b08f..3ebcf0447be6 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -5,6 +5,8 @@ AUX mongo-c-driver-1.12.0-libressl.patch 637 BLAKE2B df52868ae9253125cc77973de4d
 AUX mongo-c-driver-1.13.0-enable-tests.patch 886 BLAKE2B 9a568e6498ec9ed7b08bcd8e5ae92c8e439bcce6bc04a91f128411efdbeafa64f3258f687963c861aea14c268587972ca679fbcd380098a3eefcc50a0c0a4e24 SHA512 c7f4ca10791c2eae60ea50214c1605d9d4ff48a804511d8dd9b181046f794a61499033ae0f0a8657257ee378dc30976e78984270d7fdc8cb4791b7690c89102f
 AUX mongo-c-driver-1.13.0-no-uninstall.patch 866 BLAKE2B de38a7659be91d293b33c03036c14607bc3f6214a5970d28b8cbc02d77ee32a04f077e082cb7bf9ae126d13d5537a634c29e31230d444cfb72734fc417b0d604 SHA512 ccfca1aafb4b918a14950ccd99ca6b4f4a3d7d0178a726f6c9de7096a5e5ed700953672ae457a43064b61595df4e955774a4836e5d653d6d73b50cd5772f87d9
 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
 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
@@ -15,6 +17,7 @@ DIST mongo-c-driver-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b128
 DIST mongo-c-driver-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
 DIST mongo-c-driver-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
 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.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
@@ -29,6 +32,7 @@ EBUILD mongo-c-driver-1.11.0.ebuild 2296 BLAKE2B 58e82ebbbab0773a1a261f25de8bffc
 EBUILD mongo-c-driver-1.12.0.ebuild 2343 BLAKE2B e711508f266ed482c496fce0f593e62ef692522565dd36472591b97a7b3b8f5e27e6c7fed0b5f29401a14f9cb5aafc0959289f481c7ee1f09634a274f7b107fd SHA512 a54a2343caf467d59f7b5460e8c1865dd6f44f327542d535a5eaac7ad6a3bd59c2e30466dd584c7f6165ce195ba35b5e655a7c8349fbdb8b01deb5af3229efa1
 EBUILD mongo-c-driver-1.13.0-r1.ebuild 2431 BLAKE2B ca1cb9c45b3e7b5a78763afbdd0e4105d6eb1d2c60e647081923fcf5c460b9b56568ee2e47dbcf743cf5d15870091546981bb7f68c5903da46c40849d948cae7 SHA512 8cb7d48ee5d1f1a7bf66042dc87ebe685db83b96b8ffa107d72b1faa5b9266b139810e3cb9cbbd3dbb1d3b752b87bb8dd810f43a5ac02dee5c16af6f9784c7c7
 EBUILD mongo-c-driver-1.13.1.ebuild 2466 BLAKE2B 8f5e8d47c5e0b69876f6701986d70c3db75b6e4d28a817f3e880aa630eef6e1eb8307bf91bd98fc170aaee702aec9e8961058d83cae0d009457213bc1088fcc7 SHA512 2c2cc1f028ddcd1b93227a8022ecd47655aa43088ba8e4f5d782a31cd5122752be80d6904d85353c92cde040fae6f5333ca91e1fe678a3ed1bdec4b7aeee024f
+EBUILD mongo-c-driver-1.14.0.ebuild 2535 BLAKE2B 39a56e6dcac4bacd8c18d4c78d7186833533ffe9e998576a38edddeffc88b27a18707b93694fdfccece8029a26431eb5b3d82eb059d14dcacced898e536d5d6e SHA512 c47c698ae7e76969a8cc5c778a0a5b121628a6fb625a7cc90e114a6943872d3520cac0e8cecb5a7066226d140711b40077ebd098de30b6052687a18f97a1eb31
 EBUILD mongo-c-driver-1.3.5.ebuild 2155 BLAKE2B 45fe20fe538367ac6005a6029fe2607be500aacc9558cf24bc16931bb6eaf5629f8b7d6611ff745876707d04a30776604b09a73b7d09d2dbe8ed8c9f7347aa04 SHA512 a80ee2ed4231f6da38f4cc812258efbc768e4ad3c0b2632aa8fab30a25361dad4ed4a9ec98c4ffab05ff0976e0b85a5c1080439ce8899bfec42c5ebef8ec59ff
 EBUILD mongo-c-driver-1.6.2.ebuild 2095 BLAKE2B 25dc744ab32604d799ed4af21a2495ae146920b93ba8e8cbd318e2b912c94903514631c592e493593e7b5b2e629b77aeec2cc44bc718a6a794a3921a9f581a9e SHA512 f75d4ff29770a6ca306a8414d29f23b90d3dbd56e9a897d51baf6eabb9be19fdf247eb0804989d1052079a01f55b52086921fe24152ab45ac53ca5f492c0efc7
 EBUILD mongo-c-driver-1.8.2.ebuild 2153 BLAKE2B 404dd02861d6acad7d2622254759e817e3d993a540cada00576752fc688120532cc07e9ed934da403337bc829baaebd6de0eb1b2d50b73bf7305eabb33c17c5b SHA512 172a89e04ea99583b7587949dde56b1a79ed7d5db00897ada797fefb6d8e8a94338ea4e4b00ad2792275a241468158e055832a783f018f9281023e0f37e76619
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch
new file mode 100644
index 000000000000..76202b5e387a
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c0e01a8..3371dae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -163,7 +163,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
+       message ("--   libbson include path \"${BSON_INCLUDE_DIRS}\"")
+       message ("--   libbson libraries \"${BSON_LIBRARIES}\"")
+       message ("--   disabling test-libmongoc since using system libbson")
+-      SET (ENABLE_TESTS OFF)
+ 
+       if (ENABLE_STATIC MATCHES "ON|AUTO")
+          find_package (libbson-static-1.0
+diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
+index 95356fa..9f9aea3 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.14.0-no-docs.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch
new file mode 100644
index 000000000000..d33fba105ab0
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch
@@ -0,0 +1,15 @@
+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/mongo-c-driver-1.14.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
new file mode 100644
index 000000000000..eaea5a9fc5ac
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 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 -> ${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:=
+	>=dev-libs/libbson-${PV}
+	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 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.13.1-drop-failing-test.patch" # one test fails
+	"${FILESDIR}/${PN}-1.14.0-enable-tests.patch" # enable tests with system libbson
+	"${FILESDIR}/${PN}-1.14.0-no-docs.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
+		for f in bson-context-private.h bson-iso8601-private.h bson-private.h; do
+			cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die
+		done
+	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
+	)
+
+	cmake-utils_src_configure
+}
+
+# FEATURES="test" 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
+}