Merge pull request #463 from marineam/release-files

Release files

sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild

@@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~x86"
 else
-	CROS_WORKON_COMMIT="9bbcec8fc19e854e3733ac058013281b3d3e0599"
+	CROS_WORKON_COMMIT="4b158cdacf0fa4c16933e401dd11962b3c6d9838"
 	KEYWORDS="amd64 arm x86"
 fi
 

sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r573.ebuild

@@ -1 +0,0 @@
-gmerge-0.0.1.ebuild

sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r574.ebuild

@@ -0,0 +1 @@
+gmerge-9999.ebuild

sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1.ebuild

@@ -1,30 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_COMMIT="0ec0fd256a173c31af2f51e52e5c6f6b9a569cae"
-CROS_WORKON_PROJECT="coreos/dev-util"
-CROS_WORKON_REPO="git://github.com"
-CROS_WORKON_LOCALNAME="dev"
-CROS_WORKON_LOCALDIR="src/platform"
-
-inherit cros-workon
-
-DESCRIPTION="A util for installing packages using the CrOS dev server"
-HOMEPAGE="http://www.chromium.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="app-shells/bash
-	dev-lang/python
-	dev-util/shflags
-	sys-apps/portage"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	into /usr
-	dobin gmerge stateful_update crdev
-}

sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild

@@ -7,6 +7,13 @@ CROS_WORKON_REPO="git://github.com"
 CROS_WORKON_LOCALNAME="dev"
 CROS_WORKON_LOCALDIR="src/platform"
 
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	CROS_WORKON_COMMIT="4b158cdacf0fa4c16933e401dd11962b3c6d9838"
+	KEYWORDS="amd64 arm x86"
+fi
+
 inherit cros-workon
 
 DESCRIPTION="A util for installing packages using the CrOS dev server"
@@ -14,7 +21,6 @@ HOMEPAGE="http://www.chromium.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="app-shells/bash
@@ -24,7 +30,6 @@ RDEPEND="app-shells/bash
 DEPEND="${RDEPEND}"
 
 src_install() {
-	# Install tools from platform/dev into /usr/local/bin
 	into /usr
 	dobin gmerge stateful_update crdev
 }

sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild

@@ -23,6 +23,7 @@ DEPEND="
 	dev-util/checkbashisms
 	net-misc/curl
 	sys-apps/debianutils
+	sys-apps/iproute2
 	sys-devel/crossdev
 	sys-fs/btrfs-progs
 	"