gentoo Easter resync : 12.04.2020

14 files changed, 376 insertions, 28 deletions

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index d683128cfc07..7490af8b9393 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -22,15 +22,17 @@ DIST mongodb-src-r4.0.16.tar.gz 50091501 BLAKE2B a383f9fef8e5b2ceda9646dfc4f4f46
 DIST mongodb-src-r4.2.1.tar.gz 60922510 BLAKE2B b06141cf0a8d256fc24e64c7115093009f42a97c74d270997ad4a70fb040199db05c5083cf1639283cc253264fbeb975d7efe3a41227d75146d7aa2e2fb9fa12 SHA512 6057f68ebeb2d5f74e70639fcc08aecfb112d386e3d016e18dfb2413319abf46249a0f5ffcfb74be9264a2ef34f45dd96f9774d86b1ec7e7213276f1c84f3106
 DIST mongodb-src-r4.2.2.tar.gz 60991680 BLAKE2B afd31a60929ebfe9c02abee92fd4814c178b03e4e88e10069003fd3e1813481e9cc967e8b4d15b87b0fe703df7fa42a70f60db33cf84ecbf1decfd6657e28ba1 SHA512 30f1e20fbe45ca136869f3fd7e54f1cd65d1544c0693b9945a0036a50257cfc12915a17bf79267500496b5acf3cfa24f406114ea7180b7abee89cd62de5eec80
 DIST mongodb-src-r4.2.3.tar.gz 61565615 BLAKE2B 695310a497e57f1c735f175f5b321c93cda376ec734bb08d4cabbd562a865b327f529560220be9c22f571cc70af333a77f0116f04c7f7e3a40f275ab53ab1bf9 SHA512 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69
-EBUILD mongodb-3.6.13.ebuild 4257 BLAKE2B 0643b2cca9c231b3b8093e1cc4d0e4b7ff2bd6504251f8c7dd706bd15f59548bb4f8462e5547b3e97da5aed385f0179807cef36060211bcf069feec4b251425e SHA512 edbc5d01e606bd324ea505e02d8216b68250bab78dc26b932203df625621d9f27847b8fefc5e0bf7256be67ccde8fe0a56d28ed59b5e0d79e3b68d454b454cf4
-EBUILD mongodb-3.6.14.ebuild 4243 BLAKE2B 8cb508eb72021f1c96104f55df266505b9b77087ca130645c991e1594427f41d2b20b9843fe8c8de7f9469b5d31a46556b546723bc6d653ed897b43255543fb8 SHA512 72997ea27f0cfae8761150a6416465868b27544bd341e01adf76f53f1d3f79139196581c0034740aef49aa9172bcb582f4b390fb1413e2f5a42b9c91aea07f2d
-EBUILD mongodb-3.6.16.ebuild 4243 BLAKE2B 8cb508eb72021f1c96104f55df266505b9b77087ca130645c991e1594427f41d2b20b9843fe8c8de7f9469b5d31a46556b546723bc6d653ed897b43255543fb8 SHA512 72997ea27f0cfae8761150a6416465868b27544bd341e01adf76f53f1d3f79139196581c0034740aef49aa9172bcb582f4b390fb1413e2f5a42b9c91aea07f2d
-EBUILD mongodb-3.6.17.ebuild 4243 BLAKE2B ab016ce9ee393d09e0e8067cd32c013745318342a9963cde20e7bb7dfcf171c120b06a2364446dd0e696bb5e73c268c3f1e1b97c31da0274173ef38049aef39a SHA512 29349128d64b2809c14b8cfc187a23828be4889096fc724f265284134ca124e43a2a05186396b1388168f721441706890722386b5d8464d7216d6535cbbd7966
-EBUILD mongodb-4.0.12.ebuild 4318 BLAKE2B be6dcb75ecb3654b980db1b893746ab6a33e537a9dac06b42e8f2defbd75aaab3b7d32b63f67cb97b886f79c74363199651377580c7b76160e2ecba993ab78fa SHA512 bf45a240826725c47dbd8475c01d24da966c44027cadb73b28b2fa536f45d9dfb714a50393b09040dc928f0c676b42a89d3ebace2d63e0a78443d434eb43b235
-EBUILD mongodb-4.0.13.ebuild 4244 BLAKE2B e045a5c70486076096254161c8633d9a144bee7088991b85d3b26d5264fd553f70b0b14df841b618159ec3074a845866756de4a9bd69acbe829e8889b83d5d36 SHA512 820958bad65597051874f2519b52a15f4fe52f3921074137d1642cc9f310e6508588c7b6c2e34eb1e56cf463a93fd4c36d2c3bf9dbdf68dddb7399029a8db1ca
-EBUILD mongodb-4.0.14.ebuild 4244 BLAKE2B e045a5c70486076096254161c8633d9a144bee7088991b85d3b26d5264fd553f70b0b14df841b618159ec3074a845866756de4a9bd69acbe829e8889b83d5d36 SHA512 820958bad65597051874f2519b52a15f4fe52f3921074137d1642cc9f310e6508588c7b6c2e34eb1e56cf463a93fd4c36d2c3bf9dbdf68dddb7399029a8db1ca
-EBUILD mongodb-4.0.16.ebuild 4244 BLAKE2B b85189caf3152d8ebe79f7e9dfa54f653c1e77b07345e3d55834578e8365d5092bb99cb2391c8681498afa4f68ea2f32e6e70bcb72a9a9339144e46e5265daee SHA512 bb312c91bb4e8931d97f3af5096850812de183c9997e8fa5e9f3d0e6f7c926b4c9eaf49edac686fbb7ee8e6d321cc46cdf015efd85861504b1f099d2725b2eb0
-EBUILD mongodb-4.2.1.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
-EBUILD mongodb-4.2.2.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
-EBUILD mongodb-4.2.3.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
+EBUILD mongodb-3.6.13.ebuild 4253 BLAKE2B 9c549c4a4f86d0642845b704af18c2f6e813ac71c188b1cc770b188e634dc388368607f92bc164afb24f0e4de09ee77d52a126450a89fa0af3f0254f6d8258d7 SHA512 aeacc08eb48dbd86141d694b1a71579b79da29cfc9f1f2e7727c25ccbb47bdc3f9b4d0091fd269ef04aff7bfce27059ac4059e7f7c14f8258ccc194996999c3b
+EBUILD mongodb-3.6.14.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
+EBUILD mongodb-3.6.16.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
+EBUILD mongodb-3.6.17.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
+EBUILD mongodb-4.0.12.ebuild 4314 BLAKE2B 6e1d33a0d5e3948e2c6d7258379050b8b090a2debd04623f7f51a1e35a54fdf6fe3407eb6ff7afea121f8274f329564f192e26104d2173a08b5ad31ca52f669d SHA512 4509e201ec92554b3b5cc7c2f1d2daba1195357e8e064ad2f639667136194f2c683a420b95a69d086f8abc00da32daab64e33b921a5278eb4ea095022d2048e9
+EBUILD mongodb-4.0.13.ebuild 4240 BLAKE2B 70ef636c1c4d69adf066f0cdc5fb80417649bcde429c21ec67dc11c1ff72a1114778443fbf5758ea9f495cf654258568635b6f30de2ff81f478a8753072186b9 SHA512 604bb7090f98b5e8bb00d5daa7a6a9ec56a0e8a6fdbb46159eb721e5fd8bd47fe4ce7cf7fb9586b44b3c3225fd24c5df09fa9803fe03717afdb95e005c846749
+EBUILD mongodb-4.0.14.ebuild 4240 BLAKE2B 70ef636c1c4d69adf066f0cdc5fb80417649bcde429c21ec67dc11c1ff72a1114778443fbf5758ea9f495cf654258568635b6f30de2ff81f478a8753072186b9 SHA512 604bb7090f98b5e8bb00d5daa7a6a9ec56a0e8a6fdbb46159eb721e5fd8bd47fe4ce7cf7fb9586b44b3c3225fd24c5df09fa9803fe03717afdb95e005c846749
+EBUILD mongodb-4.0.16-r1.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
+EBUILD mongodb-4.0.16.ebuild 4240 BLAKE2B 70ef636c1c4d69adf066f0cdc5fb80417649bcde429c21ec67dc11c1ff72a1114778443fbf5758ea9f495cf654258568635b6f30de2ff81f478a8753072186b9 SHA512 604bb7090f98b5e8bb00d5daa7a6a9ec56a0e8a6fdbb46159eb721e5fd8bd47fe4ce7cf7fb9586b44b3c3225fd24c5df09fa9803fe03717afdb95e005c846749
+EBUILD mongodb-4.2.1.ebuild 4254 BLAKE2B 35a011623e2261aed880acfd81c2454917faab2fe5e670501bf8ee1f3d1b5a6c62352d4a3560373a63730c5860507835517f393a78742870c4d65678824a2488 SHA512 a7de46767a57975f898769488388024bc00b2dd145ede78fbdec3cb475d98721d2c1262ce09180e5850b95c4ef09568c929980cef1b0e9829f9c96b27a6a4b2f
+EBUILD mongodb-4.2.2.ebuild 4254 BLAKE2B 35a011623e2261aed880acfd81c2454917faab2fe5e670501bf8ee1f3d1b5a6c62352d4a3560373a63730c5860507835517f393a78742870c4d65678824a2488 SHA512 a7de46767a57975f898769488388024bc00b2dd145ede78fbdec3cb475d98721d2c1262ce09180e5850b95c4ef09568c929980cef1b0e9829f9c96b27a6a4b2f
+EBUILD mongodb-4.2.3-r1.ebuild 4708 BLAKE2B c40333f8e7e1bff7fbea449320fbc18f8ec6985d7569c7db84a4481678e7a740b440e534f80520ee896741f2ecbe8119347913660d7a7b6369da1552131d5de2 SHA512 ca73f93c8b31f5580bf4696e769c551ba15635647cad4896fbb2fa17b42a34c022d9871edd6cb103e96a0243271c5986a40035de0b23583f621566781bf47039
+EBUILD mongodb-4.2.3.ebuild 4254 BLAKE2B 35a011623e2261aed880acfd81c2454917faab2fe5e670501bf8ee1f3d1b5a6c62352d4a3560373a63730c5860507835517f393a78742870c4d65678824a2488 SHA512 a7de46767a57975f898769488388024bc00b2dd145ede78fbdec3cb475d98721d2c1262ce09180e5850b95c4ef09568c929980cef1b0e9829f9c96b27a6a4b2f
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-3.6.13.ebuild b/dev-db/mongodb/mongodb-3.6.13.ebuild
index 88e6596fe833..85e64d7df806 100644
--- a/dev-db/mongodb/mongodb-3.6.13.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 	$(python_gen_any_dep '
 		dev-python/cheetah[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-3.6.14.ebuild b/dev-db/mongodb/mongodb-3.6.14.ebuild
index 346c4039a335..b5718c0c148c 100644
--- a/dev-db/mongodb/mongodb-3.6.14.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	$(python_gen_any_dep '
 		dev-python/cheetah[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-3.6.16.ebuild b/dev-db/mongodb/mongodb-3.6.16.ebuild
index 346c4039a335..b5718c0c148c 100644
--- a/dev-db/mongodb/mongodb-3.6.16.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	$(python_gen_any_dep '
 		dev-python/cheetah[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-3.6.17.ebuild b/dev-db/mongodb/mongodb-3.6.17.ebuild
index 8b60f64d9f55..b5718c0c148c 100644
--- a/dev-db/mongodb/mongodb-3.6.17.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.17.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	$(python_gen_any_dep '
 		dev-python/cheetah[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.0.12.ebuild b/dev-db/mongodb/mongodb-4.0.12.ebuild
index 1aac4e77094e..36602d5bac71 100644
--- a/dev-db/mongodb/mongodb-4.0.12.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 	$(python_gen_any_dep '
 		dev-python/cheetah[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.0.13.ebuild b/dev-db/mongodb/mongodb-4.0.13.ebuild
index ef4bca699aab..6bc6099a543d 100644
--- a/dev-db/mongodb/mongodb-4.0.13.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	$(python_gen_any_dep '
 		dev-python/cheetah[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.0.14.ebuild b/dev-db/mongodb/mongodb-4.0.14.ebuild
index ef4bca699aab..6bc6099a543d 100644
--- a/dev-db/mongodb/mongodb-4.0.14.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	$(python_gen_any_dep '
 		dev-python/cheetah[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.0.16-r1.ebuild b/dev-db/mongodb/mongodb-4.0.16-r1.ebuild
new file mode 100644
index 000000000000..651219492475
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.16-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3:=
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+	"${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
+			ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.6-series. Then upgrade to 4.0 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+		fi
+	fi
+}
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" ||
+			return 1
+	fi
+
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/typing[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.0.16.ebuild b/dev-db/mongodb/mongodb-4.0.16.ebuild
index 7542115d20f4..6bc6099a543d 100644
--- a/dev-db/mongodb/mongodb-4.0.16.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.16.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	$(python_gen_any_dep '
 		dev-python/cheetah[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.2.1.ebuild b/dev-db/mongodb/mongodb-4.2.1.ebuild
index d566c1d609b2..0d28fbb07359 100644
--- a/dev-db/mongodb/mongodb-4.2.1.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.1.ebuild
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 		dev-python/cheetah3[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.2.2.ebuild b/dev-db/mongodb/mongodb-4.2.2.ebuild
index d566c1d609b2..0d28fbb07359 100644
--- a/dev-db/mongodb/mongodb-4.2.2.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.2.ebuild
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 		dev-python/cheetah3[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.2.3-r1.ebuild b/dev-db/mongodb/mongodb-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..84df690ae769
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.3-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-libs/boost-1.70:=[threads(+)]
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" ||
+			return 1
+	fi
+
+	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	has_version "virtual/python-typing[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+			ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.0-series. Then upgrade to 4.2 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.2.3.ebuild b/dev-db/mongodb/mongodb-4.2.3.ebuild
index d566c1d609b2..0d28fbb07359 100644
--- a/dev-db/mongodb/mongodb-4.2.3.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.3.ebuild
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 		dev-python/cheetah3[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
 	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=