gentoo resync (3) : 24.07.2021

13 files changed, 150 insertions, 8 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 86f9e0119357..f1a7ee4b44a4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 23aea2d7f258..26c60214ad08 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,5 +2,5 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 EBUILD glib-2.68.2-r1.ebuild 10165 BLAKE2B 70156b306a52ff61a7f0c998849d28bd088b118e560029b73d9f163b180f02e45d63d9093d78eee4632ee34fb899900fa480b2bd456754c8855f221ce430d28e SHA512 33b9630d5ef59b88f39c62fb1f23c571b7ddb04f46417099037e89565a04f981b611e7b81c99075b8c6bc2c6571792d1dce25459484d1577ab7444cc18e2c2f2
-EBUILD glib-2.68.3-r1.ebuild 10158 BLAKE2B 6389016649044a32b581f89a70d16b47cee76085fbc3720527fa43c2abe4194f96def593382880713e01b6d36fdc9e34af4f8f321a3ad54166bb2318d81ad119 SHA512 614ae63f6fdb9b8935db9a81115e4b0dbf869c6ed953f655e98c0d815b4b24c5c5d7dbaea910fdf9082ddc7678f7d1267dbece61c944eb73cecba1bf2b4748cf
+EBUILD glib-2.68.3-r1.ebuild 10156 BLAKE2B 8208bd7df122b064999f881986b197f6735adbc471eae69e75215b1ab6fedbea8d648e0985c233a6db0e4c5d9287fe88890aaece7eb5ba464ecb061f37b55ece SHA512 da8538e163209a2d3c19f1b35b9972ce8812d81d7f985bb03f2e7d670945b6e8f40eb8ba3ddedaea523f26259d86ea7b4961ee91b92b45b5d311690e50f70c5a
 MISC metadata.xml 1220 BLAKE2B c3ee6985e9ad87e30da951c79a900c6b0284a84b11bde92d4bd345c679e49b084cb1dac7f1ea4b9f1d0d8170a067565f1758ba5fc51c9e613372f0b72643effe SHA512 541b49b565499a9cbe4062a0270b08d60ee9d9cf36ca53d3339f7ae1d406db825b84c193f363181afeaaea7ab6560d7aa0d62ca85d02e5521bd6c12f14a9ba56
diff --git a/dev-libs/glib/glib-2.68.3-r1.ebuild b/dev-libs/glib/glib-2.68.3-r1.ebuild
index 6f3ad8f65d70..4491252a2ced 100644
--- a/dev-libs/glib/glib-2.68.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.68.3-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 71373ed09afd..2ab46fdba2df 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -3,6 +3,8 @@ AUX libbson-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1dc63673
 AUX libbson-1.16.2-sphinx.patch 390 BLAKE2B e7ddac61c4f0b766d39149b0eba136c4c1f2a553b12516d7009be71ecfdc27fe189d10f54b602be4cf6ec608118b61086a34bc1acbe707a72a21484c3aba156f SHA512 4a8aaccd99117953c9351ab7da8e4ae1f420d2b053f4b02da98ee36bf3e7efd9095d81e67f16c3babd48ac56a21e92da653774d5914bdfdbecfd3656c441687f
 DIST libbson-1.16.2.tar.gz 6888287 BLAKE2B 40d2b73f495a8c71ca8b3c39c1b3c85b4a01ea088428967ed49f4758ef749e3288b046bde767a83aad022933f30f7307a4be65141f477bb1dcf912b4099129d6 SHA512 0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a
 DIST libbson-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207ca6dcc8ecbaedb24b33ddf7ada93b913eae33a802245f386d75fef01bf53c2d9630e68138a5715de001b7acea7dbde05f1 SHA512 49889b9d777dc3cb151b9cbef7bc2dd1785e327ae641569281efcc040d208cb034da3a74ae1115a033cc86e5b70079dab76c3478df8f171cc083d686f7568858
