diff --git a/sys-auth/authenticator/authenticator-0.2.4.ebuild b/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
similarity index 84%
rename from sys-auth/authenticator/authenticator-0.2.4.ebuild
rename to sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
index 07b119b2a4024..8926a63fc2d87 100644
--- a/sys-auth/authenticator/authenticator-0.2.4.ebuild
+++ b/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
@@ -27,11 +27,13 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	app-crypt/libsecret
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyotp[${PYTHON_USEDEP}]
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
-	dev-python/pyzbar[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyotp[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyzbar[${PYTHON_MULTI_USEDEP}]
+	')
 	media-libs/gd
 	x11-libs/gtk+:3
 "
diff --git a/sys-auth/authenticator/authenticator-9999.ebuild b/sys-auth/authenticator/authenticator-9999.ebuild
index f3c1fe349d475..2d9e3b62d7b40 100644
--- a/sys-auth/authenticator/authenticator-9999.ebuild
+++ b/sys-auth/authenticator/authenticator-9999.ebuild
@@ -27,11 +27,13 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	app-crypt/libsecret
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyotp[${PYTHON_USEDEP}]
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
-	dev-python/pyzbar[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyotp[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyzbar[${PYTHON_MULTI_USEDEP}]
+	')
 	media-libs/gd
 	x11-libs/gtk+:3
 "