commit: 174061c8b1c673f8f97c2874159772398c46d4f7 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Sat Dec 15 00:02:56 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sun Dec 16 23:30:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174061c8
dev-libs/mongo-c-driver: bump to 1.13.0 Closes: https://bugs.gentoo.org/673086 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> dev-libs/mongo-c-driver/Manifest | 1 + .../files/mongo-c-driver-1.13.0-enable-tests.patch | 25 ++++++ .../files/mongo-c-driver-1.13.0-no-uninstall.patch | 27 +++++++ .../mongo-c-driver/mongo-c-driver-1.13.0.ebuild | 89 ++++++++++++++++++++++ 4 files changed, 142 insertions(+) diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest index d2b17209e15..750896dd6b6 100644 --- a/dev-libs/mongo-c-driver/Manifest +++ b/dev-libs/mongo-c-driver/Manifest @@ -6,6 +6,7 @@ DIST mongo-c-driver-1.1.2.tar.gz 5443153 BLAKE2B f8004486baf6d2d3086e458bdb4bc80 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.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.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.13.0-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-enable-tests.patch new file mode 100644 index 00000000000..983e025b917 --- /dev/null +++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-enable-tests.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 22d1f4f..8ab33c6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,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 6ac94f3..cec430f 100644 +--- a/src/libbson/tests/test-bson.c ++++ b/src/libbson/tests/test-bson.c +@@ -18,7 +18,7 @@ + #include <bson/bson.h> + #include <bson/bcon.h> + #define BSON_INSIDE +-#include <bson/bson-private.h> ++#include "bson/bson-private.h" + #undef BSON_INSIDE + #include <fcntl.h> + #include <time.h> diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-no-uninstall.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-no-uninstall.patch new file mode 100644 index 00000000000..64a90bbe3ec --- /dev/null +++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-no-uninstall.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7a0dfe..22d1f4f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -271,7 +271,6 @@ if (ENABLE_MONGOC) + VERSION_CURRENT + VERSION_RELEASED + # This sub-directory is added later, so manually include here +- generate_uninstall/CMakeLists.txt + ) + + set_local_dist (top_DIST ${top_DIST_local}) +@@ -341,14 +340,8 @@ if (WIN32) + else () + set (UNINSTALL_PROG "uninstall.sh") + endif () +-set (UNINSTALL_PROG_DIR "${CMAKE_INSTALL_FULL_DATADIR}/mongo-c-driver") + + # Create uninstall program and associated uninstall target + # + # This needs to be last (after all other add_subdirectory calls) to ensure that + # the generated uninstall program is complete and correct +-add_subdirectory (generate_uninstall) +- +-add_custom_target (uninstall +- COMMAND "${UNINSTALL_PROG_DIR}/${UNINSTALL_PROG}" +-) diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0.ebuild new file mode 100644 index 00000000000..2537001423d --- /dev/null +++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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/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}-no-uninstall.patch" + "${FILESDIR}/${P}-enable-tests.patch" # enable tests with system libbson +) + +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-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/bson/ || 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" 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 +}
