Move {app-emulation -> app-containers}/docker-cli

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

7 files changed, 5 insertions, 147 deletions

diff --git a/app-emulation/docker-cli/Manifest b/app-emulation/docker-cli/Manifest
deleted file mode 100644
index ba2105d6dbba..000000000000
--- a/app-emulation/docker-cli/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST docker-cli-20.10.12.tar.gz 7527161 BLAKE2B 34a90f6df9f43507461307817e72cfb9e37f88d00e6fc50b8b16f3db9c573e54edc2eb2641ff4e091a2a73e936f8844011520efe5aaec37a9eb9880f5f81c51a SHA512 ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f
-DIST docker-cli-20.10.9.tar.gz 7525889 BLAKE2B 7b12f81ed98ed416fb00211b9e6d965ed3209fd83db17a98bef7fef0eb56b27f495093facb3d43e40ec651568a7d83dd484c014c998e046a57662087b1d7c2c6 SHA512 0a9bd36c139bb5e1cd4a975913aa5429ffce8c746d2104aa2a54d937c67073ddaa2a8a5e93d71d2d435459af58168de0e7e3a44fd452da535f3995738da206df
diff --git a/app-emulation/docker-cli/docker-cli-20.10.12.ebuild b/app-emulation/docker-cli/docker-cli-20.10.12.ebuild
deleted file mode 100644
index 8f6f4fd8fa5c..000000000000
--- a/app-emulation/docker-cli/docker-cli-20.10.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=e91ed5707e
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="hardened"
-
-RDEPEND="!<app-emulation/docker-20.10.1"
-BDEPEND="
-	>=dev-lang/go-1.16.6
-	dev-go/go-md2man"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-
-	# build man pages
-	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-	mkdir -p ./man/man1 || die "mkdir failed"
-	go build -o "${T}"/gen-manpages ./man ||
-		die 'build gen-manpages failed'
-	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
-		die 'gen-manpages failed'
-	./man/md2man-all.sh -q ||
-		die 'md2man-all.sh failed'
-}
-
-src_install() {
-	dobin build/docker
-	doman man/man*/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
diff --git a/app-emulation/docker-cli/docker-cli-20.10.9.ebuild b/app-emulation/docker-cli/docker-cli-20.10.9.ebuild
deleted file mode 100644
index 30e81b53f7fc..000000000000
--- a/app-emulation/docker-cli/docker-cli-20.10.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=c2ea9bc90b
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="hardened"
-
-RDEPEND="!<app-emulation/docker-20.10.1"
-BDEPEND="
-	>=dev-lang/go-1.16.6
-	dev-go/go-md2man"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-
-	# build man pages
-	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-	mkdir -p ./man/man1 || die "mkdir failed"
-	go build -o "${T}"/gen-manpages ./man ||
-		die 'build gen-manpages failed'
-	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
-		die 'gen-manpages failed'
-	./man/md2man-all.sh -q ||
-		die 'md2man-all.sh failed'
-}
-
-src_install() {
-	dobin build/docker
-	doman man/man*/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
diff --git a/app-emulation/docker-cli/metadata.xml b/app-emulation/docker-cli/metadata.xml
deleted file mode 100644
index db463f3eeb66..000000000000
--- a/app-emulation/docker-cli/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-</pkgmetadata>
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>