diff --git a/eclass/calculate-utils-r11.eclass b/eclass/calculate-utils-r11.eclass
index 33e700a44..835fb9e58 100644
--- a/eclass/calculate-utils-r11.eclass
+++ b/eclass/calculate-utils-r11.eclass
@@ -199,15 +199,15 @@ RDEPEND="
 		dev-qt/qdbus:5
 		sys-apps/edid-decode
 		|| (
+			( dev-python/pygobject[python_targets_python3_8]
+			dev-python/dbus-python[python_targets_python3_8]
+			)
 			( dev-python/pygobject[python_targets_python3_7]
 			dev-python/dbus-python[python_targets_python3_7]
 			)
 			( dev-python/pygobject[python_targets_python3_6]
 			dev-python/dbus-python[python_targets_python3_6]
 			)
-			( dev-python/pygobject[python_targets_python3_8]
-			dev-python/dbus-python[python_targets_python3_8]
-			)
 		)
 	)
 
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.15-r2.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.15-r3.ebuild
similarity index 100%
rename from sys-apps/calculate-utils/calculate-utils-3.6.8.15-r2.ebuild
rename to sys-apps/calculate-utils/calculate-utils-3.6.8.15-r3.ebuild