aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Shelton <stuart@shelton.me>2016-05-01 13:46:40 +0100
committerStuart Shelton <stuart@shelton.me>2016-05-01 13:46:40 +0100
commitf5499f5e366ba72155a6da5f70455fd0b667de20 (patch)
treee5fde08ee8985c0959aab5d88328779a010f7c69 /app-emulation
parentAdd www-apps/nabaztaglives-2.1.2 (diff)
downloadsrcshelton-f5499f5e366ba72155a6da5f70455fd0b667de20.tar.gz
srcshelton-f5499f5e366ba72155a6da5f70455fd0b667de20.tar.bz2
srcshelton-f5499f5e366ba72155a6da5f70455fd0b667de20.zip
Update app-emulation/docker-1.11.0
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/docker/Manifest2
-rw-r--r--app-emulation/docker/docker-1.11.0.ebuild9
2 files changed, 6 insertions, 5 deletions
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 6de25bf0..d62502bb 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -13,6 +13,6 @@ DIST docker-1.7.1.tar.gz 6853527 SHA256 9cd26415d68a88d3cf576e7e78c2fe97f42af795
EBUILD docker-0.11.1.ebuild 5555 SHA256 68a0a3cf7cb6538698f3d48f72cec34913847677d79b0db1b0a12f19c4b7821c SHA512 7e624a8e59d98929d7d9a70866382d4fc0f10a10226c8fa75080ba344ee123d00f953c49f8cd6447ab15ade19825c1667526786610ce0883c5d61e9d48ee3259 WHIRLPOOL b59c2d6e38603dee853e17fc93799002b93cd3e1dc64b09d73134d666e5025806d69e706e6aa8b50598ba4b7869d29491a8e8060ed4b0550c6c117801f3d63e6
EBUILD docker-1.0.0.ebuild 5622 SHA256 a75ff4862df2bb08b364220264918404cb6b93504e5013361f40afaa65a193f2 SHA512 4431f72668c3377c81563a9bd29fff4e99fe5b5f9f2fff4e0be5a0e35f153f3af183ce7427f7c8244dd6b3d6ac3656ba816f99dcac89a7a706679f1cb3c6f1d0 WHIRLPOOL d3a74078cbb8f2d5e24319addf35a13eb2874e3b01bc2b1d6602b8ac46203188dba0b065ff4ee719480891c044a0e2aa63e1ca9ce4e35832d3985e6e66683c39
EBUILD docker-1.10.3.ebuild 8251 SHA256 2b1aa8b750675e742e03e9542f48a746f750346ce47d10a03af2270b32b8b073 SHA512 ace7c30ddbae4c83a5411e648cd0008edc7431e6d45b5f8dee8916cd38a0b013ccf427c1e7ec308984f368508505032082d0b6b205f04cfaee7412463cc7641a WHIRLPOOL 21e7041aaf35c9bd0316abafe00c52e8d35065259839dfd2fcbd8213a69f94c8ac2f81d756bbe39fbb5a91f2b2b8525b707333a96a9c8f5d8080a7ef86d196d3
-EBUILD docker-1.11.0.ebuild 8345 SHA256 d2713a6ddbe24060ff0fd5b4f80c914105172b618cb543f9958d897f8ae856df SHA512 70b55f1b63f15637e42695fee4e63969ed475762652ebf5135c27e2368d4363e9f9a12500901fe3b5941cdd2c97ff859cea6e108a8bde21ac6b3646fdab27527 WHIRLPOOL 5146d972532cc02c9b9c3c7b05848f4fe391a2ff50ce9b71e6c9a1fff4bf1c6d7f3d310c56c5fc7d1819c8a81bc2798d1d2f41b6714517ae10d4f90b484bed3d
+EBUILD docker-1.11.0.ebuild 8387 SHA256 3141d719394b5a1dc634b7a5983b2c86d6ebac9cbe548a00156b16aa398039b8 SHA512 42efb087a2483279173aaed732592aae8cce3c9b51b5cb7c48ee7425a00d167dddf2abcdc1a85b34839abdf54d2868d201a4f6c2b3fa7151003977db051972da WHIRLPOOL 6c0143b7df84b581fc735c71ac19fdf6d86e83f01e413c9fbe21660d9c691b1cfba122535ce0bda602e60ce29e51cba6f4a8645fcbf9c0730fa0f9f819df7e3a
EBUILD docker-1.7.1.ebuild 7527 SHA256 9653e8bc1f6a3829910ea200d3245c41c5f1a2e98403401d2666c8c61abf7371 SHA512 110af8901e95f74fa711d7672c5d7948c754ba588594b330eb0de29685d338b3ef9b442ceb0a64cdbeb47c137b34fa5c7feb1e64fa0ab9397966d0cb9b8faf06 WHIRLPOOL 9b0ec6ef70d32665de9773e216b390639c453955e69d502dbf090c7ccb908e532c2c04aab51280e3ea2a5a54802cc32b97f0ce44f72ae84f903e11f67832d6fe
EBUILD docker-9999.ebuild 7817 SHA256 713aac8a961b783bbcd3f238fd1d3cec816b439ff884094bc3dd2e2b5d408c8b SHA512 7bc7ab24c808d0033ae529f371177424bef4a38fdff1b45293471e8ccee088f9ab84f84e37ae015bc1ac47ffc5b7bb2dacad616cbad7588e831bba412e74805f WHIRLPOOL b412b55085a93169eeda39253638213f0f9dce66574e6b7451638f74d4675ff7a093ebaa200270de701321f626c0c2e01eb1102d7c7d959e07acaa20b15bf0c7
diff --git a/app-emulation/docker/docker-1.11.0.ebuild b/app-emulation/docker/docker-1.11.0.ebuild
index e31d9e8c..4bb116a4 100644
--- a/app-emulation/docker/docker-1.11.0.ebuild
+++ b/app-emulation/docker/docker-1.11.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id: eabd8d83dbbc9d065b04c4633f30373d99c726cf $
+# $Id: 43b5a38e6d6053ed53995506685fd23b0bcf12e9 $
EAPI=5
@@ -16,13 +16,13 @@ else
DOCKER_GITCOMMIT="4dc5990"
EGIT_COMMIT="v${MY_PV}"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
inherit golang-vcs-snapshot
fi
inherit bash-completion-r1 eutils linux-info multilib systemd udev user
-DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
HOMEPAGE="https://dockerproject.org"
LICENSE="Apache-2.0"
SLOT="0"
@@ -86,7 +86,7 @@ CONFIG_CHECK="
~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
~DEVPTS_MULTIPLE_INSTANCES
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
- ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+ ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
~NF_NAT ~NF_NAT_NEEDED
@@ -102,6 +102,7 @@ CONFIG_CHECK="
~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
"
+ERROR_KEYS="CONFIG_KEYS: is mandatory, see bug 581348"
ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"