diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
similarity index 81%
rename from dev-java/java-config/java-config-2.2.0-r3.ebuild
rename to dev-java/java-config/java-config-2.2.0-r4.ebuild
index 62b5da6dd7136..2d0a08658067a 100644
--- a/dev-java/java-config/java-config-2.2.0-r3.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -17,13 +17,21 @@ SLOT="2"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="test"
 
-DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)"
 
 # baselayout-java is added as a dep till it can be added to eclass.
 RDEPEND="
 	!dev-java/java-config-wrapper
 	sys-apps/baselayout-java
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch )