0.8.1 bump

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

3 files changed, 188 insertions, 2 deletions

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index f795620fb429..0ff46e979f7f 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.15 2014/02/05 22:27:43 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.16 2014/02/21 15:56:26 gregkh Exp $
+
+*docker-0.8.1 (21 Feb 2014)
+
+  21 Feb 2014; Greg Kroah-Hartman <gregkh@gentoo.org> +docker-0.8.1.ebuild:
+  0.8.1 bump
 
 *docker-0.8.0 (05 Feb 2014)
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 8ade8945613a..6c98e68a537f 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -8,6 +8,7 @@ DIST docker-0.7.4.zip 2667244 SHA256 e087473ca83e0c7ce435333a4faacc53626cb644768
 DIST docker-0.7.5.zip 2668999 SHA256 845ebee1f2f15fe076d5058f137a994d2054f315c4dbd1220df9a58a78075fb7 SHA512 01c4f8f8b9e0290e8834b00c4327ee959c54337a1b130074902aef23556495ae0abcfb88b1b7ca4ed76236b301779b992fb93a264bae3b5d6acd9f08c7257dd5 WHIRLPOOL 178588c3f98c89702bfa847b72efe2f27ba6eaebeb1fdfef2c831b24277d172d133dbe1f4b210e1051383c0a4fd30cd52139c03e9756c091d104f1eb5e1d6974
 DIST docker-0.7.6.zip 2669399 SHA256 d9ec6e598dcf75528bf5bfdfd341498a54b8d0748707a0cd6cea0cbe3683fac9 SHA512 8787e7180fb3d4841c9b12ed27c0eac6dbfd777260f51d9b130582952e314835dd177debce354cf49f264b305817fd249411a751ea7ab0bb02eaaff2e6a5984c WHIRLPOOL bb30164d13087b4375011ad569c09087fe7fa493b228087631b52f1a55d4b77e28af75777629f99c1c0e4e8e07f65a3ece123d3ca86e19fa5eef2d90ed03813d
 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
 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
@@ -17,5 +18,6 @@ EBUILD docker-0.7.4.ebuild 4597 SHA256 2cba1bd814e79fd86ad5703da0303317e587930f7
 EBUILD docker-0.7.5.ebuild 4597 SHA256 57b1d2dd076c4a7528cd53b9b00b7349b8f13ccad999a8087a9bd3b830378413 SHA512 77ab7d1c696d51a0e04ed7673d8bf9b3816b4896f547ad10404f8be06271b886d4a9e4747025f3dbad50881024e6aca7bb714c7158cc159bdb0f8ff2aca8d96e WHIRLPOOL ecaf0b592b21f96010c3183f2b44b23cc4240d863651e832f4c6a6c35aee5ba829e3cfa22b6d044f614771d7b5ef9fbc027050f9ef2024e7d98372402aaa0efd
 EBUILD docker-0.7.6.ebuild 4589 SHA256 5f860fc41efce39e64baf1bc420110e594e363f49bc5e022c618bc0d8c73a82d SHA512 ce83d0ae848e15390a6116285dc7eef830cc4616117292f2f56e077a9ce110ad06dc4cc3f67b6e7d186bc462e9281847258110d5ca446a552799c47bde50f862 WHIRLPOOL 1a69788a2ec19b2138e03c423d78d145c3ed2f5320ec5367fc8d5a21dc6c17c58de6834be67cb9ac885f895dc3de3add8ed479a66963b04883a93f9294c8b399
 EBUILD docker-0.8.0.ebuild 4508 SHA256 2c55a4012fbdc4516d09b38ee2819fbc3449ea1f60f1adfa902515875d9e7181 SHA512 ed9c2c1f1e280d76775efdeabe036f51aa965113668c65348268d673c31161ae8f0a5ac4a83ade4f2b5b6a80866475e661e2cb261bfc4bad2b2c2e1f3bafea82 WHIRLPOOL 609663d898d3f32295cb0485a61d9f00a5c8455de936b71d07f0ed90dfa2ee8c296178123eda1b8238aeab78b0719738475002d07f8007672902a91f180e73a9
