Gentoo Archives: gentoo-commits

From: "Kacper Kowalik (xarthisius)" <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/docker: docker-1.3.2.ebuild ChangeLog
Date: Wed, 26 Nov 2014 16:13:34
Message-Id: 20141126161329.62AB8AF53@oystercatcher.gentoo.org
1 xarthisius 14/11/26 16:13:29
2
3 Modified: docker-1.3.2.ebuild ChangeLog
4 Log:
5 Update with ebuild from Tianon's overlay
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)
8
9 Revision Changes Path
10 1.2 app-emulation/docker/docker-1.3.2.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-1.3.2.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-1.3.2.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-1.3.2.ebuild?r1=1.1&r2=1.2
15
16 Index: docker-1.3.2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.3.2.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- docker-1.3.2.ebuild 26 Nov 2014 15:45:34 -0000 1.1
23 +++ docker-1.3.2.ebuild 26 Nov 2014 16:13:29 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.3.2.ebuild,v 1.1 2014/11/26 15:45:34 xarthisius Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.3.2.ebuild,v 1.2 2014/11/26 16:13:29 xarthisius Exp $
29
30 EAPI=5
31
32 @@ -15,7 +15,7 @@
33 inherit git-2
34 else
35 SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
36 - DOCKER_GITCOMMIT="4e9bbfa"
37 + DOCKER_GITCOMMIT="39fa2fa"
38 KEYWORDS="~amd64"
39 [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
40 fi
41 @@ -26,30 +26,36 @@
42 SLOT="0"
43 IUSE="aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion"
44
45 +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
46 CDEPEND="
47 >=dev-db/sqlite-3.7.9:3
48 device-mapper? (
49 - sys-fs/lvm2[thin]
50 + >=sys-fs/lvm2-2.02.89[thin]
51 )
52 "
53 +
54 DEPEND="
55 ${CDEPEND}
56 - >=dev-lang/go-1.2
57 + >=dev-lang/go-1.3
58 btrfs? (
59 - >=sys-fs/btrfs-progs-0.20
60 + >=sys-fs/btrfs-progs-3.16.1
61 )
62 - dev-vcs/git
63 - dev-vcs/mercurial
64 "
65 +
66 +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
67 +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
68 RDEPEND="
69 ${CDEPEND}
70 +
71 !app-emulation/docker-bin
72 >=net-firewall/iptables-1.4
73 + sys-process/procps
74 + >=dev-vcs/git-1.7
75 + >=app-arch/xz-utils-4.9
76 +
77 lxc? (
78 >=app-emulation/lxc-1.0
79 )
80 - >=dev-vcs/git-1.7
81 - >=app-arch/xz-utils-4.9
82 aufs? (
83 || (
84 sys-fs/aufs3
85 @@ -66,7 +72,7 @@
86 DEVPTS_MULTIPLE_INSTANCES
87 CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED
88 MACVLAN VETH BRIDGE
89 - NF_NAT_IPV4 IP_NF_TARGET_MASQUERADE
90 + NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
91 NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK
92 NF_NAT NF_NAT_NEEDED
93
94
95
96
97 1.33 app-emulation/docker/ChangeLog
98
99 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.33&view=markup
100 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.33&content-type=text/plain
101 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?r1=1.32&r2=1.33
102
103 Index: ChangeLog
104 ===================================================================
105 RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v
106 retrieving revision 1.32
107 retrieving revision 1.33
108 diff -u -r1.32 -r1.33
109 --- ChangeLog 26 Nov 2014 15:51:10 -0000 1.32
110 +++ ChangeLog 26 Nov 2014 16:13:29 -0000 1.33
111 @@ -1,6 +1,9 @@
112 # ChangeLog for app-emulation/docker
113 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
114 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.32 2014/11/26 15:51:10 xarthisius Exp $
115 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.33 2014/11/26 16:13:29 xarthisius Exp $
116 +
117 + 26 Nov 2014; Kacper Kowalik <xarthisius@g.o> docker-1.3.2.ebuild:
118 + Update with ebuild from Tianon's overlay
119
120 26 Nov 2014; Kacper Kowalik <xarthisius@g.o> metadata.xml:
121 Add myself as co-maintainer