0.9.1 bump

Package-Manager: portage-2.2.9-r1/cvs/Linux x86_64

3 files changed, 221 insertions, 2 deletions

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index 72bbd8ed4715..d642ec91b9b1 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.17 2014/03/11 17:57:50 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.18 2014/03/26 12:21:28 gregkh Exp $
+
+*docker-0.9.1 (26 Mar 2014)
+
+  26 Mar 2014; Greg Kroah-Hartman <gregkh@gentoo.org> +docker-0.9.1.ebuild:
+  0.9.1 bump
 
 *docker-0.9.0 (11 Mar 2014)
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 91620a34af5e..83df1a7c19b1 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -10,6 +10,7 @@ DIST docker-0.7.6.zip 2669399 SHA256 d9ec6e598dcf75528bf5bfdfd341498a54b8d074870
 DIST docker-0.8.0.zip 2742779 SHA256 826a72a2b676bf2e5dea731c35c51c6f2e6e3d5ac7cc111aad3bfd86ca41651b SHA512 e761cf57ac9bc42a9575695083ccbf92ea4360e1efead014a14d4257bbb242d4b1ec26d85f9d12988624893362ddfb09ad7a6c7de23a476659923b923768d2e1 WHIRLPOOL 124e04216c9f09f289d6215ba27c9af7f850d47b694dda058a69ad463cf40e8a1ead469acd1894bda0f331557bfe125087bad70a784b8578de90bea2e044653a
 DIST docker-0.8.1.zip 2791663 SHA256 7ed55a58fee3830695afffb702f99c691ee426ba4f5c9e614423e22c0ab17332 SHA512 ffbbdcf818873bd4003c28da9c41fc4913767489b01065353209b655f8b7ff4350b09d11f66c0b93c180c1b3fd985efb1d5d17d72219033f3fa88ebb113f1792 WHIRLPOOL 06b0ac70b7237aaf31cb09f8e5c01d060a7eb53d1e4237b7727b99d99b1c783cc615c5351e5697a0af517e933ad3fdc9671de3aa20f7d76bfdebc678b96e4210
 DIST docker-0.9.0.zip 3028848 SHA256 583759783fb48dc30615b3d2bad8a0e21f69c8759c13ec48a8316b26f5105da7 SHA512 666feff73b5ff2c9c9175b7873e3827ab1956c523be5fceed1e175029fe35cbf7ab1783bd4494d4f1917a9b9c2928c58d88e37b10db804ccd1a97e8fa447f00a WHIRLPOOL 17b8dde7693bc7da3215d27d2e6f337f7bbb29c71c12926911d7affed5f9ba8e5938cdcdf89a7123db3037b4cd6f6d0bf00f0cc32106bc9e9c6072a9019ca593
+DIST docker-0.9.1.zip 3033807 SHA256 1ba631959aca1a07ab38204743784b5bd591319f0b4591f553f3fcb969bddc81 SHA512 8e34857f3ee75e65d65ef0f4c4bc4326919cc9d126cc839526a7d5d7781f64e388d607e02eb25aef974db0e87c219c7b112ca75cdcc6e86fa389c1598729b23c WHIRLPOOL 6893c313c2855fed31a696d29b8eed1ab1b64cdd280561bad8510bce1e77f3651cb771c867b18b831c5f1cc4f288ac0382b46c0ab5d9fc2af86d34ddd1cb5eda
 EBUILD docker-0.7.0.ebuild 3846 SHA256 3fe946e872d4dea18334587f756069ecd533be6dbd1bf59c49db34222bd8e44e SHA512 736266d54c92c34e487392aa46477d2298ce96159205f00786bffdf107a3b1b5a88da4e5ae0ddca8fc29d4ebb09dcc4d06d635273dcf72ffceddfc79d9462fe7 WHIRLPOOL 3d0a2596129c1ae2f5af007cf0caa13e9a0b949bf30344fa0eb7f63ab820d9c4ac505830573dd14925d4c010d571455012690475239ad7efb92850b0c125f715
 EBUILD docker-0.7.1-r1.ebuild 4523 SHA256 58a8f31b2764c0e75fd053a76914bfc7c1c97c0826a4f0796459da27a8175ba3 SHA512 ac6203f6155cdc1194842a90d6b3f6d2cebc4c463de677b97cee405f0cd2aeaea02c233d006c222641c0afa78ba90e5c20c4057d9a1d22f47a683237a611ae31 WHIRLPOOL d2bc58fab76fe2a211aa5301ad9a5d058c42918de3a2729d11cbeb569a4a9044d3af0e6d6e772bf2b0d85220311b5ecc8725d5a833188d9790f01d1872c805a9
 EBUILD docker-0.7.1.ebuild 4549 SHA256 3007b1f620f4c7d5c649d05792fc5bb07ac7ebec180fcc8940b754dececdbcc4 SHA512 5686cc8a7ba30f25a06d272a9fdd82fe86e898803c8a6e5c1102578d4affedcf02086e857da9fbd58bc657097c0dcf9b88318e6ed468a27279c26986ad0ca9f3 WHIRLPOOL 7dbfd5df66690940deaae3c39594005cfbdafab5df3d2f9fa350c88f07c7b463facf2ce9d4af616817bdf78db6fb335c628f9e701a10e254f8ce0a033ac5e97f
