gentoo resync : 16.04.2022

3 files changed, 6 insertions, 72 deletions

diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index 759819ed67ab..80b164895af2 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -1,7 +1,5 @@
 DIST docker-cli-20.10.12.tar.gz 7527161 BLAKE2B 34a90f6df9f43507461307817e72cfb9e37f88d00e6fc50b8b16f3db9c573e54edc2eb2641ff4e091a2a73e936f8844011520efe5aaec37a9eb9880f5f81c51a SHA512 ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f
 DIST docker-cli-20.10.14.tar.gz 7508390 BLAKE2B b268a329450540c2e94eced7e7b7bb9387cd208c68bde82607fc56e1f0529d8ca35bb8c16839154443d950c21b0625a13aa8547d9f3053ed19645da683f14419 SHA512 f8b7f1040eccd404e39ec33bcef8bb8423636b0695af65f84c0612e77223844892d219f82cfbb99ccd5326e228f8af27be1870d90ebace77810ea5fce9f86e4a
-DIST docker-cli-20.10.9.tar.gz 7525889 BLAKE2B 7b12f81ed98ed416fb00211b9e6d965ed3209fd83db17a98bef7fef0eb56b27f495093facb3d43e40ec651568a7d83dd484c014c998e046a57662087b1d7c2c6 SHA512 0a9bd36c139bb5e1cd4a975913aa5429ffce8c746d2104aa2a54d937c67073ddaa2a8a5e93d71d2d435459af58168de0e7e3a44fd452da535f3995738da206df
 EBUILD docker-cli-20.10.12.ebuild 1844 BLAKE2B 315897c0bb0930e2b3ac72ff73581700c66ed8130a26f5ac573e9820c56947e80f44b5478fdb8dab4013407acbc1c7706fc7fdef876d511dc3433cbaf6b96f9d SHA512 1e576548e6697d51cf7a681a97910dcd01d04073f18222e0d467d7c4f8100479bcb998d547da16cb574fb92db36d86c2e58ea512003015ce805b64cfc1a9373a
-EBUILD docker-cli-20.10.14.ebuild 1839 BLAKE2B 6d4d63d6298beda0347a19966704611ca31044127dd31c34573412f1ebf7e28163ee116963b8e36792af6a5b02f93c65cb9eb6b05e3313b4ec27c8944ddf53ba SHA512 1380c16f11ace12965b46bfd364d6af701c54702274f81c952946b4e7f330b8a6f97cb74206717a03d3e251dee0cddfea6d3840c9d1f369bdb07088ca7851913
-EBUILD docker-cli-20.10.9.ebuild 1844 BLAKE2B 9ddff4c4d777c6c24ee2ee9df31060571d5dd278ca3040d46ea438f42c04b1735b5a869f8da93e7c25e0dd8e7f69f7eb7d1b6f2dd77e5167f155876f82118338 SHA512 6108bf8f8f7d14a3295a1fbbcefb3e0a40d550f208a953e6da296d7d8a304bf6d5f477b88c724ed158ccd3db959a1d54d7b2f16dd39a5faccde65541ff68c213
+EBUILD docker-cli-20.10.14.ebuild 1895 BLAKE2B ca302b1f195f6cb90bf16e3eb636110052d191e3d8833949dcca8af421cd87853d8d946340a88e5ed5b9aff2d6b5251b6ac372286ba58d08154fcc70306a6f2b SHA512 fc4a83b6a8531cb6272be1726b2ae139e045251848aa7237b81f27e3e343b6c0cc901541889c79248cd6f534acd66e07aa81d59952aa6c720870a9fb0ba43d32
 MISC metadata.xml 614 BLAKE2B d20cedb6e07ab3d6907e022cbe7b1e3c2fe3462a1cdefd53fa7bc18a8431f2adeb16c406982d722910295524061bb2e08c0e1fdb625b0c05a21eaa4bdc272359 SHA512 922fbdb86e4456cb757d21bbca8b32b5dfc47e67264c3c31d4d0e3763579ce70346a1c1279544635b94573541e08c57fd5d999e9536917b3888d130bffd9127c
diff --git a/app-containers/docker-cli/docker-cli-20.10.14.ebuild b/app-containers/docker-cli/docker-cli-20.10.14.ebuild
index df9b9f0a7ea9..d33e9fceab08 100644
--- a/app-containers/docker-cli/docker-cli-20.10.14.ebuild
+++ b/app-containers/docker-cli/docker-cli-20.10.14.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public Lic
+# Distributed under the terms of the GNU General Public License v2
+
 EAPI=7
 GIT_COMMIT=a224086349
 EGO_PN="github.com/docker/cli"
@@ -13,9 +14,10 @@ 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"
+IUSE="hardened selinux"
 
-RDEPEND="!<app-containers/docker-20.10.1"
+RDEPEND="!<app-containers/docker-20.10.1
+	selinux? ( sec-policy/selinux-docker )"
 BDEPEND="
 	>=dev-lang/go-1.16.6
 	dev-go/go-md2man"
diff --git a/app-containers/docker-cli/docker-cli-20.10.9.ebuild b/app-containers/docker-cli/docker-cli-20.10.9.ebuild
deleted file mode 100644
index 869b479b5d20..000000000000
--- a/app-containers/docker-cli/docker-cli-20.10.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 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-containers/docker-20.10.1"
-BDEPEND="
-	>=dev-lang/go-1.16.6
-	dev-go/go-md2man"
-
-RESTRICT="installsources strip test"
-
-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/_*
-}