0.7.1 bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64

3 files changed, 191 insertions, 2 deletions

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index 6dd7629f6982..2fe35e62e089 100644
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/docker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.6 2013/11/26 15:17:48 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.7 2013/12/10 08:13:47 gregkh Exp $
+
+*docker-0.7.1 (10 Dec 2013)
+
+  10 Dec 2013; Greg Kroah-Hartman <gregkh@gentoo.org> +docker-0.7.1.ebuild:
+  0.7.1 bump
 
 *docker-0.7.0 (26 Nov 2013)
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 08b8701f74a1..b3d914ea24cc 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -2,11 +2,13 @@ AUX docker-r2.confd 581 SHA256 94e1c07b09701f3b0b1c4f6f917206da3b32f8d7e961c3850
 AUX docker-r2.initd 1767 SHA256 0cb83137cf3d37aadf450dd30ec9e0ceca3d865867f7fe64a43a1d5f42d2ecf8 SHA512 1250f8b16ded27877cf2759fca1d69f37ce308d4d5e5a29438210e847894617fa088260b0cfd87e1ee65ed26a4293d98c79462c1ccc93aac14203fbfed4b69a2 WHIRLPOOL 272f04feb587a0f91079f41ad90868f99c28a21a5ec35876f38dbbd342a53796dd4ec822fa2cd3506f22485b6a0147d24da2e7ab89da7875f84e3e9fab50c3c8
 AUX docker.initd 881 SHA256 c9ac677a9a4a8f3dd74fa79b458b06cf10760bc5df44f14067dd34da78b1dcd7 SHA512 ffa6893b3d9e001c1938e917db91d60f4e6c39954cdc97d9851eded64f6ac0efa7c03c48a5d26370e028236f54258e832f991f9ca099c0cc434ebb55e731adf2 WHIRLPOOL 93218226393b24bf5786cc0f4eb6090f5977d33aa4c8316886a77494d347fc5dd78013df121f442121870f7c0f430183e6ccdc29c2f79c6c085882d6bd327cf1
 AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6f5a9a7ec8a0a0a SHA512 d7564489486b3547cb79057fa44cb3eb0aa6c50ec47eca12579748170d62ab435395d173fdf39fcec8e86f4778db7413b7fa0ab85dbbd2fc1636164d4aad8b37 WHIRLPOOL 553f8a93a5d7cb6cc037a2004e19efa06520eba363e12574a5d251d10b23d9f24d1a023eb9915968a9bb661bddb577163948fb180a85ca9c916cac5c6680b1df
+DIST docker-0.7.1.zip 2622521 SHA256 e54eb97726dc6cf16171e60f955f45d214d325b1cd3632b095e485854ce24938 SHA512 22275f81b45e49d8f6e3e376398eca981bb8e8d4a9b80ec83f96129607a49fc79adab742d1daf4f33a1200c7eb693ea428770ad64ababd5b11e531072f7d95d9 WHIRLPOOL 6b6bb001014f15ae78e3647ec16dd03cf069348df9016a7592dcf80fc0f0c9ccdfd0a3d95a5377f5de792c534a789f6b5e21379d41221c48fc06b13debc71581
 EBUILD docker-0.6.3-r1.ebuild 4432 SHA256 22602753383c95c36105593fb0dbe35a69b18cf02c6694590a94c097da985434 SHA512 a4a923b085368be7f6339f461fc037c38fb6b465cadf4e7264c4f3806b3b46713f85ac5b77bf3d469eebaa91f3d3e22ea3ec275abe38686b3004a7acf6b967cd WHIRLPOOL 74082aca50521ca405994ed15e04b9fc8f1c8485a7a0e00af6bb47c717dd3ea35341d946d88a01148fd8c23d083ed4fe1d73be33de92547cdbafa3d2183f0001
 EBUILD docker-0.6.3.ebuild 4404 SHA256 2e38617c57dfe48c270f026c7870de2b83abcfb4d07c40537e5672f389fe630b SHA512 ab108c310a1fd017bf18446ff490b6699d3503b4efcaaba809acee6f4a70be35aea119268ece608111c614f1a214324319af6673bddc0377debc92dd6345ca86 WHIRLPOOL f6dcc4dcffa7d9bee4a74a9f819ca461c68e9ec779818da0bc311ecb1ad5b8b74e6df4c9612b6dd8d6d33e04d55c6c87818491042d1fc00cdd5577a004e6163e
 EBUILD docker-0.6.5.ebuild 3663 SHA256 b6caa9294deb3507c7348b7754189249918442a953bced569d17874ba62e7464 SHA512 940e029632d8bd9c4e8cff57fa39607479e60546250d690c5eed4fbba5b603c4f1b6ef73ea79855d7bfb3c12d7797d091aa38fb368c985b038e5ab6d6385a846 WHIRLPOOL 0be135887e0bdb0820d8f98f7c4997981548c3a3c648da8048d7be349c0aa62c572d6f0df8259164909523ef471a7e7832ab7c738990da24e2c6420c6acac9ef
 EBUILD docker-0.6.6.ebuild 3663 SHA256 226206b737be09b63fc37446b519f36939fef2324247a5062a90bd565aef2d0c SHA512 794851abd01a565d74fb60ce03ad27094920ce2bbbb11a13420c9810f708659d575f81d98e62eea721da1dc29b6bc63d25f43c5a9f2b30dfe757b6fa71e607a3 WHIRLPOOL e53e8ca71d2c19a6fdbaceb3854d7bdfbe850e742d97c9430999fb8c43bd8a4b54bc54d74aa859d32e9994ae814e7b523bf92689459115928ed3199aa685ffa5
 EBUILD docker-0.6.7.ebuild 3693 SHA256 600a6fdade431c283c4229e6740020925f4af4c7309cc43924f0c0e0c60d6b96 SHA512 317a5235cf5a1b39b3aef3535d3564422e839e1279d7d6574e0bbcbe65906547c5475db91fb14ec7a53520c5594564f0eb9f4ae770aa312ffcd632e286395b7c WHIRLPOOL a935d52fd2d42d241c5c33f9665797cc8e730c26794d7a6304fd8420ecf19397cacb30b76b6a9fa42f75017d3ef173d1e74b1d4aec7029616d71c44bfaa1ddd5
 EBUILD docker-0.7.0.ebuild 3846 SHA256 3fe946e872d4dea18334587f756069ecd533be6dbd1bf59c49db34222bd8e44e SHA512 736266d54c92c34e487392aa46477d2298ce96159205f00786bffdf107a3b1b5a88da4e5ae0ddca8fc29d4ebb09dcc4d06d635273dcf72ffceddfc79d9462fe7 WHIRLPOOL 3d0a2596129c1ae2f5af007cf0caa13e9a0b949bf30344fa0eb7f63ab820d9c4ac505830573dd14925d4c010d571455012690475239ad7efb92850b0c125f715
