gentoo resync : 05.12.2021

6 files changed, 2 insertions, 236 deletions

diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 460ccce529dd..805660b7424e 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,11 +1,5 @@
 AUX mongo-c-driver-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
 AUX mongo-c-driver-1.16.2-enable-tests.patch 1167 BLAKE2B 750a692000dcb2abfc38d477dfa5df091ade3ffdf6c72f7a71e0c2da17c8ec875fefa6f049a7f57cfafdcebd7fe044fb6d68582b33845debd877de4760b86e57 SHA512 fb44a8f33f7905dfa71cc5bc0a9198872f008b499af3102f289fe46b57504abbf3eb4ec337d916dac1bd0284e3e955c4a7e75db1256e5b32e628443ffc447f29
-AUX mongo-c-driver-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1dc63673cbe0e25dc21e32cb418abeeb65ef2569d2e794e8141be5f6489f53423e1bf8dc70c343b18388b258f7179e97de0b9fb9abb3 SHA512 3a2e93b80ca63a8d13c10f1a530140ba2647676d1f955957833d71e50c05fba6a45400e294b2bbe324a1af9403ab07fdc1947e70835878e782252a2bad9276dd
-AUX mongo-c-driver-1.16.2-sphinx.patch 390 BLAKE2B e7ddac61c4f0b766d39149b0eba136c4c1f2a553b12516d7009be71ecfdc27fe189d10f54b602be4cf6ec608118b61086a34bc1acbe707a72a21484c3aba156f SHA512 4a8aaccd99117953c9351ab7da8e4ae1f420d2b053f4b02da98ee36bf3e7efd9095d81e67f16c3babd48ac56a21e92da653774d5914bdfdbecfd3656c441687f
-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
-EBUILD mongo-c-driver-1.16.2.ebuild 2453 BLAKE2B f18643407983f1fe8316a774496038b21a05812fbcc81927ac895ae42d6e0ee5ad7c4c8894256546f51de185471d2f4480336674c8ebd6239078b722948aa69e SHA512 2d6036e5715c35d56bc7470bfbe1ad40310bfc0e416326ff0197f71721ffec1747c26a7bd4d746117cc945c06e8f578805389bbdd6eefa0c336a97ad03c8cfd6
-EBUILD mongo-c-driver-1.17.0.ebuild 2383 BLAKE2B a9e95ad7e0e00b4732512c03d1ec176499ef99572d1a940604f455280e56388fbcda2568c00976d8496ca8bead4928247d296f916eb06f2d3fe8be3b493f64f3 SHA512 c8a29735a595fc40e919b47bcb6442accf25dd214bc9eb3e4c6621ba6dca6a07fe7e039bac717fde489aafb3b34419a1622ca72973e30c41bc59fd499e1c6131
-EBUILD mongo-c-driver-1.18.0.ebuild 2348 BLAKE2B 97726ef54d3ff2629b18fdcf17b9e072710b48e79700b2624b09e01c4aec291e8f7660391e114e262a6ee7129b50f8ad28c7f41a472d9ea2fe2c8502c133c7b0 SHA512 068408831d873afbb044fd3d18ceabfe8ef654bf91928a1ca2aaf7aedaea143db117472c32a79a1eb849ade04b82a1dd973c7182e20b109475f93d5bec23e06c
+EBUILD mongo-c-driver-1.18.0.ebuild 2347 BLAKE2B 26e3905ebe7500905417774557e01347c511f5908a7fe0ebf17cec7d63a86374eb6b26b963a5f2352733866363d84ba2179bf05c3e0e4b9bbaef0ccececaeb4c SHA512 5b64720f9e32369f970124c5995cba920a48348454e336e3fd451a7f235fb04c30b9a871bae2458841d723ea61e06669e198fee3bcbc01b953399a947a53c03c
 MISC metadata.xml 335 BLAKE2B d7b8f44f6698d86dbad1ae9fc535f6c75acb827b07d32af1ba02c94da5196f00f1c3c2d2f519ca388d586867c6b033a3c53d3e3f5856ba32efed730c34316642 SHA512 7c0bf1f1f5065e82ebb03a00b68d41888fbdf4b92c67b116e46016490fbc74c5a44ca8f8245217a7926e85f5d53bc3bcab7499d5ceaf4d4593ab9953e36fc2a1
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
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
index 1a2be6118fd0..d81423af7651 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv ~s390 x86"
+KEYWORDS="amd64 ~hppa ~riscv ~s390 x86"
 IUSE="debug examples icu sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"