commit: 777a0beeab4e0eab5f39e11de040a8a7ba52b963
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 08:54:29 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 08:54:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=777a0bee
Move {app-emulation -> app-containers}/docker-cli
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
{app-emulation => app-containers}/docker-cli/Manifest | 0
.../docker-cli/docker-cli-20.10.12.ebuild | 0
.../docker-cli/docker-cli-20.10.9.ebuild | 0
{app-emulation => app-containers}/docker-cli/metadata.xml | 0
app-emulation/docker/docker-20.10.12-r1.ebuild | 4 ++--
app-emulation/docker/docker-20.10.9.ebuild | 4 ++--
app-emulation/docker/metadata.xml | 2 +-
profiles/updates/4Q-2021 | 1 +
8 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app-emulation/docker-cli/Manifest
b/app-containers/docker-cli/Manifest
similarity index 100%
rename from app-emulation/docker-cli/Manifest
rename to app-containers/docker-cli/Manifest
diff --git a/app-emulation/docker-cli/docker-cli-20.10.12.ebuild
b/app-containers/docker-cli/docker-cli-20.10.12.ebuild
similarity index 100%
rename from app-emulation/docker-cli/docker-cli-20.10.12.ebuild
rename to app-containers/docker-cli/docker-cli-20.10.12.ebuild
diff --git a/app-emulation/docker-cli/docker-cli-20.10.9.ebuild
b/app-containers/docker-cli/docker-cli-20.10.9.ebuild
similarity index 100%
rename from app-emulation/docker-cli/docker-cli-20.10.9.ebuild
rename to app-containers/docker-cli/docker-cli-20.10.9.ebuild
diff --git a/app-emulation/docker-cli/metadata.xml
b/app-containers/docker-cli/metadata.xml
similarity index 100%
rename from app-emulation/docker-cli/metadata.xml
rename to app-containers/docker-cli/metadata.xml
diff --git a/app-emulation/docker/docker-20.10.12-r1.ebuild
b/app-emulation/docker/docker-20.10.12-r1.ebuild
index 9b0444595cf7..0e74f25a901b 100644
--- a/app-emulation/docker/docker-20.10.12-r1.ebuild
+++ b/app-emulation/docker/docker-20.10.12-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
dev-libs/libltdl
>=app-containers/containerd-1.4.12[apparmor?,btrfs?,device-mapper?,seccomp?]
~app-containers/docker-proxy-0.8.0_p20210525
- cli? ( ~app-emulation/docker-cli-${PV} )
+ cli? ( ~app-containers/docker-cli-${PV} )
container-init? ( >=sys-process/tini-0.19.0[static] )
"
@@ -261,7 +261,7 @@ pkg_postinst() {
ewarn "two packages upstream, so Gentoo has followed suit."
ewarn
ewarn "app-emulation/docker contains the daemon and"
- ewarn "app-emulation/docker-cli contains the docker command."
+ ewarn "app-containers/docker-cli contains the docker command."
ewarn
ewarn "docker currently installs docker-cli using the cli use
flag."
ewarn
diff --git a/app-emulation/docker/docker-20.10.9.ebuild
b/app-emulation/docker/docker-20.10.9.ebuild
index 6b47dc206a52..4f148cbcce27 100644
--- a/app-emulation/docker/docker-20.10.9.ebuild
+++ b/app-emulation/docker/docker-20.10.9.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
dev-libs/libltdl
>=app-containers/containerd-1.4.9[apparmor?,btrfs?,device-mapper?,seccomp?]
~app-containers/docker-proxy-0.8.0_p20210525
- cli? ( app-emulation/docker-cli )
+ cli? ( app-containers/docker-cli )
container-init? ( >=sys-process/tini-0.19.0[static] )
"
@@ -261,7 +261,7 @@ pkg_postinst() {
ewarn "two packages upstream, so Gentoo has followed suit."
ewarn
ewarn "app-emulation/docker contains the daemon and"
- ewarn "app-emulation/docker-cli contains the docker command."
+ ewarn "app-containers/docker-cli contains the docker command."
ewarn
ewarn "docker currently installs docker-cli using the cli use
flag."
ewarn
diff --git a/app-emulation/docker/metadata.xml
b/app-emulation/docker/metadata.xml
index 52affc587bc5..e58aa2015b46 100644
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@@ -30,7 +30,7 @@
</flag>
<flag name="cli">
This is a temporary use flag which pulls in
- app-emulation/docker-cli, the docker command
line client.
+ app-containers/docker-cli, the docker command
line client.
This flag is here to assist in the transition
to split packages
and will be removed in a future release.
</flag>
diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index 5a09b03a114e..db382d81f45b 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -59,3 +59,4 @@ move app-emulation/runc app-containers/runc
move app-emulation/s6-overlay app-containers/s6-overlay
move app-emulation/snapd app-containers/snapd
move app-emulation/umoci app-containers/umoci
+move app-emulation/docker-cli app-containers/docker-cli