+DIST libbson-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
 EBUILD libbson-1.16.2.ebuild 1105 BLAKE2B dbf2c09216d0b1d3cabc583a80f2d7f4f67519eadb8d27709c46aa6dea3eec658f3fb3ee8dd78972ab1cca25ce548d93328d7e4e53ea5597b338ba5405b05a7b SHA512 4e31f2d52cf21dfb17a067fc4928f918433e26b1f535323861d92f7dca6805a8c0a142a5c8b069bcc29146d419fedc0e4632717c0aeea72d634b0c2634f85490
 EBUILD libbson-1.17.0.ebuild 1040 BLAKE2B e46d4b49d5e9a5cbc938f43cea74dc42ba7449552554a891cc95fb82c83414c0e69aa0a5e76c1e9cab37c87c7ec5209890b0b0cd517f5aa90b1a46ffc622a005 SHA512 5d04ebc113ec3176c5216e19c451750d554f9eae7c61bc7b3fbfaca647de5085b0201dcac316083bbd1ce9c5339a3ee3b38aad1e636e2d0492b70bbda61fe5d6
+EBUILD libbson-1.18.0.ebuild 999 BLAKE2B a2bdba01698cddc2534390a8715f015846aeb6602eb6552405f7b42546b60f062a1e46972c40dbcd4edf0ba0acc7d58761dfeed96c86601c7a6fc7b254e814a1 SHA512 da221f32965eb196eb7e828cb20d975e70eff0deb2fa4436f7058dbc5c4ab87bd696f21c87f0644e60601d4106ca4ed46bf9a99fb68bc874690ced2d428e0ddb
 MISC metadata.xml 333 BLAKE2B 25979b807deae1e87e62fa985ffc6d01853a50340d694ac6b4383854df15c26d1c7faf3a4abefd195a7525ed95e255b9beeef5e22a25fb936244de1029fd0480 SHA512 bfe49ec533a23f950bbd560e65fdfa0c5c839d189a53ffc3135242c5bb262141f0c89cc69d7578fe9b3ea9116b70d55d1c362a1090f069e54e54bd03c51f6265
