add dependancy on app-arch/xz-utils as it is needed

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key )

2 files changed, 170 insertions, 1 deletions

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index 900a599dade7..61945e6c0b26 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.1 2013/09/25 03:22:15 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.2 2013/10/05 17:41:13 gregkh Exp $
+
+*docker-0.6.3-r1 (05 Oct 2013)
+
+  05 Oct 2013; Greg Kroah-Hartman <gregkh@gentoo.org> +docker-0.6.3-r1.ebuild:
+  add dependancy on app-arch/xz-utils as it is needed
 
 *docker-0.6.3 (25 Sep 2013)
 
diff --git a/app-emulation/docker/docker-0.6.3-r1.ebuild b/app-emulation/docker/docker-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..a697fdc82340
--- /dev/null
+++ b/app-emulation/docker/docker-0.6.3-r1.ebuild
@@ -0,0 +1,164 @@
+# 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.6.3-r1.ebuild,v 1.1 2013/10/05 17:41:13 gregkh Exp $
+
+EAPI=5
+
+DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level."
+HOMEPAGE="http://www.docker.io/"
+SRC_URI=""
+
+EGIT_REPO_URI="git://github.com/dotcloud/docker.git"
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	EGIT_COMMIT="v${PV}"
+	KEYWORDS="~amd64"
+fi
+
+inherit bash-completion-r1 git-2 linux-info systemd user
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc vim-syntax"
+
+DEPEND="
+	>=dev-lang/go-1.1.2
+	dev-vcs/git
+	dev-vcs/mercurial
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinxcontrib-httpdomain
+	)
+"
+RDEPEND="
+	!app-emulation/lxc-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
+	|| (
+		sys-fs/aufs3
+		sys-kernel/aufs-sources
+	)
+"
+
+RESTRICT="strip"
+
+DOCKERFILE_VIM_S="${WORKDIR}/dockerfile.vim"
+
+# TODO AUFS will be replaced with device-mapper (sys-fs/lvm2[static-libs]) in 0.7
+ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used"
+
+ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers"
+
+pkg_setup() {
+	CONFIG_CHECK+=" ~AUFS_FS ~BRIDGE ~MEMCG_SWAP ~NETFILTER_XT_MATCH_ADDRTYPE ~NF_NAT ~NF_NAT_NEEDED"
+	check_extra_config
+}
+
+src_unpack() {
+	git-2_src_unpack
+
+	if use vim-syntax; then
+		( # subshell to prevent environment leakage (and confusion of smart-live-rebuild)
+			EGIT_SOURCEDIR="${DOCKERFILE_VIM_S}"
+			EGIT_PROJECT="honza-dockerfile.vim.git"
+			EGIT_REPO_URI="https://github.com/honza/dockerfile.vim.git"
+			EGIT_MASTER="master"
+			EGIT_BRANCH="${EGIT_MASTER}"
+			EGIT_COMMIT="${EGIT_BRANCH}"
+			EGIT_NOUNPACK="true"
+			git-2_src_unpack
+		)
+	fi
+}
+
+src_compile() {
+	export CGO_ENABLED=0 # we need static linking!
+
+	export GOPATH="${WORKDIR}/gopath"
+	mkdir -p "$GOPATH" || die
+
+	# copy GOROOT so we can build it without cgo and not modify anything in the REAL_GOROOT
+	REAL_GOROOT="$(go env GOROOT)"
+	export GOROOT="${WORKDIR}/goroot"
+	rm -rf "$GOROOT" || die
+	cp -R "$REAL_GOROOT" "$GOROOT" || die
+
+	# recompile GOROOT to be cgo-less and thus static-able (especially net package)
+	go install -a -v std || 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"
+
+	# time to build!
+	./hack/make.sh binary || die
+
+	# now copy the binary to a consistent location that doesn't involve the current version number
+	mkdir -p bin || die
+	VERSION=$(cat ./VERSION)
+	cp -v bundles/$VERSION/binary/docker-$VERSION bin/docker || die
+
+	if use doc; then
+		emake -C docs docs man || die
+	fi
+}
+
+src_install() {
+	dobin bin/docker
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md MAINTAINERS NOTICE README.md
+
+	newinitd "${FILESDIR}/docker-r2.initd" docker
+	newconfd "${FILESDIR}/docker-r2.confd" docker
+
+	systemd_dounit "${FILESDIR}/docker.service"
+
+	insinto /usr/share/${P}/contrib
+	doins contrib/README
+	cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/"
+
+	newbashcomp contrib/docker.bash docker
+
+	if use doc; then
+		dohtml -r docs/_build/html/*
+		doman docs/_build/man/*
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${DOCKERFILE_VIM_S}/ftdetect"
+		doins -r "${DOCKERFILE_VIM_S}/syntax"
+	fi
+}
+
+pkg_postinst() {
+	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 ""
+}