app-emulation/docker: add changes for 1.13.0_rc1 from upstream

Package-Manager: portage-2.3.0

diff --git a/app-emulation/docker/docker-1.13.0_rc1.ebuild b/app-emulation/docker/docker-1.13.0_rc1.ebuild
index 4f6801926b9642642ce7a72f7f5a99ffdb37e68e..32e517ec0d0c9020fd794e21db31c150a03f0038 100644 (file)
--- a/app-emulation/docker/docker-1.13.0_rc1.ebuild
+++ b/app-emulation/docker/docker-1.13.0_rc1.ebuild
@@ -26,9 +26,9 @@ DESCRIPTION="The core functions you need to create Docker images and run Docker
 HOMEPAGE="https://dockerproject.org"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor aufs btrfs +device-mapper overlay seccomp"
+IUSE="apparmor aufs btrfs +device-mapper hardened overlay pkcs11 seccomp"
 
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
 CDEPEND="
        >=dev-db/sqlite-3.7.9:3
        device-mapper? (
@@ -44,12 +44,12 @@ DEPEND="
        dev-go/go-md2man
 
        btrfs? (
-               >=sys-fs/btrfs-progs-3.8
+               >=sys-fs/btrfs-progs-3.16.1
        )
 "
 
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
+# 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}
 
@@ -61,6 +61,7 @@ RDEPEND="
 
        >app-emulation/containerd-0.2.2
        app-emulation/runc[apparmor?,seccomp?]
+       app-emulation/docker-proxy
 "
 
 RESTRICT="installsources strip"
@@ -111,7 +112,7 @@ 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/installation/binaries/#check-kernel-dependencies"
+               ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
        fi
 
        # for where these kernel versions come from, see:
@@ -199,10 +200,10 @@ src_compile() {
        export CGO_CFLAGS="-I${ROOT}/usr/include"
        export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
 
-       # if we're building from a zip, we need the GITCOMMIT value
+       # if we're building from a tarball, we need the GITCOMMIT value
        [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
 
-       if gcc-specs-pie; then
+       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'
 
@@ -222,7 +223,7 @@ src_compile() {
                fi
        done
 
-       for tag in apparmor seccomp; do
+       for tag in apparmor pkcs11 seccomp; do
                if use $tag; then
                        DOCKER_BUILDTAGS+=" $tag"
                fi
@@ -264,8 +265,8 @@ src_install() {
        doins -r contrib/syntax/vim/syntax
 
        # note: intentionally not using "doins" so that we preserve +x bits
-       mkdir -p "${D}/usr/share/${PN}/contrib"
-       cp -R contrib/* "${D}/usr/share/${PN}/contrib"
+       dodir /usr/share/${PN}/contrib
+       cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
 }
 
 pkg_postinst() {

diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml
index 9e0dfdc6c476d99293f1de9633f520a21d159d58..dbf678fa73dcd49d7de7a0c066d64321b334badf 100644 (file)
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@@ -48,6 +48,9 @@
                        Enables dependencies for the "overlay" graph driver, including
                        necessary kernel flags.
                </flag>
+               <flag name="pkcs11">
+                       Enables pkcs-11 support.
+               </flag>
        </use>
        <upstream>
                <remote-id type="github">docker/docker</remote-id>