[gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-c-driver/files/, dev-libs/mongo-c-driver/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-c-driver/files/, dev-libs/mongo-c-driver/
@ 2018-06-22 21:35 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2018-06-22 21:35 UTC (permalink / raw
  To: gentoo-commits

commit:     142c1673e9bbc9ca0eb8d2bc87bf26fc06431adf
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed Jun 20 12:16:40 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 21:35:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142c1673

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

Closes: https://github.com/gentoo/gentoo/pull/8919
Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 0f187f8dd87..ace85a1ab45 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -3,6 +3,7 @@ DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84
 DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
 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.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.10.3-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.10.3-enable-tests.patch
new file mode 100644
index 00000000000..af26b695313
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.10.3-enable-tests.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2eeb6cb..aeaa23b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -109,7 +109,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.10.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
new file mode 100644
index 00000000000..e2009f3e717
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
@@ -0,0 +1,86 @@
+# 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-1.10.3
+	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-private.h bson-iso8601-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
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-c-driver/files/, dev-libs/mongo-c-driver/
@ 2018-08-14 21:32 Alexys Jacob
  0 siblings, 0 replies; 6+ messages in thread
From: Alexys Jacob @ 2018-08-14 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     b9dc8b675101482e1fd9da68e877cf2127fde71a
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Aug  2 07:16:17 2018 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 21:30:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9dc8b67

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 +
 .../files/mongo-c-driver-1.12.0-libressl.patch     | 15 ++++
 .../mongo-c-driver/mongo-c-driver-1.12.0.ebuild    | 88 ++++++++++++++++++++++
 3 files changed, 104 insertions(+)

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 0479e6f960f..d2b17209e15 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 00000000000..e61bffafeed
--- /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 00000000000..06783997aca
--- /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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-c-driver/files/, dev-libs/mongo-c-driver/
@ 2018-12-16 23:30 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2018-12-16 23:30 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-c-driver/files/, dev-libs/mongo-c-driver/
@ 2019-02-13 13:41 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2019-02-13 13:41 UTC (permalink / raw
  To: gentoo-commits

commit:     8dc5486bea3d89d664b179bcb7184430b7fb8402
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Feb  8 12:33:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 13:41:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc5486b

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

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11006
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-libs/mongo-c-driver/Manifest                   |  1 +
 .../mongo-c-driver-1.13.1-drop-failing-test.patch  | 17 ++++
 .../mongo-c-driver/mongo-c-driver-1.13.1.ebuild    | 92 ++++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 750896dd6b6..57acfd97ec7 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -7,6 +7,7 @@ DIST mongo-c-driver-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49
 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.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a49af102d44c8fb7678db82a41f915c984e95f5301f533dde63139221cb6e161fa5053b9fcc33080abe1095d9c35 SHA512 454670a145a5f2272daa5ca88f2e7d7e42c9b7df62dfc29b3c4b602ef8f819a740890c40872fa47dc411cc5ef9a34b55a6feea3657a802a5be378c4dbe79f42d
 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.1-drop-failing-test.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.1-drop-failing-test.patch
new file mode 100644
index 00000000000..6ef137fdba7
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.1-drop-failing-test.patch
@@ -0,0 +1,17 @@
+diff --git a/src/libmongoc/tests/test-mongoc-topology.c b/src/libmongoc/tests/test-mongoc-topology.c
+index d1ca7cf..245a470 100644
+--- a/src/libmongoc/tests/test-mongoc-topology.c
++++ b/src/libmongoc/tests/test-mongoc-topology.c
+@@ -1964,12 +1964,6 @@ test_topology_install (TestSuite *suite)
+                                 NULL,
+                                 NULL,
+                                 test_framework_skip_if_slow);
+-   TestSuite_AddFull (suite,
+-                      "/Topology/multiple_selection_errors",
+-                      test_multiple_selection_errors,
+-                      NULL,
+-                      NULL,
+-                      test_framework_skip_if_offline);
+    TestSuite_AddMockServerTest (
+       suite, "/Topology/connect_timeout/succeed", test_select_after_timeout);
+    TestSuite_AddMockServerTest (

diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
new file mode 100644
index 00000000000..7e327de1bdc
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
@@ -0,0 +1,92 @@
+# 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/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~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.0-enable-tests.patch" # enable tests with system libbson
+	"${FILESDIR}/${P}-drop-failing-test.patch" # one test fails
+)
+
+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; 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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-c-driver/files/, dev-libs/mongo-c-driver/
@ 2019-04-14 10:38 Alexys Jacob
  0 siblings, 0 replies; 6+ messages in thread
From: Alexys Jacob @ 2019-04-14 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     674f7d916bc4286e107ae103946f5c279eedcb5c
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Mar 21 09:42:06 2019 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 10:38:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674f7d91

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

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>

 dev-libs/mongo-c-driver/Manifest                   |  1 +
 .../files/mongo-c-driver-1.14.0-enable-tests.patch | 25 ++++++
 .../files/mongo-c-driver-1.14.0-no-docs.patch      | 15 ++++
 .../mongo-c-driver/mongo-c-driver-1.14.0.ebuild    | 93 ++++++++++++++++++++++
 4 files changed, 134 insertions(+)

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 57acfd97ec7..9ecf336d91e 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -8,6 +8,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

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 00000000000..76202b5e387
--- /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 00000000000..d33fba105ab
--- /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 00000000000..eaea5a9fc5a
--- /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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-c-driver/files/, dev-libs/mongo-c-driver/
@ 2021-11-29 15:04 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-11-29 15:04 UTC (permalink / raw
  To: gentoo-commits

commit:     1b5fc1de3359cf9e15522286b0bc189ebcdb9347
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 26 09:21:56 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 15:03:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b5fc1de

dev-libs/mongo-c-driver: Drop 1.16.2, 1.17.0

Bug: https://bugs.gentoo.org/791508
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/mongo-c-driver/Manifest                   |  2 -
 .../mongo-c-driver-1.16.2-single-doc-job.patch     | 22 -----
 .../files/mongo-c-driver-1.16.2-sphinx.patch       | 19 -----
 .../mongo-c-driver/mongo-c-driver-1.16.2.ebuild    | 94 ----------------------
 .../mongo-c-driver/mongo-c-driver-1.17.0.ebuild    | 93 ---------------------
 5 files changed, 230 deletions(-)

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 51ab9f632e96..57f1300f64fd 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,3 +1 @@
-DIST mongo-c-driver-1.16.2.tar.gz 6888287 BLAKE2B 40d2b73f495a8c71ca8b3c39c1b3c85b4a01ea088428967ed49f4758ef749e3288b046bde767a83aad022933f30f7307a4be65141f477bb1dcf912b4099129d6 SHA512 0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a
-DIST mongo-c-driver-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207ca6dcc8ecbaedb24b33ddf7ada93b913eae33a802245f386d75fef01bf53c2d9630e68138a5715de001b7acea7dbde05f1 SHA512 49889b9d777dc3cb151b9cbef7bc2dd1785e327ae641569281efcc040d208cb034da3a74ae1115a033cc86e5b70079dab76c3478df8f171cc083d686f7568858
 DIST mongo-c-driver-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606

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
deleted file mode 100644
index 933081b32a31..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-single-doc-job.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/files/mongo-c-driver-1.16.2-sphinx.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-sphinx.patch
deleted file mode 100644
index 7a165b61c59a..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-sphinx.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/716774
-
---- a/build/sphinx/taglist.py
-+++ b/build/sphinx/taglist.py
-@@ -24,7 +24,12 @@ THE SOFTWARE.
- """
- 
- from docutils import nodes, utils
--from sphinx.environment import NoUri
-+
-+try:
-+    from sphinx.environment import NoUri
-+except ImportError:
-+    from sphinx.errors import NoUri
-+
- try:
-     from sphinx.util.compat import Directive
- except ImportError:
- 

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
deleted file mode 100644
index 71b6b95d3474..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 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 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? (
-		dev-libs/openssl: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"
-	"${FILESDIR}/${PN}-1.16.2-sphinx.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 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
-}

diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild
deleted file mode 100644
index d61656b6f84b..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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 sasl ssl static-libs test"
-REQUIRED_USE="test? ( 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 )"
-
-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? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		dev-db/mongodb
-		dev-libs/libbson[static-libs]
-	)"
-
-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-sphinx.patch"
-)
-
-src_prepare() {
-	cmake_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 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_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_src_install
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-11-29 15:04 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-22 21:35 [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-c-driver/files/, dev-libs/mongo-c-driver/ Thomas Deutschmann
  -- strict thread matches above, loose matches on Subject: below --
2018-08-14 21:32 Alexys Jacob
2018-12-16 23:30 Thomas Deutschmann
2019-02-13 13:41 Thomas Deutschmann
2019-04-14 10:38 Alexys Jacob
2021-11-29 15:04 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox