Version bump, grabbed from tianon's docker overlay

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

3 files changed, 259 insertions, 16 deletions

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index 4e388039b3a8..547369dae18f 100644
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,11 @@
 # 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.36 2014/12/23 16:34:26 xarthisius Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.37 2015/02/11 04:12:36 xarthisius Exp $
+
+*docker-1.5.0 (11 Feb 2015)
+
+  11 Feb 2015; Kacper Kowalik <xarthisius@gentoo.org> +docker-1.5.0.ebuild:
+  Version bump, grabbed from tianon's docker overlay
 
 *docker-1.4.1 (23 Dec 2014)
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 97352f6460c2..db9a5f56037b 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -6,24 +6,26 @@ AUX docker-r2.initd 1767 SHA256 0cb83137cf3d37aadf450dd30ec9e0ceca3d865867f7fe64
 AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6f5a9a7ec8a0a0a SHA512 d7564489486b3547cb79057fa44cb3eb0aa6c50ec47eca12579748170d62ab435395d173fdf39fcec8e86f4778db7413b7fa0ab85dbbd2fc1636164d4aad8b37 WHIRLPOOL 553f8a93a5d7cb6cc037a2004e19efa06520eba363e12574a5d251d10b23d9f24d1a023eb9915968a9bb661bddb577163948fb180a85ca9c916cac5c6680b1df
 DIST docker-1.3.3.tar.gz 5886211 SHA256 9c054e438eee94e7028e860fcb2356a0983e98522223089902d0c61f505dbbcb SHA512 d0f928c1edfcd6d3e11893c2c41da430041fcbe53217e1abc978b379e5464c41204de97da9d5e3e06c1337f4e5b79e1ae98f734d62d64962b3f8b6c37c9bdb85 WHIRLPOOL 2fd4ae184d04f21c62a7e7157f81fe9484ce05cc019c184acc9bcc23db7ba2a866930c6bdcb69f2981a0c394e61e6c996a847bcd8102657a82806fdec2aed29d
 DIST docker-1.4.1.tar.gz 6054386 SHA256 34300e214e5d2f1633d9650be16bce86d635d72596faa575912fecefda612835 SHA512 e83bbc5443c42836768e71ba4a7f1aea0ba062439c85fef12bff3e812eb3c93b47bd455f36abbcf5a332c293f3274f7a00b3909ec4b919eff449aa52557997b3 WHIRLPOOL e85143c7182186819299ef517512ad9ac5101568bb5fcd016939a4ecb6803c2fd28c474502c07a257bb961bbb10316ec80306cdf038c13435855b58857cc70b1
+DIST docker-1.5.0.tar.gz 6459415 SHA256 cf97a1b3a75a63d3b7cb743b5376a1b1bc00eac651dce9e3f094202901a43c48 SHA512 cc620570c67454bedfae73de86b722a845fce4b0bd46446d1190ae98917010db54fbf82951167ebf62358e53dedb45fff2a7f25014c79b42efc2a5f2b611b4d9 WHIRLPOOL acb62b6c1b354212cf250b60227c5dbedc7fe6c6e729fc887653b776a991cd13650c643e20abf06a4326412cb10a1b4e2a20bac0a1fbc056b8d2cf2d54d1fcd0
 EBUILD docker-1.3.3-r1.ebuild 6622 SHA256 7492e6644263dd180c5cead23b0a490bb6120fd309497c3c23c3d1288e97b9b0 SHA512 64a91ede0108b96fa464ac1b52bdc4824c3bdb2d9ce04562567fee6a5c928d2e70f1b2bc4ee3955d93c8071dc012965dda190cf69c497fb3474eb22ebe7d8c6e WHIRLPOOL dd0eac9bd9fe6e46094f0688605f701e1d242bf21ae2fc957d1d852fb111d2d1e0a6518f488479dfc717ae9d279b7c5775967e2771b05bf147b46f0dbb6215b7
 EBUILD docker-1.4.1.ebuild 6621 SHA256 904de18a6d9f9e5347abe89ea4be88fb314736322a5c7b7c46d76f5ac2d35077 SHA512 1bcb3aa3effb9e2bd0c2d46b2c64b9e7bc54f75cce996754424c42b338df2295a4e4385a74a8d34c6896139b43adaa9028788f3beecb99026f24078f62831b3b WHIRLPOOL bf90bb7235987880e325cfc5b525e9b5be0ce60898b81fa6e03c0980fb5408a0220f57e858222de3e11784f4b8ea734dfccd06fe96dcc4d80f22eb7639c25661
