Merge pull request #412 from marineam/quickfix

Fix cros-installer removal

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="22d26b046aaca60695c4b800f762a9f2d9d06dbd"
+	CROS_WORKON_COMMIT="9bbcec8fc19e854e3733ac058013281b3d3e0599"
 	KEYWORDS="amd64 arm x86"
 fi
 
@@ -31,6 +31,7 @@ RDEPEND="cros_host? ( app-emulation/qemu )
 	dev-util/shflags
 	cros_host? ( dev-util/crosutils )
 	app-crypt/efitools
+	!coreos-base/coreos-installer
 	"
 # These are all either bash / python scripts.  No actual builds DEPS.
 DEPEND=""

sdk_container/src/third_party/coreos-overlay/coreos-base/cros-factoryutils/cros-factoryutils-0.0.1-r96.ebuild

@@ -1,37 +0,0 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO(jsalz): Remove this ebuild; it's no longer used.
-
-EAPI="4"
-CROS_WORKON_COMMIT="c759366a1dd3d733b12bb2edc3bae9868d38ee5b"
-CROS_WORKON_TREE="46e050754b5a2f5392223d734036b7b51dde5b5b"
-CROS_WORKON_PROJECT="chromiumos/platform/factory-utils"
-
-inherit cros-workon
-
-DESCRIPTION="Factory development utilities for ChromiumOS"
-HOMEPAGE="http://www.chromium.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="cros_factory_bundle"
-
-CROS_WORKON_LOCALNAME="factory-utils"
-RDEPEND=""
-
-# chromeos-installer for solving "lib/chromeos-common.sh" symlink.
-# vboot_reference for binary programs (ex, cgpt).
-DEPEND="coreos-base/coreos-installer[cros_host]
-        coreos-base/vboot_reference"
-
-DEPEND=""
-
-src_compile() {
-    true
-}
-
-src_install() {
-    true
-}

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

@@ -1,33 +0,0 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO(jsalz): Remove this ebuild; it's no longer used.
-
-EAPI="4"
-CROS_WORKON_PROJECT="chromiumos/platform/factory-utils"
-
-inherit cros-workon
-
-DESCRIPTION="Factory development utilities for ChromiumOS"
-HOMEPAGE="http://www.chromium.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cros_factory_bundle"
-
-CROS_WORKON_LOCALNAME="factory-utils"
-RDEPEND=""
-
-# chromeos-installer for solving "lib/chromeos-common.sh" symlink.
-# vboot_reference for binary programs (ex, cgpt).
-DEPEND="coreos-base/coreos-installer[cros_host]
-        coreos-base/vboot_reference"
-
-src_compile() {
-    true
-}
-
-src_install() {
-    true
-}

sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild

@@ -39,10 +39,9 @@ RDEPEND="${RDEPEND}
 	app-emulation/qemu
 	app-text/texi2html
 	coreos-base/google-breakpad
-	coreos-base/coreos-installer
 	coreos-base/cros-devutils[cros_host]
-	coreos-base/cros-factoryutils
 	coreos-base/cros-testutils
+	coreos-base/vboot_reference
 	=dev-lang/python-2*
 	dev-python/setuptools
 	dev-lang/nasm