@@ -21,5 +22,6 @@ EBUILD docker-0.7.6.ebuild 4589 SHA256 5f860fc41efce39e64baf1bc420110e594e363f49
 EBUILD docker-0.8.0.ebuild 4508 SHA256 2c55a4012fbdc4516d09b38ee2819fbc3449ea1f60f1adfa902515875d9e7181 SHA512 ed9c2c1f1e280d76775efdeabe036f51aa965113668c65348268d673c31161ae8f0a5ac4a83ade4f2b5b6a80866475e661e2cb261bfc4bad2b2c2e1f3bafea82 WHIRLPOOL 609663d898d3f32295cb0485a61d9f00a5c8455de936b71d07f0ed90dfa2ee8c296178123eda1b8238aeab78b0719738475002d07f8007672902a91f180e73a9
 EBUILD docker-0.8.1.ebuild 4252 SHA256 d0d421eb8fdffb8abfacd64a85b0d313f2bc97e0c7e787a928cf8a363daf716f SHA512 c4a257e44ea04c93a719f6eda555abd64f1692b4f04bc52e59115c82c84a739a080f0eb2f5bd09f97cb7ce143b93102580933b4a595902e439ebcbfaaea02849 WHIRLPOOL 2a9c5fa20f1ee8e9ed8b153c96b3ee462b215b86eb119dfdcfee2e6ec0d73c6226f3f56da2f5986ab59cbbb2d09d77dcc921d7934b914af36e180d9b9cfbbf42
 EBUILD docker-0.9.0.ebuild 4935 SHA256 e373e971d144effaa68a3b3a518c18e1a706e67dce4a3d63432abc01d99fb488 SHA512 f340cda8c601da094012f9db19d741d5bd07599e69d0e3e2ac3ba6e863d89d72c6ff62cc9befb8ed5cf6e1b81472a74f3d2a367e52097332d820a60685d3c551 WHIRLPOOL 032fccf7f1e1dae1f14b67a38f370a54fa44323382647b1a2d5393bbb1cc4d82fdc0b3716aa474e153d67378be908b653b288be6f3650758e803939b1ce221b0
-MISC ChangeLog 2810 SHA256 fe5db754c2c5fcfa3b683889c55b0bab78ee4997fa556496c592a976fe021164 SHA512 fcd46e96a182ea670fe96cfb14cbf2cd7a658d6a997c4354fca5dbbe20114182740d09f6abaf6d306d6cc034373680e79a990578e8fb950c8ab2c91dde61f1fc WHIRLPOOL 089524b67fe6a73a7ab635411c3ed9a241b735dec8f93bbbb853fd772d87b36e3e74f49b66a25b62af1578ef92780376b6fe988debbef1b03aa863b8f6f4f172
+EBUILD docker-0.9.1.ebuild 4901 SHA256 8b1b8027f2ad4bb14c4604aa99f655a01e54f788a39c33c5efcb65ced4166d91 SHA512 d84dc9c8af1d055f2125de726c2a6ccbde1c20ec1d23fc84f315e43c695ba92aac2cad27605a3527472b7c1e4b491f485b0416ec58752c1df82a5b1dc761563d WHIRLPOOL 073458d66e848c554100106b25e44dc05e9017c6f1ab682aaea7f9f94c8feab8977017e4ec319aa636ccd5522c693308c18ba1f3a5f522bb27d20e283efff3ec
+MISC ChangeLog 2929 SHA256 8a9265fc35e92ce85b9fa4acddb65d865c8db0f102ec41c1b1335a1e1172f858 SHA512 8dc8910c9264616360f2ce2b4217bc5b5ceb691527f5fe643c4b5484644c91172632da41e41258e234b471cc5ddd31b64a32050928d8d1224e9e3ebe0f9bde90 WHIRLPOOL 28cf8a0c1509217a4da96ab96df6c6ca283c2a2045b973bccb9d05581ef167cd5a3be29ccb4faca8b74f9ced72c6f77051cc413054484705c14b9047ffb65654
 MISC metadata.xml 1059 SHA256 dd02a2ec51defa2d00012b2b80a7e604c086a4cf7c5a2677ebe00fab82c95db6 SHA512 b1c6441955610b4fe171de2953b892ff701b87c28e1610c82074b7cb9ddbae0015d696dd324a33ffb3b57b3b91acf4d5825aa4aa828d3870ad6c25cf55598ec9 WHIRLPOOL 284d67abb80b4217501ff851af2a57d9ded5df4d9087d842cdbe33946faebf76dd24c53341ed1fe973112a51992469f4141ac2d9a76339d6a6be294c5c65d4ee
