From 453940db989312aca4456b2e23241d652e8ab232 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 26 Jun 2015 15:17:37 -0700 Subject: [PATCH] Revert "app-emulation/docker: bump to v1.7.0" This reverts commit f1fbb70653ca256018aa418098766dba9c680f91. --- ...ocker-1.7.0.ebuild => docker-1.6.2.ebuild} | 0 .../app-emulation/docker/docker-9999.ebuild | 22 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.7.0.ebuild => docker-1.6.2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.6.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.6.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 2e0de42339..acbf089f62 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.4.0.ebuild,v 1.1 2014/12/12 18:53:23 xarthisius Exp $ EAPI=5 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="unknown" KEYWORDS="" else - CROS_WORKON_COMMIT="0baf60984522744eed290348f33f396c046b2f3a" # v1.7.0 + CROS_WORKON_COMMIT="7c8fca2ddb58c8d2c4fb4df31c242886df7dd257" # v1.6.2 DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" KEYWORDS="amd64 arm64" fi @@ -28,6 +28,7 @@ IUSE="aufs +btrfs contrib +device-mapper doc experimental lxc +overlay vim-synta # https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies CDEPEND=" + >=sys-kernel/coreos-kernel-3.18.0 >=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] @@ -36,7 +37,7 @@ CDEPEND=" DEPEND=" ${CDEPEND} - >=dev-lang/go-1.4 + >=dev-lang/go-1.3 btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) @@ -64,7 +65,6 @@ RDEPEND=" aufs? ( || ( sys-fs/aufs3 - sys-fs/aufs4 sys-kernel/aufs-sources ) ) @@ -96,11 +96,11 @@ ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gath ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" pkg_setup() { - if kernel_is lt 3 10; then + if kernel_is lt 3 8; then eerror "" - eerror "Using Docker with kernels older than 3.10 is unstable and unsupported." + eerror "Using Docker with kernels older than 3.8 is unstable and unsupported." eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies" - die 'Kernel is too old - need 3.10 or above' + die 'Kernel is too old - need 3.8 or above' fi # for where these kernel versions come from, see: @@ -202,7 +202,7 @@ src_compile() { # time to build! ./hack/make.sh dynbinary || die 'dynbinary failed' - # TODO get go-md2man and then include the man pages using man/md2man-all.sh + # TODO get go-md2man and then include the man pages using docs/man/md2man-all.sh } src_install() { @@ -230,11 +230,11 @@ src_install() { dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md if use doc; then - # TODO doman man/man*/* + # TODO doman contrib/man/man*/* docompress -x /usr/share/doc/${PF}/md docinto md - dodoc -r docs/* + dodoc -r docs/sources/* fi dobashcomp contrib/completion/bash/*