commit:     c862745e3e07663bd0fdc2d5f811bc25b27537ad
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Jun 26 14:31:33 2018 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Aug  1 19:23:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c862745e

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

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/mongo-c-driver/Manifest                   |  1 +
 .../files/mongo-c-driver-1.11.0-enable-tests.patch | 25 +++++++
 .../mongo-c-driver/mongo-c-driver-1.11.0.ebuild    | 87 ++++++++++++++++++++++
 3 files changed, 113 insertions(+)

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index ace85a1ab45..0479e6f960f 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -4,6 +4,7 @@ DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 
399fb03464234c87dcb66647c5383c
 DIST mongo-c-driver-1.1.10.tar.gz 5321144 BLAKE2B 
d63ba4b1a256b8b29654398a53d9ca46d49faad0e0327db0d51cfc4e2a1771568341ff4e7ba6ff2ff31fb11ad8a14c452e52cabdd83da7eb1c1ceb8af7bef7d2
 SHA512 
10ebd1bddc0c713c0934679974fb1ed29eda1bf8e2ebbe2a1ebbcba219574092c34c4b352231ec65ffe3e350d8d701ef85debaaa9f9c10e6ab36fc3fa29f69df
 DIST mongo-c-driver-1.1.2.tar.gz 5443153 BLAKE2B 
f8004486baf6d2d3086e458bdb4bc8060462fd52ba700cbf05fdb9827adcbd087b61d7e0e00169cf635c8021983dc851b7f34c3e08d66efc65483fce98a85f74
 SHA512 
d420fc407f6a04c06a959b8971dc2643c987df5c3d82f2b13bfdf6a44e96bc377478c4d0e385abf67f21b56892c915c79675fe9ebf6efa9aab51fe452c5e6f95
 DIST mongo-c-driver-1.10.3.tar.gz 5616159 BLAKE2B 
368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726
 SHA512 
47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
+DIST mongo-c-driver-1.11.0.tar.gz 5681593 BLAKE2B 
43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4
 SHA512 
d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
 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.11.0-enable-tests.patch 
b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch
new file mode 100644
index 00000000000..67fafafc93b
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 860e4ea..7d646b1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,7 +110,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 51514ed..accb251 100644
+--- a/src/libbson/tests/test-bson.c
++++ b/src/libbson/tests/test-bson.c
+@@ -18,7 +18,7 @@
+ #include <bson.h>
+ #include <bcon.h>
+ #define BSON_INSIDE
+-#include <bson-private.h>
++#include "bson-private.h"
+ #undef BSON_INSIDE
+ #include <fcntl.h>
+ #include <time.h>

diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild 
b/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
new file mode 100644
index 00000000000..aaa06162f88
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="debug examples 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:=
+       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}/${P}-enable-tests.patch" # enable tests without libbson
+)
+
+src_prepare() {
+       cmake-utils_src_prepare
+
+       # copy private headers for tests since we don't build libbson
+       if use test; then
+               for f in bson-fnv-private.h bson-iso8601-private.h 
bson-private.h bson-thread-private.h; do
+                       cp -v src/libbson/src/bson/${f} src/libbson/tests/ || 
die
+               done
+       fi
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
+               -DENABLE_BSON=SYSTEM
+               -DENABLE_EXAMPLES=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)"
+       )
+
+       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
+}

Reply via email to