diff --git a/dev-python/sphinx/sphinx-1.6.3-r3.ebuild b/dev-python/sphinx/sphinx-1.6.3-r4.ebuild
similarity index 98%
rename from dev-python/sphinx/sphinx-1.6.3-r3.ebuild
rename to dev-python/sphinx/sphinx-1.6.3-r4.ebuild
index 551ff31244cf3..7f1d945977a52 100644
--- a/dev-python/sphinx/sphinx-1.6.3-r3.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.3-r4.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
 	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
diff --git a/dev-python/sphinx/sphinx-1.6.5.ebuild b/dev-python/sphinx/sphinx-1.6.5-r1.ebuild
similarity index 98%
rename from dev-python/sphinx/sphinx-1.6.5.ebuild
rename to dev-python/sphinx/sphinx-1.6.5-r1.ebuild
index 340cc9bfdfefb..ad810d050f812 100644
--- a/dev-python/sphinx/sphinx-1.6.5.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.5-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
 	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
diff --git a/dev-python/sphinx/sphinx-1.6.7.ebuild b/dev-python/sphinx/sphinx-1.6.7-r1.ebuild
similarity index 98%
rename from dev-python/sphinx/sphinx-1.6.7.ebuild
rename to dev-python/sphinx/sphinx-1.6.7-r1.ebuild
index c00c5313640f8..dbbac7ab54b85 100644
--- a/dev-python/sphinx/sphinx-1.6.7.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.7-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
 	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
diff --git a/dev-python/sphinx/sphinx-1.7.5.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
similarity index 98%
rename from dev-python/sphinx/sphinx-1.7.5.ebuild
rename to dev-python/sphinx/sphinx-1.7.5-r1.ebuild
index e9a69465dfe36..b3a122f0e25d2 100644
--- a/dev-python/sphinx/sphinx-1.7.5.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex