diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.72-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.72-r1.ebuild
index 39aad3c085..c44316aa25 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.72-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.72-r1.ebuild
@@ -71,9 +71,11 @@ RDEPEND="
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 		)
 	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
+	kernel_linux? (
+		sys-apps/util-linux
+		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+		elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	)
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77-r1.ebuild
index ebc2bac975..8cc8776399 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77-r1.ebuild
@@ -71,9 +71,11 @@ RDEPEND="
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 		)
 	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
+	kernel_linux? (
+		sys-apps/util-linux
+		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+		elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	)
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77-r3.ebuild
index ce54cfa4db..3dbc5fc06e 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77-r3.ebuild
@@ -72,9 +72,11 @@ RDEPEND="
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 		)
 	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
+	kernel_linux? (
+		sys-apps/util-linux
+		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+		elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	)
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77.ebuild
index 21fad59014..d5aba3270f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77.ebuild
@@ -71,9 +71,11 @@ RDEPEND="
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 		)
 	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
+	kernel_linux? (
+		sys-apps/util-linux
+		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+		elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	)
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild
index 0e0def5337..62f87f2f1b 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild
@@ -72,9 +72,11 @@ RDEPEND="
 			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
 		)
 	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
+	kernel_linux? (
+		sys-apps/util-linux
+		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+		elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	)
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3