diff --git a/dev-db/mongodb/mongodb-3.6.2.ebuild b/dev-db/mongodb/mongodb-3.6.2-r1.ebuild
similarity index 99%
rename from dev-db/mongodb/mongodb-3.6.2.ebuild
rename to dev-db/mongodb/mongodb-3.6.2-r1.ebuild
index 5297f47b0f1a0..5604f58eafb7c 100644
--- a/dev-db/mongodb/mongodb-3.6.2.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.2-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-python/cheetah[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	<dev-util/scons-3
 	sys-libs/ncurses
 	sys-libs/readline
diff --git a/dev-db/mongodb/mongodb-3.6.3.ebuild b/dev-db/mongodb/mongodb-3.6.3-r1.ebuild
similarity index 99%
rename from dev-db/mongodb/mongodb-3.6.3.ebuild
rename to dev-db/mongodb/mongodb-3.6.3-r1.ebuild
index 5297f47b0f1a0..5604f58eafb7c 100644
--- a/dev-db/mongodb/mongodb-3.6.3.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.3-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-python/cheetah[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	<dev-util/scons-3
 	sys-libs/ncurses
 	sys-libs/readline
diff --git a/dev-db/mongodb/mongodb-3.6.4.ebuild b/dev-db/mongodb/mongodb-3.6.4-r1.ebuild
similarity index 99%
rename from dev-db/mongodb/mongodb-3.6.4.ebuild
rename to dev-db/mongodb/mongodb-3.6.4-r1.ebuild
index 5297f47b0f1a0..5604f58eafb7c 100644
--- a/dev-db/mongodb/mongodb-3.6.4.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.4-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-python/cheetah[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	<dev-util/scons-3
 	sys-libs/ncurses
 	sys-libs/readline
diff --git a/dev-db/mongodb/mongodb-3.6.5.ebuild b/dev-db/mongodb/mongodb-3.6.5-r1.ebuild
similarity index 99%
rename from dev-db/mongodb/mongodb-3.6.5.ebuild
rename to dev-db/mongodb/mongodb-3.6.5-r1.ebuild
index 5297f47b0f1a0..5604f58eafb7c 100644
--- a/dev-db/mongodb/mongodb-3.6.5.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.5-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-python/cheetah[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	<dev-util/scons-3
 	sys-libs/ncurses
 	sys-libs/readline
diff --git a/dev-db/mongodb/mongodb-4.0.0.ebuild b/dev-db/mongodb/mongodb-4.0.0-r1.ebuild
similarity index 99%
rename from dev-db/mongodb/mongodb-4.0.0.ebuild
rename to dev-db/mongodb/mongodb-4.0.0-r1.ebuild
index 2b90de087414a..46989477c5001 100644
--- a/dev-db/mongodb/mongodb-4.0.0.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.0-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-python/cheetah[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	<dev-util/scons-3
 	sys-libs/ncurses
 	sys-libs/readline