From 05ae5a0901ae037d4613caf803244707b072acda Mon Sep 17 00:00:00 2001 From: Tomas Mozes Date: Thu, 2 Aug 2018 09:14:31 +0200 Subject: [PATCH 1/2] dev-libs/libbson: bump to 1.12.0 Package-Manager: Portage-2.3.44, Repoman-2.3.10 --- dev-libs/libbson/Manifest | 1 + dev-libs/libbson/libbson-1.12.0.ebuild | 41 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 dev-libs/libbson/libbson-1.12.0.ebuild diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest index 2f5fae2c40010..63ab6c51e6e18 100644 --- a/dev-libs/libbson/Manifest +++ b/dev-libs/libbson/Manifest @@ -3,6 +3,7 @@ DIST libbson-1.1.10.tar.gz 4431658 BLAKE2B 1e542797c6617296c0ca7cb6dbbd34be5b317 DIST libbson-1.1.2.tar.gz 4492014 BLAKE2B 684c5053faf5a7f3afe6063e34247cfe7709afe0c17e8f387cfb337e6cc62e7b79c3cbf018e245bc189899e094858e1caff156344e126ba889964b1112820d21 SHA512 03e2ee337445286c14b846cd7545707959b1d351fa466c6292379a85e48ea1a171dae37dd7aff092212239ad59aac6f1ab216ee5de74ef00a8a2a124559e34da DIST libbson-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603 DIST libbson-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e +DIST libbson-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f DIST libbson-1.3.5.tar.gz 4547720 BLAKE2B e5e258344aea0969ac74d88d040a464b72d460a13776c5c8c639e569ed3208fabd2641e850bf035c6889b466ddcc33d487da0aeab58f308bee7446b5fd0a31a1 SHA512 b55ae1d424f786aabed6567a77cd09aa26c74ab0a09392e88faef8c156b1650c026f86f245bc8431a0ebcf404c4f80eb1b22e978a24289d32692c84375a66596 DIST libbson-1.3.6.tar.gz 4546329 BLAKE2B fa9102cd02e40e0ddb7518d34502f6ff63109b91af18a2285422530dae8c6cc04041b7589f340f2e6ed7a80e2474fea2684001b7ced5e8c911d4ba51e1a6edcc SHA512 a7da914ed0f03212d4fb01879543f0b2c7629923e33200fe30335a9a90a1082ffa2566c7a556b90a6c7ffbef5665a45ec67f87ffff2a5fcb89830769b1df5130 DIST libbson-1.6.2.tar.gz 4835257 BLAKE2B ebe20a6c9ac8a4fcbd8e838d1a7cd319a6b31956690aa2dfca2be42eaafb646405ea01fe2bf20b2dc21bf933c0eafc330fd45409f7c902a7bf0c0641cfe0891d SHA512 f95f5bb829cff3aac6c1d95a159e38396d8fccef66d3026dac8085ba13ec376274cddeb92277d711ac4d40cafd8b89b73e9a9d1cf29e22f7f79aa9422c69488b diff --git a/dev-libs/libbson/libbson-1.12.0.ebuild b/dev-libs/libbson/libbson-1.12.0.ebuild new file mode 100644 index 0000000000000..e229e5ac1bdd2 --- /dev/null +++ b/dev-libs/libbson/libbson-1.12.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="Library routines related to building,parsing and iterating BSON documents" +HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson" +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 ~ppc ~x86" +IUSE="examples static-libs" + +DEPEND="dev-python/sphinx" + +S="${WORKDIR}/mongo-c-driver-${PV}" + +src_configure() { + local mycmakeargs=( + -DENABLE_BSON=ON + -DENABLE_EXAMPLES=OFF + -DENABLE_MAN_PAGES=ON + -DENABLE_MONGOC=OFF + -DENABLE_TESTS=OFF + -DENABLE_STATIC="$(usex static-libs ON OFF)" + ) + + cmake-utils_src_configure +} + +src_install() { + if use examples; then + docinto examples + dodoc src/libbson/examples/*.c + fi + + cmake-utils_src_install +} From b532f93d07e5e767129f735486709ede82f50b2d Mon Sep 17 00:00:00 2001 From: Tomas Mozes Date: Thu, 2 Aug 2018 09:16:17 +0200 Subject: [PATCH 2/2] dev-libs/mongo-c-driver: bump to 1.12.0 Closes: https://bugs.gentoo.org/662654 Package-Manager: Portage-2.3.44, Repoman-2.3.10 --- dev-libs/mongo-c-driver/Manifest | 1 + .../mongo-c-driver-1.12.0-libressl.patch | 15 ++++ .../mongo-c-driver-1.12.0.ebuild | 88 +++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch create mode 100644 dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest index 0479e6f960fa2..d2b17209e15ee 100644 --- a/dev-libs/mongo-c-driver/Manifest +++ b/dev-libs/mongo-c-driver/Manifest @@ -5,6 +5,7 @@ DIST mongo-c-driver-1.1.10.tar.gz 5321144 BLAKE2B d63ba4b1a256b8b29654398a53d9ca 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.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f 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.12.0-libressl.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch new file mode 100644 index 0000000000000..e61bffafeed65 --- /dev/null +++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch @@ -0,0 +1,15 @@ +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index d09d706..5d84225 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -109,7 +109,9 @@ if (NOT ENABLE_SSL STREQUAL OFF) + if (LIBRESSL_FOUND) + message ("-- Found ${LIBRESSL_LIBRARIES}") + set (SSL_LIBRARIES ${LIBRESSL_LIBRARIES}) +- include_directories ("${LIBRESSL_INCLUDE_DIRS}") ++ if (${LIBRESSL_INCLUDE_DIRS}) ++ include_directories ("${LIBRESSL_INCLUDE_DIRS}") ++ endif () + link_directories ("${LIBRESSL_LIBRARY_DIRS}") + set (LIBRESSL 1) + else () diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild new file mode 100644 index 0000000000000..06783997aca2a --- /dev/null +++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild @@ -0,0 +1,88 @@ +# 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}/${PN}-1.11.0-enable-tests.patch" # enable tests without libbson + "${FILESDIR}/${PN}-1.12.0-libressl.patch" # Bug 662654 +) + +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" 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 +}