-MISC ChangeLog 5844 SHA256 ede2660532f00ed0d1e74ecb1e960d8fded732753ae53a0d4996206263622f60 SHA512 78a2f94e5a3a4c403aa4269a1d649a2eb87c52edecf3dfb2b16030e47b263ddcf54e5c62fb1249972652ccbe3ce426dcd3e172fdd684425969d99f028b08a905 WHIRLPOOL 5971ce907479b56918b642f4955b6526ec31e806a7c9764a851411133db6b25a3c2d76d34e506db39bf76d3d6e5855de6339f57fa83a8718b9a1540271266f53
+EBUILD docker-1.5.0.ebuild 6677 SHA256 eb8cd0a024434e494ecc21626f90f74266706f72e590605bf92582d2b245cf4e SHA512 0c4f5e0f33f808c3039c7987625745ef4179f40bd392255fc12a2d7209c7cc7adc9f092fcb5c8e644dda0d85b27282822d1ea5a390ad887f1eb6be4f5fb531e1 WHIRLPOOL 17c6ec35ce8a6464c63bedd3d27f7942c70626ca9e368aaacf988efb05b2d70aba8df97b58d842d70964f00fb3e6c9c44f4a9153dcd106d4bd0047fbde693d3f
+MISC ChangeLog 6003 SHA256 56d87af7407e9092f618a8ea370a0e762694627e3f13035f4b633d3ee990a573 SHA512 bfa825aca949848cba8c166db57408a44b3b066f5766f72126dc652e2a836ce343801985194f44705dd5ee917af1b669c4c5f55e448915195804c75bf2d63402 WHIRLPOOL 152143862737aac074eeef5e9911656c4a197db5f9a9ea3e6cd9625ab77eab6afe269a4e9ae808d240c38ea45c8f11a92657b593cf155386076fe505b072e54f
 MISC metadata.xml 1277 SHA256 e5d0394aa0f0ba5f133ccbbfe92c28111a5ad888d46a53ade9625ef0155c7d9b SHA512 f910edcabda2011dd1ca107848663c97a17fbb0f84391376abd5e26111662e8bb172c9d0b77a57b82fc5b35181a543a8f869823d0ae7b9d3deaaa75c18d03f10 WHIRLPOOL cbfeb224f2205c91fa288d18086dce87d61d25481f0c10e09a8b77e9950162d647fa8c3cd7793c2fad19c3c2a0be55fad29a9002eeacf02a6a10a48d68e846c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUmZmZAAoJEF0huFKJUZL5S54P/RD+5AfFmzIk43ol+SdFrDct