diff --git a/dev-libs/libbson/libbson-1.18.0.ebuild b/dev-libs/libbson/libbson-1.18.0.ebuild
new file mode 100644
index 000000000000..13a9c702639c
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.18.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+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/releases/download/${PV}/mongo-c-driver-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="examples static-libs"
+
+DEPEND="dev-python/sphinx"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
+)
+
+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)"
+		-DENABLE_UNINSTALL=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libbson/examples/*.c
+	fi
+
+	cmake_src_install
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index e523c0a1df16..13203ddcb968 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,5 +3,5 @@ DIST libinput-1.17.3.tar.xz 612892 BLAKE2B 1acae8a5bc0f87b547c83a0f72e0693ac95cf
 DIST libinput-1.18.0.tar.xz 616732 BLAKE2B 4f12080b5e3496fdb5ccb1375a073860c26037ba47033a7d2d69a2f817b4ab5791aa89be08b193925cddd566a04144c73399cbb196a4cc9d3e07dcfb806d3eff SHA512 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90
 EBUILD libinput-1.17.2.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
 EBUILD libinput-1.17.3.ebuild 2245 BLAKE2B 768a84dcd6be0ae87051dfd9c98359a55a670aacaa60fb06a3d8b0f9d79a41de9a975deb34cab36bfb5b8642042a2d3de579285f50bf88868bf64ad91585ab5b SHA512 795e1e94d5bc32b46e21dd19887991c22d9bde48602d74820bb925e55d1ac7e996aaea0e64fb077515bc5dfc39a6e15d5ac2668719cd406991a1e5127d48bcce
-EBUILD libinput-1.18.0.ebuild 2241 BLAKE2B 14f411a26e778392c441c2dce4b7cf53e51f3098ab69b8a28244b4ebbb413b8b557158b4e7b38626d1d5ff6233b7e96219b9ad5756482a9d8c700855e551349d SHA512 4bd4aa63c5c3d0cae88bb161613091094d58ef7aa86f30b07f0460a7af710f92a31ade7d76660d61ffd496ab1075d3eacbfe76920473ea8e7c7c00eadf5a41e3
+EBUILD libinput-1.18.0.ebuild 2239 BLAKE2B d34a5eec17d919602ba721e15e3d49889a0bae875aff92407103ab470c11c692e498fb6df9c0ccb26802af800d93dd334d3da565c0892afe2754c3db471763ba SHA512 ce2833d7343515dc0f1d76b338a4fd19f28e5c33f7272c66ffa8044d9aa83714a661159a9f8e4962776486a2e4cddb8430c804f774ece519fe77ea3822d428a6
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.18.0.ebuild b/dev-libs/libinput/libinput-1.18.0.ebuild
index 47c3c7362ce4..f757d3635d37 100644
--- a/dev-libs/libinput/libinput-1.18.0.ebuild
+++ b/dev-libs/libinput/libinput-1.18.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index cae407c7fc1a..1add3b4314c5 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -2,5 +2,5 @@ AUX libtpms-0.8.0-Remove-WError.patch 472 BLAKE2B 08bf1379957d35b123180d0e2434ee
 DIST libtpms-0.8.3.tar.gz 1254474 BLAKE2B c71f52d6475d4328e93a35f88557de3400308984ec086f7e6b3c32ebc266e078b3a9864396546ba11fc310c1572efa1521bdac89075c5eba18cb35eef883e706 SHA512 07cf78c2a5b03f3c9179b041db57d5ec049dc0085c09e4fd5c9b54a247cf81a3b9982f0fb1cd571cd6b21b3d9824b061f8f38508fc25b6a23a6a6b06dea7115b
 DIST libtpms-0.8.4.tar.gz 1255255 BLAKE2B 0786b19dc8f3226508548ab16544ee8ac05e8d9de057eed840a0cb7577c1d1386d83af1a725ec91e64344e2459f9d4836268e2c9a097136cf76d59ea8e23b0c8 SHA512 58244a774cb6ec5dcbbc2d795628fca9eb64936874c72b169ea8288f2bf0cafa8127b1e89ed3ddbf5694df5a5944a7d61254dc729d75b63b3e4f9346b2f0a7b5
 EBUILD libtpms-0.8.3.ebuild 1197 BLAKE2B cfc4d452f26351fa66f744a42f1f24e2c2aa9e464f9189848ef24a01dd94bdbac7a609827407e0e062e90c6bd36646c4bca6aa76a2c52d3d5d7af93f8ae869c2 SHA512 714e720d1895494a214b86fe534f26c7bd28ea5bac0c0eb381e770952bda0f0edaf46bb7eb9cecfe11e5d2a6f8a7bc7c3bd97c00bc2cc8f2fb4656c3fa24f9a3
-EBUILD libtpms-0.8.4.ebuild 1289 BLAKE2B 5721991eb5d0fa307c854cb59c2666be4f4253817d0c5388da44e74ca4089ed32f681429cf45c571659781964e213bf0a0d44bc8f317a2d18e46efb21aec7881 SHA512 500846d4211cdc5d294d56fd4ec6db837bc7e6196ed0252763c1eb3eb1f32cc08f3fb5bad1220d08a64d4595a29c9704ebde5971d4d65ec0a2afd44e253975ea
+EBUILD libtpms-0.8.4.ebuild 1296 BLAKE2B 64ca98b9db516e37c27d4305720a363edaa0640f5838bfdc540b693eef49e2c261912b7e36f8ea3e3f152d918cc19ce25cb7131c0180b6558baaac9cfa531d40 SHA512 8dc99c8cc095b24db6320aed128000914a69caec4cb0e8ef053c2b46afb109b908ae53033bfcb4649a8680f9df13cd526a5f46c76062ebf450aa9ccdcdefe62c
 MISC metadata.xml 535 BLAKE2B bae20f8be44e80b54b497276a1913da891e9c1bf3e61d3ecc41c0db089ba78424dd470d2b3d9e6475f772d786c44b390cea07dba2498521fa5316144622bc4f7 SHA512 ad2c131b3183613382d1ecfb0b24b02ff3f1d2b4901ad586289298816ef39d4604e82ea1065df54f35883e0cc4052c0510f6971220df8196fe9477a105e50f68
diff --git a/dev-libs/libtpms/libtpms-0.8.4.ebuild b/dev-libs/libtpms/libtpms-0.8.4.ebuild
index 3eab05684d98..5efa7fe4f9ee 100644
--- a/dev-libs/libtpms/libtpms-0.8.4.ebuild
+++ b/dev-libs/libtpms/libtpms-0.8.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index d534dda5c898..09751a3810cc 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -4,6 +4,8 @@ AUX mongo-c-driver-1.16.2-single-doc-job.patch 845 BLAKE2B e0b49afc8e8085697ead1
 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 2342 BLAKE2B 521390b5b8cfa595ea71e0607141297bc5a3fcc02eb7fc8cbd20cc3b0e0319a38dfe71c7ca2183f2b25eea5d1cb44ed8429f35b2f1b5af0d602c376b5323861e SHA512 338aa7b92fd32af9a0f4291c627b81f9a7a9fab2b246eb9ed02e5669523e2c6f43191ad7d04826603cd8fa49a862581c6222953c3fd78c4eb41ba215ff4d2393
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
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
new file mode 100644
index 000000000000..706008e92748
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0.ebuild
@@ -0,0 +1,92 @@
+# 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
+)
+
+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/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 402a60d4e93d..7fcb2200f469 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,5 @@
 DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
 DIST vala-0.52.4.tar.xz 3577796 BLAKE2B 20f541f5429ef52cdcb4b0c5559dc312f62276ac6d91b3ca97f5bce4b954f7d0407637131e16db5a9f059f5ee3e7d44a414cc06311d49c294f22789db821ec79 SHA512 3c7daae4d26e6940b0735cee84f1a25f2aab12c93d2a8a9e9edec45c0c9dc9184cc790acbae19aba0fb31dfd7115afddcf8b9f09b0423b5b6950900641f4c527
 EBUILD vala-common-0.52.3.ebuild 645 BLAKE2B c2aaa245d9dc1670a714656177d4fb4e1ef5e9b6858d68636977e198f783151b17958feafbede1a79c45e222e8dd7a67b0d679ff0b7eecd9404611439cbb22c2 SHA512 b44a9a161a22a33a821e5cd3d10b97d7c6390de583eb4708b17b80f6a25143be7a87d26d754dc2e4963655c32adf1e0ce38710df29bd20367a10cdddc17f5815
-EBUILD vala-common-0.52.4.ebuild 647 BLAKE2B fa5e9ec87d657f28722b5733f2a435e38a2f168b35327315fc8a63e3ddf9dcea48feab6156a3312c0bfb194337f9d0f5581e7911ca6ee441088b768858a8be1f SHA512 b11638f4c7c39288dbdcaf35225efc7fdf14fe332f2d1210d30e3d601c99740a3ebc2df7ec47ed7f0e0ab411cea402dbdefb124c238ac4e098b83d6b98a3ac1c
+EBUILD vala-common-0.52.4.ebuild 645 BLAKE2B c2aaa245d9dc1670a714656177d4fb4e1ef5e9b6858d68636977e198f783151b17958feafbede1a79c45e222e8dd7a67b0d679ff0b7eecd9404611439cbb22c2 SHA512 b44a9a161a22a33a821e5cd3d10b97d7c6390de583eb4708b17b80f6a25143be7a87d26d754dc2e4963655c32adf1e0ce38710df29bd20367a10cdddc17f5815
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.52.4.ebuild b/dev-libs/vala-common/vala-common-0.52.4.ebuild
index a2d77e324096..71dbcfb591c6 100644
--- a/dev-libs/vala-common/vala-common-0.52.4.ebuild
+++ b/dev-libs/vala-common/vala-common-0.52.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""