commit: 10498e2291295ae34dad0fe3477ff97512432e85
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 07:28:05 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 08:51:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10498e22
Move {app-emulation -> app-containers}/conmon
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
{app-emulation => app-containers}/conmon/Manifest | 0
{app-emulation => app-containers}/conmon/conmon-2.0.30.ebuild | 0
{app-emulation => app-containers}/conmon/conmon-2.0.31.ebuild | 0
{app-emulation => app-containers}/conmon/metadata.xml | 0
app-emulation/cri-o/cri-o-1.21.0.ebuild | 2 +-
app-emulation/cri-o/cri-o-1.21.4.ebuild | 2 +-
app-emulation/cri-o/cri-o-1.22.1.ebuild | 2 +-
app-emulation/podman/podman-3.3.1.ebuild | 2 +-
app-emulation/podman/podman-3.4.0.ebuild | 2 +-
app-emulation/podman/podman-3.4.1.ebuild | 2 +-
app-emulation/podman/podman-3.4.2.ebuild | 2 +-
app-emulation/podman/podman-3.4.3.ebuild | 2 +-
app-emulation/podman/podman-3.4.4.ebuild | 2 +-
profiles/updates/4Q-2021 | 1 +
14 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/app-emulation/conmon/Manifest b/app-containers/conmon/Manifest
similarity index 100%
rename from app-emulation/conmon/Manifest
rename to app-containers/conmon/Manifest
diff --git a/app-emulation/conmon/conmon-2.0.30.ebuild
b/app-containers/conmon/conmon-2.0.30.ebuild
similarity index 100%
rename from app-emulation/conmon/conmon-2.0.30.ebuild
rename to app-containers/conmon/conmon-2.0.30.ebuild
diff --git a/app-emulation/conmon/conmon-2.0.31.ebuild
b/app-containers/conmon/conmon-2.0.31.ebuild
similarity index 100%
rename from app-emulation/conmon/conmon-2.0.31.ebuild
rename to app-containers/conmon/conmon-2.0.31.ebuild
diff --git a/app-emulation/conmon/metadata.xml
b/app-containers/conmon/metadata.xml
similarity index 100%
rename from app-emulation/conmon/metadata.xml
rename to app-containers/conmon/metadata.xml
diff --git a/app-emulation/cri-o/cri-o-1.21.0.ebuild
b/app-emulation/cri-o/cri-o-1.21.0.ebuild
index 50c725f2e424..ea93fc487dfc 100644
--- a/app-emulation/cri-o/cri-o-1.21.0.ebuild
+++ b/app-emulation/cri-o/cri-o-1.21.0.ebuild
@@ -1914,7 +1914,7 @@ IUSE="btrfs +device-mapper selinux systemd"
COMMON_DEPEND="
app-crypt/gpgme:=
- app-emulation/conmon
+ app-containers/conmon
app-emulation/runc
dev-libs/glib:=
dev-libs/libassuan:=
diff --git a/app-emulation/cri-o/cri-o-1.21.4.ebuild
b/app-emulation/cri-o/cri-o-1.21.4.ebuild
index a0f3267adeb9..d3148d9c76ab 100644
--- a/app-emulation/cri-o/cri-o-1.21.4.ebuild
+++ b/app-emulation/cri-o/cri-o-1.21.4.ebuild
@@ -1958,7 +1958,7 @@ IUSE="btrfs +device-mapper selinux systemd"
COMMON_DEPEND="
app-crypt/gpgme:=
- app-emulation/conmon
+ app-containers/conmon
app-emulation/runc
dev-libs/glib:=
dev-libs/libassuan:=
diff --git a/app-emulation/cri-o/cri-o-1.22.1.ebuild
b/app-emulation/cri-o/cri-o-1.22.1.ebuild
index f7a57937c527..dc6344f8095e 100644
--- a/app-emulation/cri-o/cri-o-1.22.1.ebuild
+++ b/app-emulation/cri-o/cri-o-1.22.1.ebuild
@@ -1996,7 +1996,7 @@ IUSE="btrfs +device-mapper selinux systemd"
COMMON_DEPEND="
app-crypt/gpgme:=
- app-emulation/conmon
+ app-containers/conmon
app-emulation/runc
dev-libs/glib:=
dev-libs/libassuan:=
diff --git a/app-emulation/podman/podman-3.3.1.ebuild
b/app-emulation/podman/podman-3.3.1.ebuild
index 1687e2b78236..02d4e5b90bed 100644
--- a/app-emulation/podman/podman-3.3.1.ebuild
+++ b/app-emulation/podman/podman-3.3.1.ebuild
@@ -20,7 +20,7 @@ RESTRICT="test"
COMMON_DEPEND="
app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
+ >=app-containers/conmon-2.0.0
|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
dev-libs/libassuan:=
dev-libs/libgpg-error:=
diff --git a/app-emulation/podman/podman-3.4.0.ebuild
b/app-emulation/podman/podman-3.4.0.ebuild
index f093f8cb3ffc..f8de5a58fe35 100644
--- a/app-emulation/podman/podman-3.4.0.ebuild
+++ b/app-emulation/podman/podman-3.4.0.ebuild
@@ -20,7 +20,7 @@ RESTRICT+=" test"
COMMON_DEPEND="
app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
+ >=app-containers/conmon-2.0.0
|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
dev-libs/libassuan:=
dev-libs/libgpg-error:=
diff --git a/app-emulation/podman/podman-3.4.1.ebuild
b/app-emulation/podman/podman-3.4.1.ebuild
index 6bd384afc54c..ee5c79c2785d 100644
--- a/app-emulation/podman/podman-3.4.1.ebuild
+++ b/app-emulation/podman/podman-3.4.1.ebuild
@@ -20,7 +20,7 @@ RESTRICT+=" test"
COMMON_DEPEND="
app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
+ >=app-containers/conmon-2.0.0
|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
dev-libs/libassuan:=
dev-libs/libgpg-error:=
diff --git a/app-emulation/podman/podman-3.4.2.ebuild
b/app-emulation/podman/podman-3.4.2.ebuild
index 22bcc4143dd5..2d7ab212ef6d 100644
--- a/app-emulation/podman/podman-3.4.2.ebuild
+++ b/app-emulation/podman/podman-3.4.2.ebuild
@@ -20,7 +20,7 @@ RESTRICT+=" test"
COMMON_DEPEND="
app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
+ >=app-containers/conmon-2.0.0
|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
dev-libs/libassuan:=
dev-libs/libgpg-error:=
diff --git a/app-emulation/podman/podman-3.4.3.ebuild
b/app-emulation/podman/podman-3.4.3.ebuild
index dccd79b8fc77..e3583f8e2f10 100644
--- a/app-emulation/podman/podman-3.4.3.ebuild
+++ b/app-emulation/podman/podman-3.4.3.ebuild
@@ -20,7 +20,7 @@ RESTRICT+=" test"
COMMON_DEPEND="
app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
+ >=app-containers/conmon-2.0.0
|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
dev-libs/libassuan:=
dev-libs/libgpg-error:=
diff --git a/app-emulation/podman/podman-3.4.4.ebuild
b/app-emulation/podman/podman-3.4.4.ebuild
index dccd79b8fc77..e3583f8e2f10 100644
--- a/app-emulation/podman/podman-3.4.4.ebuild
+++ b/app-emulation/podman/podman-3.4.4.ebuild
@@ -20,7 +20,7 @@ RESTRICT+=" test"
COMMON_DEPEND="
app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
+ >=app-containers/conmon-2.0.0
|| ( >=app-emulation/runc-1.0.0_rc6 app-containers/crun )
dev-libs/libassuan:=
dev-libs/libgpg-error:=
diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index d4456b88a4d7..4d2ba62a01e7 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -35,3 +35,4 @@ move app-emulation/containerd app-containers/containerd
move app-emulation/crun app-containers/crun
move app-emulation/buildah app-containers/buildah
move app-emulation/cadvisor app-containers/cadvisor
+move app-emulation/conmon app-containers/conmon
