Merge pull request #2208 from marineam/seismograph

sys-apps/seismograph: update to 2.2, now includes rootdev

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

@@ -154,7 +154,6 @@ RDEPEND="${RDEPEND}
 	sys-apps/net-tools
 	sys-apps/pciutils
 	sys-apps/rng-tools
-	sys-apps/rootdev
 	sys-apps/sed
 	sys-apps/seismograph
 	sys-apps/shadow

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

@@ -35,7 +35,7 @@ RDEPEND="!coreos-base/coreos-installer
 	dev-libs/protobuf:=
 	dev-util/bsdiff
 	net-misc/curl
-	sys-apps/rootdev
+	>=sys-apps/seismograph-2.2.0
 	sys-fs/e2fsprogs"
 DEPEND="dev-cpp/gmock
 	dev-cpp/gtest

sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/metadata.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>

sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-0.0.1-r11.ebuild

@@ -1,35 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-CROS_WORKON_COMMIT="c9880282b115a0127c948d16f4ab3c6cadcbfcd2"
-CROS_WORKON_TREE="8ec533cfbe40ad80859408561a3623f8b24b909b"
-CROS_WORKON_PROJECT="chromiumos/third_party/rootdev"
-
-inherit toolchain-funcs cros-workon
-
-DESCRIPTION="Chrome OS root block device tool/library"
-HOMEPAGE="http://www.chromium.org/"
-SRC_URI=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 arm arm64"
-IUSE=""
-
-src_compile() {
-	tc-getCC
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin
-	exeinto /usr/bin
-	doexe ${S}/rootdev
-
-	dodir /usr/lib
-	dolib.so librootdev.so*
-
-	dodir /usr/include/rootdev
-	insinto /usr/include/rootdev
-	doins rootdev.h
-}

sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-9999.ebuild

@@ -1,33 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-CROS_WORKON_PROJECT="chromiumos/third_party/rootdev"
-
-inherit toolchain-funcs cros-workon
-
-DESCRIPTION="Chrome OS root block device tool/library"
-HOMEPAGE="http://www.chromium.org/"
-SRC_URI=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-IUSE=""
-
-src_compile() {
-	tc-getCC
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin
-	exeinto /usr/bin
-	doexe ${S}/rootdev
-
-	dodir /usr/lib
-	dolib.so librootdev.so*
-
-	dodir /usr/include/rootdev
-	insinto /usr/include/rootdev
-	doins rootdev.h
-}

sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild

@@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=1
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="db243fb040ef52b36e9e4bc835f5c11eec89ff2d"
+	CROS_WORKON_COMMIT="abf96f58562a7fd6dbf62542243cf201641b4a7a"
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 
@@ -21,6 +21,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="!coreos-base/vboot_reference
+	!sys-apps/rootdev
 	sys-apps/util-linux
 	sys-fs/e2fsprogs"
 DEPEND="${RDEPEND}"