diff --git a/sys-cluster/charliecloud/charliecloud-0.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
similarity index 90%
rename from sys-cluster/charliecloud/charliecloud-0.10.ebuild
rename to sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
index 8705c0ed4ae3f..b1560f0ec9688 100644
--- a/sys-cluster/charliecloud/charliecloud-0.10.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
@@ -34,9 +34,12 @@ RDEPEND="${PYTHON_DEPS}
 	pv? ( sys-apps/pv )
 	squashfuse? ( sys-fs/squashfuse )
 "
-DEPEND="doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+DEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+		')
 		net-misc/rsync
 	)"
 
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
index d86e0f7345fe5..042093fc1081c 100644
--- a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
@@ -33,9 +33,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	pv? ( sys-apps/pv )
 "
-DEPEND="doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+DEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+		')
 		net-misc/rsync
 	)"
 
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index 4b1d347531503..c838d73e90e91 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -34,9 +34,12 @@ RDEPEND="${PYTHON_DEPS}
 	pv? ( sys-apps/pv )
 	squashfuse? ( sys-fs/squashfuse )
 "
-DEPEND="doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+DEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+		')
 		net-misc/rsync
 	)"