Update with ebuild from Tianon's overlay

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index 2632144db6987bd7b0e10afe4ad1ffc86c2485e2..43a169987f504b72371badbc902830d5479ec463 100644 (file)
--- 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/Manifest b/app-emulation/docker/Manifest
index 54164c267eefdda3d4e27d942193a628e3757141..bbf8f769c0c483c6a266ef5db09b4c9f338d78ce 100644 (file)
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -5,23 +5,23 @@ AUX docker-r2.confd 581 SHA256 94e1c07b09701f3b0b1c4f6f917206da3b32f8d7e961c3850
 AUX docker-r2.initd 1767 SHA256 0cb83137cf3d37aadf450dd30ec9e0ceca3d865867f7fe64a43a1d5f42d2ecf8 SHA512 1250f8b16ded27877cf2759fca1d69f37ce308d4d5e5a29438210e847894617fa088260b0cfd87e1ee65ed26a4293d98c79462c1ccc93aac14203fbfed4b69a2 WHIRLPOOL 272f04feb587a0f91079f41ad90868f99c28a21a5ec35876f38dbbd342a53796dd4ec822fa2cd3506f22485b6a0147d24da2e7ab89da7875f84e3e9fab50c3c8
 AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6f5a9a7ec8a0a0a SHA512 d7564489486b3547cb79057fa44cb3eb0aa6c50ec47eca12579748170d62ab435395d173fdf39fcec8e86f4778db7413b7fa0ab85dbbd2fc1636164d4aad8b37 WHIRLPOOL 553f8a93a5d7cb6cc037a2004e19efa06520eba363e12574a5d251d10b23d9f24d1a023eb9915968a9bb661bddb577163948fb180a85ca9c916cac5c6680b1df
 DIST docker-1.3.2.tar.gz 5876533 SHA256 9e81c0ef309fbe3298ba1a9b0f2783ee88d7f412cb03b6605c6d8bb497a452fb SHA512 78f67d39ac50ff60597cdb36c35fee32797296ac0f0e98203a863a243a493329ccd95f958eb3ab959d549ccdfd9cd0040e3897bc3856c3d02914ddabc9f79eb0 WHIRLPOOL 204dbc60c8cf48f1e97bcb2699ca5e2ed705bf3805c09e14f661bda99559f85f6a69b3a07a77a60a9a634b85d978be65490a08e99df0f18a711064f226759482
-EBUILD docker-1.3.2.ebuild 6310 SHA256 af953c329e420f5e4c8e0c4ffd95bb3e2b30cd36dd849fca68d5dfa05b387081 SHA512 83c822ee62d68df233558bc687b4ad28e2595794c04b9b27a9e00af440ec9ae5a24fd9da266f8e4341f5de7e524e19f8b297f9f159c2b653fbb96da8b45be066 WHIRLPOOL e15768db3169a86721e7b078412747190e3aefbd746cc0b5d29e33c1b3989b7518e84583500752aacd776d25f35cb838b89fbfc4d0937ce9a1678f779de2b8ff
-MISC ChangeLog 5042 SHA256 b365c11fc2bfcebdf85a694f81b596867c8b4928233281e5c9d25237d5d3fcdb SHA512 a0d483118cc24d2563aab81e92be411216d4481165dd2eaa50e8ef37f11e9e255d3cf1c45d39899e67476f2813046d812f5435e8be36b154aa2d6f5fda936d2b WHIRLPOOL 0c0519a6714155a87461d70f047c7220c04c92e578f9b085309ec16307a81c643b6ede784d03361f3bf66b63bf8d03c4a77158e9d6c5f2dd0d8c9c8edb765410
+EBUILD docker-1.3.2.ebuild 6584 SHA256 e1f1d1640c2fb9b4bbd261505f632a36b84ddfc33b7167e8a24f71245e4b9693 SHA512 709db6b89e8f31545c80bec62c6bb0aca3ef969ab32b98130fd7f05eb4b2f48720e90ec212dee5a14876770a4870fec4c8ab3c8bce964861de0cbe52b5e6c988 WHIRLPOOL 1772b2cf771486c4f806f1ac7ddec9482c1c354aa268f31c63850d96bedf32fc2b1cfbbc2194e1384427498d5dc428049a86f02b44ac0faca028045aa57d4ccf
+MISC ChangeLog 5161 SHA256 dc751281a4e19f06c43c4170e170f4e266b158a3f1d45bcb33c52f4b99cd2c19 SHA512 d4e9f124c4c998ba15a33cef3dc002b68fc16cc7c1d4622d01fb63431ed22e7db3f236f4a35410f576668d5c506f64d683ecb45d46020193fe13174d6362fb48 WHIRLPOOL 0874838ff7859c5cbf50a1ba46d8c630cd029931e1855bca41efbdff254823171b4f72cb3b305088986aea54a584944885c970ff3145339bc6707e3a949064c2
 MISC metadata.xml 1277 SHA256 e5d0394aa0f0ba5f133ccbbfe92c28111a5ad888d46a53ade9625ef0155c7d9b SHA512 f910edcabda2011dd1ca107848663c97a17fbb0f84391376abd5e26111662e8bb172c9d0b77a57b82fc5b35181a543a8f869823d0ae7b9d3deaaa75c18d03f10 WHIRLPOOL cbfeb224f2205c91fa288d18086dce87d61d25481f0c10e09a8b77e9950162d647fa8c3cd7793c2fad19c3c2a0be55fad29a9002eeacf02a6a10a48d68e846c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUdfbyAAoJEF0huFKJUZL5guEP+QHyGrigQS/hk4+4crBDHakq
-73rnAkmE9+8CQg9CC9cJJ4WvXDtJuutCXQIv6z/ex4PYFbq6penAw+WJ5pC/TWrv
-pf4Zivj2bYKLPavhmWg6LO3XPpBz1kWCrJA/NGbNbQmUNEJJFrhuW20a5+sfI+7Q
-82CsC1IPW2T2EIsQefSOIFNCDA9hPxkyuxZUCzLFgbjdra2u/He63SrOAP9womDS
-EE/n+xqsZRhFBlvNbYKm2IFVa9VmB6yMt6img3KV7veK0WUefpZ1WP2klXm04AEO
-4s2l3j2OBKi2wwr1FjWow5P9ggvYaVQYt06uPS96MN5aQn1fNq1BhGenAB7+mZuw
-E1aL49wi9aUycewVlUS6y1SNfbruorYpAbWkbP1vsjx9ZhXoWgl96snNtxPyEUrd
-keyKmXKoAolmwjbb6TqcXUpSVfGE1+MN2tS7nd+qu4q1ENsWRcfrJlWEbTDaViA1
-xU0FgXMHNVucpKVi9mzjx+RuvyhV+qLHIJma3qgSH9jlms8+7yb9h6tVPoKlz1f2
-6TYNXAP+2vU8hcC/6/yi3xcKp8PD3bAbi3ITk7VfD2t7Jc2t2uh1YHakWaqbS8Kd
-29Jfoq3yGetlbAIeNAYoybpR4K5DL/a1wJ04nb/IaZqQLmA84T9sfqvFYpcjLmyo
-CknlW9uUbbG/T1zeSHFM
-=32Tb
+iQIcBAEBCAAGBQJUdfwsAAoJEF0huFKJUZL52HkQAJ1zrPSXC9JrzjnLI/hgg/6I
+GEw6+dAVHXKH+Goq0f8Ji4MDcHnz4VZqiWKSUJw0ggObA5MjZ+RmvyhyMQhhIkGz
+U6SQHnfSd1hOKkVRF4UFdVh0i46uZhF5cV+vddwYz9KtCRSDmxiIyHnXlKAOHPv7
+UBBDzPj1elH9JPoveWWy+7iEdspEHj6nqmmUXNTwm1XpjzUtsSoXnqArRJl+8S7I
+6gAlDUeRe9+5SuYI32tHQr1ZB1xqfBfjT3tJZHf5DFtpZpicjQk6cV6xeDgsCh/g
+f+5o/4TbrDj+OUkMyJT31puRovEmNHLrb4Z/i7jTP0l3nXlC7W4qQ+42HAOJnfcn
+xMySL/Rpad/SVoabAAZFEUypIARaecLEo5H7WExrmZ+6XHS5Y83aSHiMMprXsuMb
++7wMmum34wNcYBxsIVVgrVphKIz1zEeaE1/gnR6rB4rxAb+LwBX7qjVpmZIsYcnc
+9QqP4efQlbqIeJvwB3ZG/YDuy/ed0meKjyT8yHR/efP39E+/h33LySAFDoLfTu9i
+emtRiavca1//x0gFRoqAVq3JcPHks8KeDB+BU4TCMQsTmPEuicphR3IPnzatihTF
+iGH1/AboKnAr7zGsbonx0x1ZW7mg48N9esToQV5zzWmEc5X/Dc1NOIo9jgAw6jm9
+z6wn7GfxnA5hOC31P3u+
+=8z+H
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/docker/docker-1.3.2.ebuild b/app-emulation/docker/docker-1.3.2.ebuild
index 67d543645a7408739ed1ed13f03041f10797c6ff..cc543b19692fec6d82efc134861d9dea78d14ff8 100644 (file)
--- 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