Resolve uprev conflict
Change-Id: I1b44d1566525f0db4eca1c062948750d3b09fda2
diff --git a/chromeos-base/flex_hwis/flex_hwis-0.0.1-r286.ebuild b/chromeos-base/flex_hwis/flex_hwis-0.0.1-r287.ebuild
similarity index 83%
rename from chromeos-base/flex_hwis/flex_hwis-0.0.1-r286.ebuild
rename to chromeos-base/flex_hwis/flex_hwis-0.0.1-r287.ebuild
index 7256c4e..5a9661d 100644
--- a/chromeos-base/flex_hwis/flex_hwis-0.0.1-r286.ebuild
+++ b/chromeos-base/flex_hwis/flex_hwis-0.0.1-r287.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT="05469b6cd1ae82ea72f0317198a469817f0dc5b6"
-CROS_WORKON_TREE=("5f078a2eb960dbcc4347e114f6f6c4c4e946917e" "8f130f46cd615fc4af3666259b60f9a099b0cee1" "f91b6afd5f2ae04ee9a2c19109a3a4a36f7659e6" "36a80f9ac2e6694709cc6948b5097652eb0a8178")
+CROS_WORKON_COMMIT="9975c367abf619b79242dfb423156e4665e1be19"
+CROS_WORKON_TREE=("5f078a2eb960dbcc4347e114f6f6c4c4e946917e" "12c324bfbd10d1d489dc2e4b2a94b6c0baaf4b0f" "f91b6afd5f2ae04ee9a2c19109a3a4a36f7659e6" "36a80f9ac2e6694709cc6948b5097652eb0a8178")
CROS_WORKON_LOCALNAME="platform2"
CROS_WORKON_PROJECT="chromiumos/platform2"
CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r3849.ebuild b/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r3850.ebuild
similarity index 86%
rename from chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r3849.ebuild
rename to chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r3850.ebuild
index a8888da..0052f94 100644
--- a/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r3849.ebuild
+++ b/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r3850.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT=("462f98076efc616854f4ef47b8e42fda3776a957" "915fa0857415ff7c0a77311c8a6f6d6859fd4194")
-CROS_WORKON_TREE=("e4f393f77bc5dd1dcc0bf84200b1423a2a9cc777" "df46bd27ee446f2ab2a2a59a401cf77ac304a504" "61fca81697d749a2992acba5ed65c51075e539f3" "bbbfc1fa8844d84b1c654a53992ceed5cd7001be" "4082cef49a32b317ee0e16400c8a62b405574b80")
+CROS_WORKON_COMMIT=("462f98076efc616854f4ef47b8e42fda3776a957" "37b72d97e5283384566eb5cb539a43878b11a194")
+CROS_WORKON_TREE=("e4f393f77bc5dd1dcc0bf84200b1423a2a9cc777" "fea194c53a1afe5d98ef492538ce25a64389d812" "61fca81697d749a2992acba5ed65c51075e539f3" "bbbfc1fa8844d84b1c654a53992ceed5cd7001be" "4082cef49a32b317ee0e16400c8a62b405574b80")
CROS_WORKON_PROJECT=("chromiumos/platform/factory" "chromiumos/chromite")
CROS_WORKON_LOCALNAME=("platform/factory" "../chromite")
CROS_WORKON_SUBTREE=("py" "lib bin scripts PRESUBMIT.cfg")
diff --git a/chromeos-base/modem-utilities/modem-utilities-0.0.1-r3151.ebuild b/chromeos-base/modem-utilities/modem-utilities-0.0.1-r3152.ebuild
similarity index 87%
rename from chromeos-base/modem-utilities/modem-utilities-0.0.1-r3151.ebuild
rename to chromeos-base/modem-utilities/modem-utilities-0.0.1-r3152.ebuild
index ad2de21..a4fb154 100644
--- a/chromeos-base/modem-utilities/modem-utilities-0.0.1-r3151.ebuild
+++ b/chromeos-base/modem-utilities/modem-utilities-0.0.1-r3152.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CROS_WORKON_COMMIT="31f587d221638ec8c8f77d95b882b5cd6e4c0ce4"
+CROS_WORKON_COMMIT="9975c367abf619b79242dfb423156e4665e1be19"
CROS_WORKON_TREE=("5f078a2eb960dbcc4347e114f6f6c4c4e946917e" "275b1647d2ee628876f06f40bfabc857c4322417" "f91b6afd5f2ae04ee9a2c19109a3a4a36f7659e6")
CROS_WORKON_PROJECT="chromiumos/platform2"
CROS_WORKON_LOCALNAME="platform2"
@@ -19,6 +19,8 @@
SRC_URI=""
LICENSE="BSD-Google"
KEYWORDS="*"
+# This package has no unittests.
+RESTRICT="test"
RDEPEND="sys-apps/dbus"
DEPEND=""
diff --git a/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r2345.ebuild b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r2346.ebuild
similarity index 95%
rename from chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r2345.ebuild
rename to chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r2346.ebuild
index 59497fc..2630f66 100644
--- a/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r2345.ebuild
+++ b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r2346.ebuild
@@ -27,6 +27,8 @@
SLOT="0/0"
KEYWORDS="*"
IUSE=""
+# This package has no unittests.
+RESTRICT="test"
# Build-time dependencies should be added to tast-build-deps, not here.
DEPEND="chromeos-base/tast-build-deps:="
