gentoo resync : 15.12.2019

5 files changed, 10 insertions, 320 deletions

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 261adfe93f60..c1aeb9365159 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,9 +1,7 @@
 DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc SHA512 d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
-DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11 SHA512 6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8
-DIST docker-19.03.3.tar.gz 16960782 BLAKE2B 8ce23ca22edf7c4435dbaca5a0321de52b108951b935d5ed82439c57409757cd054698934f9dbabbbbb0db74d5c9f6a6d04c5ca33e64212dedc0c9bf92d06ddb SHA512 251756ca8b5d8eb962fde447fdab8307ce8013e14dc3b955387af5d8bdfdee16ea170ecb37a59e5900fa5c2e366f0d4080e79c28e5b8ef945cc67cb959d88eef
 DIST docker-19.03.4.tar.gz 16961040 BLAKE2B 15d88d6f97ff70f6a0220f3d62b2040b4d859414b323b07e54802cb8e8dbb8d074562635bbfd9d00df529d0792fb5767d28548843ec73ad21cf7d7fcb1ac0c6e SHA512 bcf79f82eb8433b8c04ceb2fd90a80101b148dd819f5bbda83d535ff2fad65d08aee2f72ac41c38ce879f3970a087555bb7ab63c5bb071a3c1cd6aa177621cac
-EBUILD docker-18.09.9.ebuild 8354 BLAKE2B 5e0ab831398f7c54025bb0d03001c13625758dfb3988e0828ad2b5cda246aa55ac4536396df8c62c14b7df353e32709d2306b50220d0b9f00c2ae32ad40b24c6 SHA512 62d3bfd28f0b4feb9846fc6befe15d2b926801a7b7015784b9ca7435874a3d974c85f3ec000b1ad8dde40141ed42de5dca5e2630db7028cfeec3ad662802a437
-EBUILD docker-19.03.2.ebuild 8355 BLAKE2B 5d2b42bfae72f37eccbeb127643f2757c2379fe1b5709aa9c3cd27e194835bfe059ee6e5bd2f9617d80222cd2ae659b1efb73cf3f9669de8042d5afe467b6a62 SHA512 c6d1c6bd79e51e728b38bbc6505020cdd650525edfb961c192fd5dd99a51962e6c3e6f1f5b1d7462a4f6ea8dd318e46b172410a8f432fc2bfdaeab7943e1b141
-EBUILD docker-19.03.3.ebuild 8358 BLAKE2B e3341a43f8d8f049ce5a2d47076ac612a15e68317b05274277dca827d3fd174f0ca2e5fabcacd08d80d4784668c41700b9cc0f8992590189d91a527e2bb26809 SHA512 f07974b7fac5f9563df351ca07519383edb1f877d56872621f27ae22b8d0e0a51548040fff7f3081c79b4cc3aecb375bd88842d5080b4136f9e4ed0595398721
-EBUILD docker-19.03.4.ebuild 8358 BLAKE2B 71fe7c49bd11c46b50860112f8b0437da38119c8fd3c185c218b783cbb360660c1268632cded26d3769697dd6b98729e25da0889826656e02a5751efc250dad3 SHA512 c5670282d4401bf2cf2a2685f88d14fb06e36b8dcf99f877d87915d902fe390abbab926c60ceca3b46bd332a98647b03eeaf05d7ea1976e2cec2d72bf44b072c
+DIST docker-19.03.5.tar.gz 16966994 BLAKE2B 7326ba17c0eef7bcebb5df1484992a30f696d2f238d149dbaf964004b725badfc1e9c85ed3ba76ac95b566cda9cb7018fe4fa7d282af1d1e36f4765e1445f25b SHA512 1afe41e740ae0e32a8210aac3c4b24ddb1ae00ff19e8ec435de2e61cfc25494d38129fd619bacf964e3e7a96e12dd44a0c57f6e2c36aa7c3bb67a3df0c237648
+EBUILD docker-18.09.9.ebuild 8347 BLAKE2B 40c70112dedb5bf1aad1d5898638164feb847ca523eb192bfb46f34400ac41042af67cc3d28ffc1b4f01b0c20d125f1d3f7f5d7bfdabf67ef441e0e4ae88ecb8 SHA512 210af162fea9a846dc78833bc35938ecb04d3fe1041cd64a423a914d3889bf993c69454844045b4ee3550a8ac6561185258483450c188e77561eae6de1368fa1
+EBUILD docker-19.03.4.ebuild 8351 BLAKE2B 8d3c4ab035f499676bc49328ced7168514ea5c5c8c85b6df18aeb8d366f40adbc1b5e175a947abab24eeaa60badee0f6661a5565c7f517726d8f92d232172fcf SHA512 4f3cb33347115ee6c7b41b1a606d8ead3367f4e42adcf9fe7cc3f5c0ffe90b9c05bc367b652249ce4e1f98926247a8378118c469f40033b8c4d2856cdbabfc91
+EBUILD docker-19.03.5.ebuild 8350 BLAKE2B d157e7367db6d229f0d17028f3f37e7502405c3193dc7cee983778e74d530cd4acafa2165cda8ba0a6dd5d45588322bcdb6090c2c8e4c67eca62016700abc7dd SHA512 30fe24c1b97d146d2d6d8f31b8387020036c0a21d4649fc46d4cb3116b60be8d6526baf9c4f69674aeaf782d7bdfafe7c3dac31bdc180a23d8cdfdcc8fcfb9b0
 MISC metadata.xml 1576 BLAKE2B 7a378d4abcda0352c4c96108a238d693e9104a1de624f8fb4e808bfbf5ad4960c1f6155b1f6c78ff2bc6609653285e911e7eae9f319696e39c60b63e5127ef11 SHA512 9944178c2202c12bc7364f9722e70b71583bfc60a318348060d0ee8ba713c892259da46c222ce7fea4b1294be8b01b7d1b359976931e287f574733b65403e762