-5KhU2aj1HbrP6FIUO0nBFfX3A2GK5RbErRMmHWe8BEYx8ka+P68wxa7Xo0QRCz1j
-zesWj3MDL3c2+h60i47kUyyfF3DmM7HfttG+Tba8r0dKTbnGhxq6crQUzRuG8z1v
-wTD0C5gZOLQacHgs3+Ode+/W2V12YQ5OH67bfyhBprl77QTbOhRXfO9yLMtQgQBJ
-/iY1F7z83wrWq5pVVpwB5YBu46zQoALDpJHwY1210HVq49AAlDjhvtPdTORuvF0J
-6wOvIyVbvopgNTc2oXLLoO450LN5hm1/ayOCHlD1mjgvONSHo3pT1h5fO2+PP6t9
-gu3K5NJO4UvCPLRQu2kqqy1Yan90bxwz7zsjF9DPWPaHynttHumIjg/b5uhf0KPs
-ozLvKgwvYsatb7Qcwx9mW9ASsgBE9n0dvcKbJVgJ3Lf1hvltmbYRAVIjbGq5VAbV
-KQajjXjkcSyT3VwJfnmNMIY20+efuF6hyXGISz73ZWJqFyZDHVlmVhgbl9yG31xb
-w/bgTvyVBlFD2AkLINwZv/ugpSF+gq151WZAWIJJdhFNYs00iQrYMqMrbyjW2awr
-HNTmxEwpdveQhwT7lzG3cE6yV6+q+NTCvaTAPuVbVXb+giPsZr1a0Jr0nxoqWi28
-ebHUKlGfrdOA5/udi5Ox
-=TRd9
+iQIcBAEBCAAGBQJU2ta6AAoJEF0huFKJUZL5QZMP/28X0I9guS39cKl+5NKdp7d1
+rooNKbSkERZp83PhkLuKZ7R/e/33cnSp6ID7veVUQ4NbiF9ieEQBtjHcusjsDEb+
+NVI3B05EvxrntW19kgI+A8J+RWoQIgsgDii55RLZC11aqMmrvvBrgjBC9NZgiu+/
+c3+Xt52LYF6TDSz2fFFjGgWWDdzOJNl/ETsrqlABR6yyQ0OUxopreEpaJlkbywTu
+HXnc3L+xf085+OSj2sR8+s5HTccKuhEaTN5+2pJV/R++pjLyctUFto0faZ8MUsnb
+ZZ9N30Cm/ouH+sex8il/d/Cg+g5fZwpsLmAMOwTUolrP6WhWSMAiSvyp9th8rILO
+2Mwj3MCrwp5p4/pfeZeH/CyY+PPzn5r4mgz3XePxbHslCH1Djnof+R4jYLGyLXK7
+JTitVqHfeUp2j4tW4zcNWWUXT5l2OZWl9a+np+uSquqI8D1W4zXWmNaQV69MoWcY
+KunYe1sKhYB+yzCsZJFGXk6wYBXuOcNPs0B0GuuVdE6jaleXXgb6rQgjGGH18o2X
+sxttn1mg5YhfEwLXl9Dlyf85ldBmUYcAHyKmWsg6/J+ysJx3Z1wyzOeIKl9LqFgc
+7rMitls/fBiBDTr/2rHSeCXnPEW8l+2+38xMlr4LwijobsnbA2CpddHI+zNtO/dC
+4UYC8aOD0p1Sn4+nKOTC
+=GOZ0
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/docker/docker-1.5.0.ebuild b/app-emulation/docker/docker-1.5.0.ebuild
new file mode 100644
index 000000000000..8e22c47d45c9
--- /dev/null
+++ b/app-emulation/docker/docker-1.5.0.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.5.0.ebuild,v 1.1 2015/02/11 04:12:36 xarthisius Exp $
+
+EAPI=5
+
+DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
+HOMEPAGE="https://www.docker.com"
+
+GITHUB_URI="github.com/docker/docker"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="git://${GITHUB_URI}.git"
+	inherit git-2
+else
+	MY_PV="${PV/_/-}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://${GITHUB_URI}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	DOCKER_GITCOMMIT="a8a31ef"
+	KEYWORDS="~amd64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+fi
+
+inherit bash-completion-r1 linux-info multilib systemd udev user
+
+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-2.02.89[thin]
+	)
+"
+
+DEPEND="
+	${CDEPEND}
+	>=dev-lang/go-1.3
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# 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.7
+	)
+	aufs? (
+		|| (
+			sys-fs/aufs3
+			sys-kernel/aufs-sources
+		)
+	)
+"
+
+RESTRICT="installsources strip"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	NAMESPACES NET_NS PID_NS IPC_NS UTS_NS
+	DEVPTS_MULTIPLE_INSTANCES
+	CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED
+	MACVLAN VETH BRIDGE
+	NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
+	NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK
+	NF_NAT NF_NAT_NEEDED
+
+	~MEMCG_SWAP
+	~RESOURCE_COUNTERS
+	~CGROUP_PERF
+"
+
+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"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+
+pkg_setup() {
+	if kernel_is lt 3 8; then
+		eerror ""
+		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.8 or above'
+	fi
+
+	# for where these kernel versions come from, see:
+	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
+	if ! {
+		kernel_is ge 3 16 \
+		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
+		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
+		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
+	}; then
+		ewarn ""
+		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
+		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
+		ewarn ""
+		ewarn "See also https://github.com/docker/docker/issues/2960"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+		"
+		# TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this
+		# an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS
+		"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	# allow user patches (use sparingly - upstream won't support them)
+	epatch_user
+}
+
+src_compile() {
+	# if we treat them right, Docker's build scripts will set up a
+	# reasonable GOPATH for us
+	export AUTO_GOPATH=1
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a zip, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	if gcc-specs-pie; then
+		sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+
+		sed -i 's/LDFLAGS_STATIC_DOCKER="/LDFLAGS_STATIC_DOCKER="-extldflags -fno-PIC /' hack/make/dynbinary || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
+	fi
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	# time to build!
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	# TODO get go-md2man and then include the man pages using docs/man/md2man-all.sh
+}
+
+src_install() {
+	VERSION=$(cat VERSION)
+	newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
+	exeinto /usr/libexec/docker
+	newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	if use doc; then
+		# TODO doman contrib/man/man*/*
+
+		docompress -x /usr/share/doc/${PF}/md
+		docinto md
+		dodoc -r docs/sources/*
+	fi
+
+	dobashcomp contrib/completion/bash/*
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins contrib/completion/zsh/*
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r contrib/syntax/vim/ftdetect
+		doins -r contrib/syntax/vim/syntax
+	fi
+
+	if use contrib; then
+		mkdir -p "${D}/usr/share/${PN}/contrib"
+		cp -R contrib/* "${D}/usr/share/${PN}/contrib"
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog ""
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog ""
+
+	# create docker group if the code checking for it in /etc/group exists
+	enewgroup docker
+
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog ""
+}