-MISC ChangeLog 2548 SHA256 90d512763ece82bcf51b7100ef4b3edce3b9c3b413435c096d68fd4d0db8447d SHA512 4516249841111037f5304b248101c633435cc9e43b561718129507cd00bf41938641d068363ec474150bbaf494655024bd47927ea16bf23bf134dd317a90ba2f WHIRLPOOL 55e16afc042986eb08a55bef188652acf62210735fc943107820fa825d1d34975d388aba58da4cba5454a4bd8e884b0904392294bed4b93d7411fa61b24bd444
+EBUILD docker-0.8.1.ebuild 4252 SHA256 d0d421eb8fdffb8abfacd64a85b0d313f2bc97e0c7e787a928cf8a363daf716f SHA512 c4a257e44ea04c93a719f6eda555abd64f1692b4f04bc52e59115c82c84a739a080f0eb2f5bd09f97cb7ce143b93102580933b4a595902e439ebcbfaaea02849 WHIRLPOOL 2a9c5fa20f1ee8e9ed8b153c96b3ee462b215b86eb119dfdcfee2e6ec0d73c6226f3f56da2f5986ab59cbbb2d09d77dcc921d7934b914af36e180d9b9cfbbf42
+MISC ChangeLog 2667 SHA256 1b70006b3a23e09aa605e71a83c92c2c7cc2ecaef8327ddfd0984496db724fa6 SHA512 3a5271abe24ee3f9c600fdc475deda788fd16f53bcf9157c7f8507acefa60d8c3bef359904ba821cfb66431c16c2b183f5d4421aaa2181c39163c5778ed2bda7 WHIRLPOOL 7f2be4ac44d9b74638280e444da2a1446304f084a31eac5ebd4d6e0494c68e7142db0a6848812e8d26541f5672a6c454c6e2d610cf418827b8d44ad6039fea0b
 MISC metadata.xml 969 SHA256 7e06c79bd96f5e2c5443c406f0f9f472d1b938a005bf33ab64c8af71fd1f1c0e SHA512 87515d26865220367866f94756b439098283878dc7fa600ba97e46d7fd9c76135c706cb6fb7bc5d1f0e8add47253a97285f26c628edfd8adb6bb5936cc89cc82 WHIRLPOOL 23da3d7d7b2892b8c2e7e48a5369970d8908308a992f49c13da945b5c5d3be7e87f4fa8c8f977eaf24e0998479b5591ebdb992c95bf9c731c8de7c89b123282a
diff --git a/app-emulation/docker/docker-0.8.1.ebuild b/app-emulation/docker/docker-0.8.1.ebuild
new file mode 100644
index 000000000000..9a6cd0045a71
--- /dev/null
+++ b/app-emulation/docker/docker-0.8.1.ebuild
@@ -0,0 +1,179 @@
+# 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.8.1.ebuild,v 1.1 2014/02/21 15:56:26 gregkh Exp $
+
+EAPI=5
+
+DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level."
+HOMEPAGE="http://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="a1598d1"
+	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 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
+	>=sys-apps/iproute2-3.5
+	>=net-firewall/iptables-1.4
+	>=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() {
+	CONFIG_CHECK+="
+		~BRIDGE
+		~IP_NF_TARGET_MASQUERADE
+		~MEMCG_SWAP
+		~NETFILTER_XT_MATCH_ADDRTYPE
+		~NETFILTER_XT_MATCH_CONNTRACK
+		~NF_NAT
+		~NF_NAT_NEEDED
+	"
+	ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+
+	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 GOAPTH 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/export LDFLAGS_STATIC="/export LDFLAGS_STATIC="-extldflags=-fno-PIC /' hack/make/dynbinary || die
+		grep -q '-extldflags=-fno-PIC' hack/make/dynbinary || die '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 ""
+}