Move {app-emulation -> app-containers}/runc

Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>

19 files changed, 14 insertions, 13 deletions

diff --git a/app-containers/containerd/containerd-1.4.11.ebuild b/app-containers/containerd/containerd-1.4.11.ebuild
index d2038dd4a85c..44e419c33326 100644
--- a/app-containers/containerd/containerd-1.4.11.ebuild
+++ b/app-containers/containerd/containerd-1.4.11.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 # recommended version of runc is found in script/setup/runc-version
 RDEPEND="
 	${DEPEND}
-	~app-emulation/runc-1.0.2
+	~app-containers/runc-1.0.2
 "
 
 BDEPEND="
diff --git a/app-containers/containerd/containerd-1.4.12.ebuild b/app-containers/containerd/containerd-1.4.12.ebuild
index 10c53e0472be..a738accf70b9 100644
--- a/app-containers/containerd/containerd-1.4.12.ebuild
+++ b/app-containers/containerd/containerd-1.4.12.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 # recommended version of runc is found in script/setup/runc-version
 RDEPEND="
 	${DEPEND}
-	~app-emulation/runc-1.0.2
+	~app-containers/runc-1.0.2
 "
 
 BDEPEND="
diff --git a/app-containers/containerd/containerd-1.5.7.ebuild b/app-containers/containerd/containerd-1.5.7.ebuild
index 03b79d4159d6..de23ad71b908 100644
--- a/app-containers/containerd/containerd-1.5.7.ebuild
+++ b/app-containers/containerd/containerd-1.5.7.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 # recommended version of runc is found in script/setup/runc-version
 RDEPEND="
 	${DEPEND}
-	~app-emulation/runc-1.0.2
+	~app-containers/runc-1.0.2
 "
 
 BDEPEND="
diff --git a/app-containers/cri-o/cri-o-1.21.0.ebuild b/app-containers/cri-o/cri-o-1.21.0.ebuild
index 51699a1ed417..bd5def52cce5 100644
--- a/app-containers/cri-o/cri-o-1.21.0.ebuild
+++ b/app-containers/cri-o/cri-o-1.21.0.ebuild
@@ -1915,7 +1915,7 @@ IUSE="btrfs +device-mapper selinux systemd"
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	app-containers/conmon
-	app-emulation/runc
+	app-containers/runc
 	dev-libs/glib:=
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
diff --git a/app-containers/cri-o/cri-o-1.21.4.ebuild b/app-containers/cri-o/cri-o-1.21.4.ebuild
index a7724cecf4ef..68c28e6f0190 100644
--- a/app-containers/cri-o/cri-o-1.21.4.ebuild
+++ b/app-containers/cri-o/cri-o-1.21.4.ebuild
@@ -1959,7 +1959,7 @@ IUSE="btrfs +device-mapper selinux systemd"
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	app-containers/conmon
-	app-emulation/runc
+	app-containers/runc
 	dev-libs/glib:=
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
diff --git a/app-containers/cri-o/cri-o-1.22.1.ebuild b/app-containers/cri-o/cri-o-1.22.1.ebuild
index b7d6765090d4..4d339e8f124f 100644
--- a/app-containers/cri-o/cri-o-1.22.1.ebuild
+++ b/app-containers/cri-o/cri-o-1.22.1.ebuild
@@ -1997,7 +1997,7 @@ IUSE="btrfs +device-mapper selinux systemd"
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	app-containers/conmon
-	app-emulation/runc
+	app-containers/runc
 	dev-libs/glib:=
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
diff --git a/app-containers/img/img-0.5.11.ebuild b/app-containers/img/img-0.5.11.ebuild
index cd92124e2d1f..a01cea3b2268 100644
--- a/app-containers/img/img-0.5.11.ebuild
+++ b/app-containers/img/img-0.5.11.ebuild
@@ -533,7 +533,7 @@ IUSE="seccomp"
 
 DEPEND="seccomp? ( sys-libs/libseccomp )"
 RDEPEND="${DEPEND}