diff --git a/app-emulation/docker/docker-18.09.9.ebuild b/app-emulation/docker/docker-18.09.9.ebuild
index 86284c9e3965..966a693d1a49 100644
--- a/app-emulation/docker/docker-18.09.9.ebuild
+++ b/app-emulation/docker/docker-18.09.9.ebuild
@@ -235,7 +235,7 @@ src_compile() {
 		VERSION="$(cat ../../VERSION)" \
 		GITCOMMIT="${DOCKER_GITCOMMIT}" \
 		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
-		dynbinary || die
+		dynbinary
 
 	# build man pages
 	go build -o gen-manpages github.com/docker/cli/man || die
diff --git a/app-emulation/docker/docker-19.03.2.ebuild b/app-emulation/docker/docker-19.03.2.ebuild
deleted file mode 100644
index c501202e523f..000000000000
--- a/app-emulation/docker/docker-19.03.2.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	DOCKER_GITCOMMIT="6a30dfc"
-	MY_PV=${PV/_/-}
-	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	dev-go/go-md2man
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	~app-emulation/containerd-1.2.6
-	~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
-	~app-emulation/docker-proxy-0.8.0_p20190604
-	container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is lt 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-			~IOSCHED_CFQ
-			~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_compile() {
-	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${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	VERSION="$(cat ../../VERSION)" \
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
-		dynbinary || die
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-
-	elog " Devicemapper storage driver has been deprecated"
-	elog " It will be removed in a future release"
-}
diff --git a/app-emulation/docker/docker-19.03.4.ebuild b/app-emulation/docker/docker-19.03.4.ebuild
index 8d52724b145c..af88214fce00 100644
--- a/app-emulation/docker/docker-19.03.4.ebuild
+++ b/app-emulation/docker/docker-19.03.4.ebuild
@@ -236,7 +236,7 @@ src_compile() {
 		VERSION="$(cat ../../VERSION)" \
 		GITCOMMIT="${DOCKER_GITCOMMIT}" \
 		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
-		dynbinary || die
+		dynbinary
 
 	# build man pages
 	go build -o gen-manpages github.com/docker/cli/man || die
diff --git a/app-emulation/docker/docker-19.03.3.ebuild b/app-emulation/docker/docker-19.03.5.ebuild
index 1cbb014cfdde..e6fb4da81b09 100644
--- a/app-emulation/docker/docker-19.03.3.ebuild
+++ b/app-emulation/docker/docker-19.03.5.ebuild
@@ -11,10 +11,10 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
 	inherit git-r3
 else
-	DOCKER_GITCOMMIT="1576bd7"
+	DOCKER_GITCOMMIT="633a0ea"
 	MY_PV=${PV/_/-}
 	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
@@ -58,7 +58,7 @@ RDEPEND="
 	dev-libs/libltdl
 	~app-emulation/containerd-1.2.10
 	~app-emulation/runc-1.0.0_rc9[apparmor?,seccomp?]
-	~app-emulation/docker-proxy-0.8.0_p20190807
+	~app-emulation/docker-proxy-0.8.0_p20191011
 	container-init? ( >=sys-process/tini-0.18.0[static] )
 "
 
@@ -236,7 +236,7 @@ src_compile() {
 		VERSION="$(cat ../../VERSION)" \
 		GITCOMMIT="${DOCKER_GITCOMMIT}" \
 		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
-		dynbinary || die
+		dynbinary
 
 	# build man pages
 	go build -o gen-manpages github.com/docker/cli/man || die