diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2014-11-26 16:13:29 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2014-11-26 16:13:29 +0000 |
| commit | 00b68fdf9ef625fe9b619a020ab40d30efd28ffb (patch) | |
| tree | d0dcc7bb2c1a2acb22d2a3dc2ba28d5c04f87b1d | |
| parent | Support python 3.4 (diff) | |
| download | gentoo-2-00b68fdf9ef625fe9b619a020ab40d30efd28ffb.tar.gz gentoo-2-00b68fdf9ef625fe9b619a020ab40d30efd28ffb.tar.bz2 gentoo-2-00b68fdf9ef625fe9b619a020ab40d30efd28ffb.zip | |
Update with ebuild from Tianon's overlay
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)
| -rw-r--r-- | app-emulation/docker/ChangeLog | 5 | ||||
| -rw-r--r-- | app-emulation/docker/docker-1.3.2.ebuild | 26 |
2 files changed, 20 insertions, 11 deletions
diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog index 2632144db698..43a169987f50 100644 --- a/app-emulation/docker/ChangeLog +++ b/app-emulation/docker/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emulation/docker # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.32 2014/11/26 15:51:10 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.33 2014/11/26 16:13:29 xarthisius Exp $ + + 26 Nov 2014; Kacper Kowalik <xarthisius@gentoo.org> docker-1.3.2.ebuild: + Update with ebuild from Tianon's overlay 26 Nov 2014; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml: Add myself as co-maintainer diff --git a/app-emulation/docker/docker-1.3.2.ebuild b/app-emulation/docker/docker-1.3.2.ebuild index 67d543645a74..cc543b19692f 100644 --- a/app-emulation/docker/docker-1.3.2.ebuild +++ b/app-emulation/docker/docker-1.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.3.2.ebuild,v 1.1 2014/11/26 15:45:34 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.3.2.ebuild,v 1.2 2014/11/26 16:13:29 xarthisius Exp $ EAPI=5 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then inherit git-2 else SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - DOCKER_GITCOMMIT="4e9bbfa" + DOCKER_GITCOMMIT="39fa2fa" KEYWORDS="~amd64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" fi @@ -26,30 +26,36 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion" +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies CDEPEND=" >=dev-db/sqlite-3.7.9:3 device-mapper? ( - sys-fs/lvm2[thin] + >=sys-fs/lvm2-2.02.89[thin] ) " + DEPEND=" ${CDEPEND} - >=dev-lang/go-1.2 + >=dev-lang/go-1.3 btrfs? ( - >=sys-fs/btrfs-progs-0.20 + >=sys-fs/btrfs-progs-3.16.1 ) - dev-vcs/git - dev-vcs/mercurial " + +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies RDEPEND=" ${CDEPEND} + !app-emulation/docker-bin >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + lxc? ( >=app-emulation/lxc-1.0 ) - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 aufs? ( || ( sys-fs/aufs3 @@ -66,7 +72,7 @@ CONFIG_CHECK=" DEVPTS_MULTIPLE_INSTANCES CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED MACVLAN VETH BRIDGE - NF_NAT_IPV4 IP_NF_TARGET_MASQUERADE + NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK NF_NAT NF_NAT_NEEDED |