-	app-emulation/runc"
+	app-containers/runc"
 
 src_compile() {
 		IMG_DISABLE_EMBEDDED_RUNC=1 \
diff --git a/app-containers/podman/podman-3.3.1.ebuild b/app-containers/podman/podman-3.3.1.ebuild
index ac44c72cf14e..0d45638721e4 100644
--- a/app-containers/podman/podman-3.3.1.ebuild
+++ b/app-containers/podman/podman-3.3.1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	>=app-containers/conmon-2.0.0
-	|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
+	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	>=net-misc/cni-plugins-0.8.6
diff --git a/app-containers/podman/podman-3.4.0.ebuild b/app-containers/podman/podman-3.4.0.ebuild
index d58eb39fe82d..cbad65d0e440 100644
--- a/app-containers/podman/podman-3.4.0.ebuild
+++ b/app-containers/podman/podman-3.4.0.ebuild
@@ -21,7 +21,7 @@ RESTRICT+=" test"
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	>=app-containers/conmon-2.0.0
-	|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
+	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	>=net-misc/cni-plugins-0.8.6
diff --git a/app-containers/podman/podman-3.4.1.ebuild b/app-containers/podman/podman-3.4.1.ebuild
index 4097b7d5adb1..44cbb7034662 100644
--- a/app-containers/podman/podman-3.4.1.ebuild
+++ b/app-containers/podman/podman-3.4.1.ebuild
@@ -21,7 +21,7 @@ RESTRICT+=" test"
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	>=app-containers/conmon-2.0.0
-	|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
+	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	>=net-misc/cni-plugins-0.8.6
diff --git a/app-containers/podman/podman-3.4.2.ebuild b/app-containers/podman/podman-3.4.2.ebuild
index 9ce7f02cfc06..f27fd5123313 100644
--- a/app-containers/podman/podman-3.4.2.ebuild
+++ b/app-containers/podman/podman-3.4.2.ebuild
@@ -21,7 +21,7 @@ RESTRICT+=" test"
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	>=app-containers/conmon-2.0.0
-	|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
+	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	>=net-misc/cni-plugins-0.8.6
diff --git a/app-containers/podman/podman-3.4.3.ebuild b/app-containers/podman/podman-3.4.3.ebuild
index bdd678320e5f..419c47b5d16f 100644
--- a/app-containers/podman/podman-3.4.3.ebuild
+++ b/app-containers/podman/podman-3.4.3.ebuild
@@ -21,7 +21,7 @@ RESTRICT+=" test"
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	>=app-containers/conmon-2.0.0
-	|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
+	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	>=net-misc/cni-plugins-0.8.6
diff --git a/app-containers/podman/podman-3.4.4.ebuild b/app-containers/podman/podman-3.4.4.ebuild
index bdd678320e5f..419c47b5d16f 100644
--- a/app-containers/podman/podman-3.4.4.ebuild
+++ b/app-containers/podman/podman-3.4.4.ebuild
@@ -21,7 +21,7 @@ RESTRICT+=" test"
 COMMON_DEPEND="
 	app-crypt/gpgme:=
 	>=app-containers/conmon-2.0.0
-	|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
+	|| ( >=app-containers/runc-1.0.0_rc6 app-containers/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
 	>=net-misc/cni-plugins-0.8.6
diff --git a/app-emulation/runc/Manifest b/app-containers/runc/Manifest
index e896bdf3b837..e896bdf3b837 100644
--- a/app-emulation/runc/Manifest
+++ b/app-containers/runc/Manifest
diff --git a/app-emulation/runc/files/CVE-2021-43784.patch b/app-containers/runc/files/CVE-2021-43784.patch
index ab3886ee9ba7..ab3886ee9ba7 100644
--- a/app-emulation/runc/files/CVE-2021-43784.patch
+++ b/app-containers/runc/files/CVE-2021-43784.patch
diff --git a/app-emulation/runc/metadata.xml b/app-containers/runc/metadata.xml
index d27ad6413b06..d27ad6413b06 100644
--- a/app-emulation/runc/metadata.xml
+++ b/app-containers/runc/metadata.xml
diff --git a/app-emulation/runc/runc-1.0.2-r1.ebuild b/app-containers/runc/runc-1.0.2-r1.ebuild
index 38b6da62493d..38b6da62493d 100644
--- a/app-emulation/runc/runc-1.0.2-r1.ebuild
+++ b/app-containers/runc/runc-1.0.2-r1.ebuild
diff --git a/app-emulation/runc/runc-1.0.3.ebuild b/app-containers/runc/runc-1.0.3.ebuild
index db1d0c6af602..db1d0c6af602 100644
--- a/app-emulation/runc/runc-1.0.3.ebuild
+++ b/app-containers/runc/runc-1.0.3.ebuild
diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index eb17c7df98b0..ba26a6e5ea22 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -55,3 +55,4 @@ move app-emulation/skopeo app-containers/skopeo
 move app-emulation/sen app-containers/sen
 move app-emulation/img app-containers/img
 move app-emulation/kompose app-containers/kompose
+move app-emulation/runc app-containers/runc