-MISC ChangeLog 1218 SHA256 c3a831b8cee688d22faeafb3337b4cc5b96f43d87377c50318fae5e3d8592fb5 SHA512 644bd9499f2a1b2d078cb78a988b7b01115a84dec2c03409de33e4ca2d2e6b5ded0d7d99e668bc0947c99d37c5cab3e0c759e48a4163dc987a50ac3daca214a7 WHIRLPOOL b70eb91b10d48d496c7128e74d073ee5c1f29fc744e3f784e73c08b86f42eced91ed941d55b4ad0108465c7e04a5a1d7b6bddaba9b84dc63ba91f943c05e6656
+EBUILD docker-0.7.1.ebuild 4549 SHA256 3007b1f620f4c7d5c649d05792fc5bb07ac7ebec180fcc8940b754dececdbcc4 SHA512 5686cc8a7ba30f25a06d272a9fdd82fe86e898803c8a6e5c1102578d4affedcf02086e857da9fbd58bc657097c0dcf9b88318e6ed468a27279c26986ad0ca9f3 WHIRLPOOL 7dbfd5df66690940deaae3c39594005cfbdafab5df3d2f9fa350c88f07c7b463facf2ce9d4af616817bdf78db6fb335c628f9e701a10e254f8ce0a033ac5e97f
+MISC ChangeLog 1337 SHA256 ca0abdfa78174c41d37891fe1a1763975ab6fd58c17505d48d1f5f00c6bed205 SHA512 79f5939320182fd196e7651dc993b6556240bd3fb73f639b29907579a7ace82ff39d50a69447b876e4d4aee3751eff6ea3d95ceb3518ceffde7ddc869f0a1b18 WHIRLPOOL b25dbca6d31e502136529ad4cbdc6ecce58e4b001cbef4fcb476b37e6126fe63e6c90c20fcab7cc6288dd98db9be3a919e90d78e6aa6de16a9d52118da7ef6a4
 MISC metadata.xml 839 SHA256 5404323c6318eea6a2ad31f370ee8b698503c421532ed6341062262bf8b4d243 SHA512 afde4228cad6131fec7d91ecd85829f3917497fd67618137b008993912c564159855c1ddc054343bc3f49b0bd27610d5daf5afede3d1a4a81ac14f7e7638ca3f WHIRLPOOL 71ed16244de522827c9beab96b76b211a00ddbb750c1080074951522691424cebf08af116119e5ebdb1a98823e95735dfb27586396846dd9c5ff2a9f1dac6254
diff --git a/app-emulation/docker/docker-0.7.1.ebuild b/app-emulation/docker/docker-0.7.1.ebuild
new file mode 100644
index 000000000000..341f2f75e362
--- /dev/null
+++ b/app-emulation/docker/docker-0.7.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-0.7.1.ebuild,v 1.1 2013/12/10 08:13:47 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="88df052"
+	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 +device-mapper doc vim-syntax"
+
+# 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.1.2
+	dev-vcs/git
+	dev-vcs/mercurial
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinxcontrib-httpdomain
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	!app-emulation/docker-bin
+	>=app-arch/tar-1.26
+	>=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
+		~NF_NAT
+		~NF_NAT_NEEDED
+	"
+	ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers"
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+		"
+		ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM
+			~DM_THIN_PROVISIONING
+			~EXT4_FS
+		"
+	fi
+
+	check_extra_config
+}
+
+src_compile() {
+	# eventually, perhaps Gentoo will include a "go" eclass to do some of this
+
+	export GOPATH="${WORKDIR}/gopath"
+	mkdir -p "$GOPATH" || die
+
+	# make sure docker itself is in our shiny new GOPATH
+	mkdir -p "${GOPATH}/src/github.com/dotcloud" || die
+	ln -sf "$(pwd -P)" "${GOPATH}/src/github.com/dotcloud/docker" || die
+
+	# we need our vendored deps, too
+	export GOPATH="$GOPATH:$(pwd -P)/vendor"
+
+	# 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
+
+	# 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/*
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r contrib/vim-syntax/ftdetect
+		doins -r contrib/vim-syntax/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 ""
+
+	ewarn ""
+	ewarn "If you want your containers to have access to the public internet or even"
+	ewarn "the existing private network, IP Forwarding must be enabled:"
+	ewarn "  sysctl -w net.ipv4.ip_forward=1"
+	ewarn "or more permanently:"
+	ewarn "  echo net.ipv4.ip_forward = 1 > /etc/sysctl.d/${PN}.conf"
+	ewarn "Please be mindful of the security implications of enabling IP Forwarding."
+	ewarn ""
+}