diff --git a/app-emulation/docker/docker-0.9.1.ebuild b/app-emulation/docker/docker-0.9.1.ebuild
new file mode 100644
index 000000000000..50ea3e43deef
--- /dev/null
+++ b/app-emulation/docker/docker-0.9.1.ebuild
@@ -0,0 +1,212 @@
+# 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-0.9.1.ebuild,v 1.1 2014/03/26 12:21:28 gregkh Exp $
+
+EAPI=5
+
+DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level."
+HOMEPAGE="https://www.docker.io/"
+
+GITHUB_URI="github.com/dotcloud/docker"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="git://${GITHUB_URI}.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip"
+	DOCKER_GITCOMMIT="3600720"
+	KEYWORDS="~amd64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+fi
+
+inherit bash-completion-r1 linux-info systemd udev user
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="aufs btrfs +device-mapper doc lxc vim-syntax zsh-completion"
+
+# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	sys-fs/lvm2[thin]
+"
+DEPEND="
+	${CDEPEND}
+	>=dev-lang/go-1.2
+	>=sys-fs/btrfs-progs-0.20
+	dev-vcs/git
+	dev-vcs/mercurial
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinxcontrib-httpdomain
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	!app-emulation/docker-bin
+	>=net-firewall/iptables-1.4
+	lxc? (
+		>=app-emulation/lxc-0.8
+	)
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	aufs? (
+		|| (
+			sys-fs/aufs3
+			sys-kernel/aufs-sources
+		)
+	)
+"
+
+RESTRICT="strip"
+
+pkg_setup() {
+	# many of these were borrowed from the app-emulation/lxc ebuild
+	CONFIG_CHECK+="
+		~CGROUPS
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_SCHED
+		~CPUSETS
+		~MEMCG_SWAP
+		~RESOURCE_COUNTERS
+
+		~IPC_NS
+		~NAMESPACES
+		~PID_NS
+
+		~DEVPTS_MULTIPLE_INSTANCES
+		~MACVLAN
+		~NET_NS
+		~UTS_NS
+		~VETH
+
+		~!NETPRIO_CGROUP
+		~POSIX_MQUEUE
+
+		~BRIDGE
+		~IP_NF_TARGET_MASQUERADE
+		~NETFILTER_XT_MATCH_ADDRTYPE
+		~NETFILTER_XT_MATCH_CONNTRACK
+		~NF_NAT
+		~NF_NAT_NEEDED
+
+		~!GRKERNSEC_CHROOT_CAPS
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_PIVOT
+	"
+
+	ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+
+	for c in GRKERNSEC_CHROOT_MOUNT GRKERNSEC_CHROOT_DOUBLE GRKERNSEC_CHROOT_PIVOT GRKERNSEC_CHROOT_CHMOD; do
+		declare "ERROR_$c"="CONFIG_$c: see app-emulation/lxc postinst notes for why some GRSEC features make containers unusuable"
+	done
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+		"
+		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
+
+	check_extra_config
+}
+
+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/lib"
+
+	# 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'
+	fi
+
+	# time to build!
+	./hack/make.sh dynbinary || die
+
+	if use doc; then
+		emake -C docs docs man || die
+	fi
+}
+
+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
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	if use doc; then
+		dohtml -r docs/_build/html/*
+		doman docs/_build/man/*
+	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
+
+	insinto /usr/share/${P}/contrib
+	doins contrib/README
+	cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/"
+}
+
+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 ""
+}