gentoo resync : 15.06.2021

7 files changed, 4 insertions, 331 deletions

diff --git a/app-emulation/docker-cli/Manifest b/app-emulation/docker-cli/Manifest
index 65a42444909d..e1458ddcb309 100644
--- a/app-emulation/docker-cli/Manifest
+++ b/app-emulation/docker-cli/Manifest
@@ -1,12 +1,3 @@
-DIST docker-cli-20.10.2.tar.gz 7706210 BLAKE2B c8d537be8344dbd2113232c85a52f001231fdf653819710cf4492c86d58662e5f0d74f6fb00593d1034b5d481f15524cec89e2b3463900705a545b2051ab38d2 SHA512 907c846bf4043dcce4dd4e95e6335554b50e954464a83f75a44b1c0fcf9f2625c490a12758d18653c0d031768878a3f6fc91cb7fc6e1d3235d5e8f21ecd93caf
-DIST docker-cli-20.10.3.tar.gz 7733821 BLAKE2B ab71e6817e7fe0d7c5f8c776cb25ae7bc49b5a224c835fe833988b67dfdf562207cd0afed4710d33e8a31156bd16bdc70df13f1194e862314add069c320c4e6e SHA512 769bed3e5409f6be570ab3672bef1bea4d16d5bfaeb81af8c4b3b7cfb56732c108c5404464731c001cf94fefd77c40a142bed80c85f1b058041e187453a6b88e
-DIST docker-cli-20.10.4.tar.gz 7735373 BLAKE2B 7bbdbaec4e97498c9d6aa66f9e6168afd7dc510f7746f94eff275a00bff23548562e8b879bc70c5018e0b75ebf609e0e68173bc244a441c739687d01eb8b9a3c SHA512 861f69657ac3eede228983b7d845ce98c81f4b0aa601aab37024d3f21cf1ca73a182d33bdde8fb9ad89e4954c3903dc4ec2b81fcf7364941a7c38a80ea410e34
-DIST docker-cli-20.10.5.tar.gz 7734031 BLAKE2B 3f20c5acaaa0d2fa91bf8e94f5b4b0b8ecd4d35fd3bfef3beb91f64fa832318d351bcbd4b1dac51550bc91efb748fb6d5aa4f71143001d194f066437ab3552c5 SHA512 868e19fa834993bbd20a0d28a57f364287f39434355ccf90e63f3ead8d55fe488ac3bdab3f85230bfbede318b93513536f36da131fc17c27763a5375b4e0c636
-DIST docker-cli-20.10.6.tar.gz 7684541 BLAKE2B 059f80d71b4fc5b33c54dbe322030d33385739ddb0ae78890aeadfd264d19ac6f50386a1554d9056ef6bb9138dbbb7ccdabc8b39da0075d0bd3c183333273122 SHA512 6b0ed4c756418cd38f9e5d614910a5b4fc3b2bc286f7e69950e031c5c571c705d7b7ce11cb5a7e94814cbb44fd830921a568f30ef30d783ef129c050c999666b
-EBUILD docker-cli-20.10.2.ebuild 1831 BLAKE2B f539e4dd3cc0c6ff8ce71791404f7088e15441f5462551e403d3827e0745650d6af2c0d5bc86b1980208109d8e98d8d5a3e26e4025bbc56c91e1606854600213 SHA512 252826169b64ca0c9671f70b07a61ba239dea27c16c4bfd5a0a03ea0f2451fc9a677765ee90f529b9596d87f0fe49842b4f75a6c00fda239cdc14a4cb06ce3f6
-EBUILD docker-cli-20.10.3.ebuild 1831 BLAKE2B 6ce9c4347beccedaa824ddb2b37b0507689ddf1e1c1bf4c11868597873d898e306cd7c341590cb588afdf3102c0607c2999920561ad7e76b943c098875eb8e8a SHA512 680993e4c6fb8a02a9a0a3fcd7daad9f62fab7880aa0c14eed13fab85c2d1f62584e7198e903692633c866cf64f125a26de7e2c2aae0ac502d665118761f4ca1
-EBUILD docker-cli-20.10.4.ebuild 1776 BLAKE2B 53083136fbd4ecf5a2f8fd34e00c7c460d611f3ff66c82fe5ad652a41a8b26aca7f2af430b3d6c67bf2ff0422ed69e0662dc1e86b36ccbf0ab7a13964cfb4ca1 SHA512 946b824ee14b2dac4f1ccfcb320685a150f01337dab5f65dc12eca67d54202378ca5af61d2cd8a47115eff5b48094a7548dfcc1273f1a45678c6f123f77bd65c
-EBUILD docker-cli-20.10.5-r1.ebuild 1819 BLAKE2B 53ab4574fb54a91e16126f43c012f5bfa9292951b24b812d6544bf2565ff4ad3da47b551518723d715cd4a7213e67720456ebd72dba46b8f545f6cead0a67cec SHA512 6653c99c66c64b567ebe7778c8c1c22e2a4c9e0de4af06fc38d42788852f6c8b1c71b012da9223f880665035935c758d25e0a68f863d86d8e80ede18b35ca0a4
-EBUILD docker-cli-20.10.5.ebuild 1776 BLAKE2B b4f504e3714c9938f9432a322dd9653cad6441e7e51d69ee04b29a97611f0c7adab8725decce120a9542d924420b72dac8a96f7da6e3960edfe02b14943e8ca5 SHA512 b780088e6ad3c337bd446819520bb461016be5a24a37b7c56fb9961ab499b4a6c98d340f822fd74b71a4b35f1a1949d875afcb13e7aea80eee5bb508983aadbe
-EBUILD docker-cli-20.10.6.ebuild 1817 BLAKE2B ce6b7a1baadd330a18651b265a1b838394d14694506c8048dd646fcea4ca24d84dc8a364b4aae7f1c61e2211bf985bb6d0df2d7ecb2851973680b7663bc3acb2 SHA512 122aee9e5d5c6a85a6050d50d196c982f9ba050061ec9f1ad7b9b9e1db551627b70582055374aaaa3a5e86efb93fb2303427f2a1229c3308808f04df6ab23692
+DIST docker-cli-20.10.7.tar.gz 7523515 BLAKE2B 36ae46a28ca943e75419014b8b8453dbdd36bf240b9c36aed245447241dd07635da0319fd9b6ea409ecbe4c419eec8650d94d2a296e45a9c3b02a9a47a314888 SHA512 4523ae70cb27d848da119070171af2eb84e974ac39d70be4feee105e37c949487c7f72a9bc30c32ce71bffb0787e27b7b9194ce5a8aeae57bdfeb3f2d730010f
+EBUILD docker-cli-20.10.7.ebuild 1846 BLAKE2B a05d7129af51396d5da5017c9bc15a4229ebe3f56aa1afc8d92ee58c8e00b22d4e9baf42274b8e268dc00a3e417fd5435e3aac6da46a5b1e37a4909b4c736da6 SHA512 592eecad2f2e76c1bb9283e22a146983035e14ab481b867388c0ff2a0c0692592d88186f5007dd01c7c35e0bceb93143b54369bacce39f73fa40417345da1057
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/docker-cli/docker-cli-20.10.2.ebuild b/app-emulation/docker-cli/docker-cli-20.10.2.ebuild
deleted file mode 100644
index 21b8e453793b..000000000000
--- a/app-emulation/docker-cli/docker-cli-20.10.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=831ebeae96
-EGO_PN="github.com/docker/cli"
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-MY_PV=${PV/_/-}
-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 ~x86"
-IUSE="hardened"
-
-RDEPEND="!<app-emulation/docker-20.10.1"
-BDEPEND="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
-	sed -i 's@md2man@go-md2man@' man/md2man-all.sh || 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="$(cat VERSION)" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-
-	# build man pages
-	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-	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.3.ebuild b/app-emulation/docker-cli/docker-cli-20.10.3.ebuild
deleted file mode 100644
index 8d8ca051b48b..000000000000
--- a/app-emulation/docker-cli/docker-cli-20.10.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=48d30b5b32
-EGO_PN="github.com/docker/cli"
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-MY_PV=${PV/_/-}
-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 ~x86"
-IUSE="hardened"
-
-RDEPEND="!<app-emulation/docker-20.10.1"
-BDEPEND="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
-	sed -i 's@md2man@go-md2man@' man/md2man-all.sh || 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="$(cat VERSION)" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-
-	# build man pages
-	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-	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.4.ebuild b/app-emulation/docker-cli/docker-cli-20.10.4.ebuild
deleted file mode 100644
index c65dda796af3..000000000000
--- a/app-emulation/docker-cli/docker-cli-20.10.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=48d30b5b32
-EGO_PN="github.com/docker/cli"
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-MY_PV=${PV/_/-}
-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 ~x86"
-IUSE="hardened"
-
-RDEPEND="!<app-emulation/docker-20.10.1"
-BDEPEND="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="$(cat VERSION)" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-
-	# build man pages
-	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-	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.5-r1.ebuild b/app-emulation/docker-cli/docker-cli-20.10.5-r1.ebuild
deleted file mode 100644
index 063f8583dbe6..000000000000
--- a/app-emulation/docker-cli/docker-cli-20.10.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=55c4c88966
-EGO_PN="github.com/docker/cli"
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-MY_PV=${PV/_/-}
-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 ~x86"
-IUSE="hardened"
-
-RDEPEND="!<app-emulation/docker-20.10.1"
-BDEPEND="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="$(cat VERSION)" \
-		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.5.ebuild b/app-emulation/docker-cli/docker-cli-20.10.5.ebuild
deleted file mode 100644
index 2d0065c9b02c..000000000000
--- a/app-emulation/docker-cli/docker-cli-20.10.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=55c4c88966
-EGO_PN="github.com/docker/cli"
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-MY_PV=${PV/_/-}
-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 ~x86"
-IUSE="hardened"
-
-RDEPEND="!<app-emulation/docker-20.10.1"
-BDEPEND="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="$(cat VERSION)" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-
-	# build man pages
-	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-	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.6.ebuild b/app-emulation/docker-cli/docker-cli-20.10.7.ebuild
index 07dd057d7a55..ab025371c183 100644
--- a/app-emulation/docker-cli/docker-cli-20.10.6.ebuild
+++ b/app-emulation/docker-cli/docker-cli-20.10.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-GIT_COMMIT=370c28948e
+GIT_COMMIT=f0df35096d5f5e6b559b42c7fde6c65a2909f7c5
 EGO_PN="github.com/docker/cli"
 inherit bash-completion-r1  golang-vcs-snapshot
 
@@ -13,7 +13,7 @@ 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 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="hardened"
 
 RDEPEND="!<app-emulation/docker-20.10.1"