Resolve uprev conflict
Change-Id: Ic54670358a3cea46d3295ed399154d7c56dc1b1a
diff --git a/chromeos-base/chrome-icu/chrome-icu-106.0.5229.0_rc-r1.ebuild b/chromeos-base/chrome-icu/chrome-icu-106.0.5229.0_rc-r2.ebuild
similarity index 98%
rename from chromeos-base/chrome-icu/chrome-icu-106.0.5229.0_rc-r1.ebuild
rename to chromeos-base/chrome-icu/chrome-icu-106.0.5229.0_rc-r2.ebuild
index 32749b0..41ec751 100644
--- a/chromeos-base/chrome-icu/chrome-icu-106.0.5229.0_rc-r1.ebuild
+++ b/chromeos-base/chrome-icu/chrome-icu-106.0.5229.0_rc-r2.ebuild
@@ -99,9 +99,7 @@
x11-libs/libdrm
"
-# [Mod] NaCl utilities are removed.
-
-usetf() { usex $1 true false ; }
+usetf() { usex "$1" true false ; }
set_build_args() {
# [Mod] 1. Add a new arg "icu_disable_thin_archive=true".
@@ -128,7 +126,6 @@
"use_debug_fission=false"
"enable_remoting=false"
"enable_nacl=false"
- "enable_nacl=false"
"icu_use_data_file=true"
# Add this to make xkbcommon handling identical with chromeos-chrome.
# This will make it more likely to catch potential xkbcommon related
@@ -552,8 +549,6 @@
[[ "${ret}" -eq 0 ]] || die
}
-# [Mod] src_compile() is simplied because 1) the case CHROME_LOCAL=LOCAL_BINARY
-# is excluded. 2) we do not need nacl or tests.
src_compile() {
cd "${CHROME_ROOT}"/src || die "Cannot chdir to ${CHROME_ROOT}/src"
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.209-r3323.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.210-r3324.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.209-r3323.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.210-r3324.ebuild
index 85d2f6d..d42741c 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.209-r3323.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.210-r3324.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-CROS_WORKON_COMMIT="2542013a4879415917bc6db20170147df8f4ccba"
-CROS_WORKON_TREE="8d6cd6165484b58b6755550f6971ffc46e2463de"
+CROS_WORKON_COMMIT="bd2fe4ef308e7f9dccbd68639a96977260a885d5"
+CROS_WORKON_TREE="3d81ceb80b4041909dc92f661e1d30da182b1056"
CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
CROS_WORKON_LOCALNAME="kernel/v5.4"
CROS_WORKON_EGIT_BRANCH="chromeos-5.4"