diff --git a/chromeos-base/cros-camera/cros-camera-0.0.1-r789.ebuild b/chromeos-base/cros-camera/cros-camera-0.0.1-r790.ebuild
similarity index 89%
rename from chromeos-base/cros-camera/cros-camera-0.0.1-r789.ebuild
rename to chromeos-base/cros-camera/cros-camera-0.0.1-r790.ebuild
index 41d50eb..7bc607b 100644
--- a/chromeos-base/cros-camera/cros-camera-0.0.1-r789.ebuild
+++ b/chromeos-base/cros-camera/cros-camera-0.0.1-r790.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "bb0e1c82e1781f4cb39218cfb2d503aea16170b4" "108550b36339f46a9bb63727f9ff310df1e95c92" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "54e96f55e6d225deab32da30ac23c17c212a908a" "68e8bb3750bb218561124008f31e2f7a9204d681" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 # TODO(crbug.com/914263): camera/hal is unnecessary for this build but is
diff --git a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r577.ebuild b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r578.ebuild
similarity index 83%
rename from media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r577.ebuild
rename to media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r578.ebuild
index 0ab37e4..44c9449 100644
--- a/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r577.ebuild
+++ b/media-libs/arc-camera-profile/arc-camera-profile-0.0.1-r578.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "4a915605af1cd7e632f8e36813007c5403431db2" "871bb7e6654a823f1468a5857b4c74f12aaedbb5" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "4a915605af1cd7e632f8e36813007c5403431db2" "871bb7e6654a823f1468a5857b4c74f12aaedbb5" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/hal/usb camera/include camera/tools common-mk"
diff --git a/media-libs/arc-camera-service/arc-camera-service-0.0.1-r513.ebuild b/media-libs/arc-camera-service/arc-camera-service-0.0.1-r514.ebuild
similarity index 91%
rename from media-libs/arc-camera-service/arc-camera-service-0.0.1-r513.ebuild
rename to media-libs/arc-camera-service/arc-camera-service-0.0.1-r514.ebuild
index d870d96..8659eb1 100644
--- a/media-libs/arc-camera-service/arc-camera-service-0.0.1-r513.ebuild
+++ b/media-libs/arc-camera-service/arc-camera-service-0.0.1-r514.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "df8b92601642272b22c923611d7733626e13f212" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "0b0bd701798d12b090a5bbbcec163ecdb45e2567" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # TODO(crbug.com/914263): camera/hal/usb is unnecessary for this build but is
diff --git a/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r151.ebuild b/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r152.ebuild
similarity index 88%
rename from media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r151.ebuild
rename to media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r152.ebuild
index a4e69b1..841e0c4 100644
--- a/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r151.ebuild
+++ b/media-libs/cros-camera-connector-client/cros-camera-connector-client-0.0.1-r152.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "82d90b383f9fe16cd8f88ecf297d788777842b22" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "82d90b383f9fe16cd8f88ecf297d788777842b22" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/tools/connector_client camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r30.ebuild b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r31.ebuild
similarity index 91%
rename from media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r30.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r31.ebuild
index 4a98d7c..97d35e2 100644
--- a/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r30.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6/cros-camera-hal-intel-ipu6-0.0.2-r31.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "337cf39c25d869605b82bd8c7137f2166758e0d8" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "337cf39c25d869605b82bd8c7137f2166758e0d8" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # TODO(crbug.com/809389): Avoid directly including headers from other packages.
diff --git a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r356.ebuild b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r357.ebuild
similarity index 86%
rename from media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r356.ebuild
rename to media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r357.ebuild
index fdbdc92..695aa0b 100644
--- a/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r356.ebuild
+++ b/media-libs/cros-camera-hal-ip/cros-camera-hal-ip-0.0.1-r357.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "51bed6c6697ad121ad0923e5473243d064aa91be" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "51bed6c6697ad121ad0923e5473243d064aa91be" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/hal/ip camera/hal/usb camera/include camera/mojo common-mk metrics"
diff --git a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r750.ebuild b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r751.ebuild
similarity index 90%
rename from media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r750.ebuild
rename to media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r751.ebuild
index f969208..f805ad7 100644
--- a/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r750.ebuild
+++ b/media-libs/cros-camera-hal-usb/cros-camera-hal-usb-0.0.1-r751.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # TODO(crbug.com/809389): Avoid directly including headers from other packages.
diff --git a/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r452.ebuild b/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r453.ebuild
similarity index 82%
rename from media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r452.ebuild
rename to media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r453.ebuild
index c5de91a..b84420e 100644
--- a/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r452.ebuild
+++ b/media-libs/cros-camera-libcab-test/cros-camera-libcab-test-0.0.1-r453.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk"
diff --git a/media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r468.ebuild b/media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r469.ebuild
similarity index 90%
rename from media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r468.ebuild
rename to media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r469.ebuild
index f94616b..ec80fc8 100644
--- a/media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r468.ebuild
+++ b/media-libs/cros-camera-libcab/cros-camera-libcab-0.0.1-r469.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk"
diff --git a/media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r193.ebuild b/media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r194.ebuild
similarity index 80%
rename from media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r193.ebuild
rename to media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r194.ebuild
index 4406fb4..5370b65 100644
--- a/media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r193.ebuild
+++ b/media-libs/cros-camera-libcam_gpu_algo/cros-camera-libcam_gpu_algo-0.0.1-r194.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r454.ebuild b/media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r455.ebuild
similarity index 86%
rename from media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r454.ebuild
rename to media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r455.ebuild
index 56c1f10..1385c44 100644
--- a/media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r454.ebuild
+++ b/media-libs/cros-camera-libcamera_common/cros-camera-libcamera_common-0.0.1-r455.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r156.ebuild b/media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r157.ebuild
similarity index 85%
rename from media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r156.ebuild
rename to media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r157.ebuild
index 877c8fb..47d2cd3 100644
--- a/media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r156.ebuild
+++ b/media-libs/cros-camera-libcamera_connector/cros-camera-libcamera_connector-0.0.1-r157.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk"
diff --git a/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r135.ebuild b/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r136.ebuild
similarity index 82%
rename from media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r135.ebuild
rename to media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r136.ebuild
index 7411af2..e082dba 100644
--- a/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r135.ebuild
+++ b/media-libs/cros-camera-libcamera_connector_test/cros-camera-libcamera_connector_test-0.0.1-r136.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r451.ebuild b/media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r452.ebuild
similarity index 83%
rename from media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r451.ebuild
rename to media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r452.ebuild
index 87e01fb..07cc5f5 100644
--- a/media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r451.ebuild
+++ b/media-libs/cros-camera-libcamera_exif/cros-camera-libcamera_exif-0.0.1-r452.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r459.ebuild b/media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r460.ebuild
similarity index 86%
rename from media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r459.ebuild
rename to media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r460.ebuild
index c38c851..c4e04f1 100644
--- a/media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r459.ebuild
+++ b/media-libs/cros-camera-libcamera_ipc/cros-camera-libcamera_ipc-0.0.1-r460.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk"
diff --git a/media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r451.ebuild b/media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r452.ebuild
similarity index 83%
rename from media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r451.ebuild
rename to media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r452.ebuild
index c8db123..ca2def9 100644
--- a/media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r451.ebuild
+++ b/media-libs/cros-camera-libcamera_timezone/cros-camera-libcamera_timezone-0.0.1-r452.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r452.ebuild b/media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r453.ebuild
similarity index 84%
rename from media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r452.ebuild
rename to media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r453.ebuild
index 6f85349..55c5a5f 100644
--- a/media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r452.ebuild
+++ b/media-libs/cros-camera-libcbm/cros-camera-libcbm-0.0.1-r453.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include common-mk"
diff --git a/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r526.ebuild b/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r527.ebuild
similarity index 88%
rename from media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r526.ebuild
rename to media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r527.ebuild
index cd07fe3..ce8101c 100644
--- a/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r526.ebuild
+++ b/media-libs/cros-camera-libjda/cros-camera-libjda-0.0.1-r527.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk metrics"
diff --git a/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r455.ebuild b/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r456.ebuild
similarity index 81%
rename from media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r455.ebuild
rename to media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r456.ebuild
index 9944c99..cdf7bf1 100644
--- a/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r455.ebuild
+++ b/media-libs/cros-camera-libjda_test/cros-camera-libjda_test-0.0.1-r456.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk"
diff --git a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r503.ebuild b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r504.ebuild
similarity index 86%
rename from media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r503.ebuild
rename to media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r504.ebuild
index faa8579..db88458 100644
--- a/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r503.ebuild
+++ b/media-libs/cros-camera-libjea_test/cros-camera-libjea_test-0.0.1-r504.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb" "560dcfaf6405fec1de4abaf84150869126113ac7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/mojo common-mk metrics"
diff --git a/media-libs/cros-camera-test/cros-camera-test-0.0.1-r495.ebuild b/media-libs/cros-camera-test/cros-camera-test-0.0.1-r496.ebuild
similarity index 87%
rename from media-libs/cros-camera-test/cros-camera-test-0.0.1-r495.ebuild
rename to media-libs/cros-camera-test/cros-camera-test-0.0.1-r496.ebuild
index fd7beb6..35b3f6e 100644
--- a/media-libs/cros-camera-test/cros-camera-test-0.0.1-r495.ebuild
+++ b/media-libs/cros-camera-test/cros-camera-test-0.0.1-r496.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="b05e4a6b92b2cfe608b6cd8d5d37168680fc080e"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "504b7623720b0320766830fbe53b0ea714498d55" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "75f2c26ab776c6218323dcf56e3b0cc22e3d588f" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "a661abd7c4e459764c10f7e466ee615f8c8f0cee" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 # TODO(crbug.com/809389): Avoid directly including headers from other packages.
diff --git a/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r328.ebuild b/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r329.ebuild
similarity index 86%
rename from media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r328.ebuild
rename to media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r329.ebuild
index 95eaad5..00d4727 100644
--- a/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r328.ebuild
+++ b/media-libs/cros-camera-v4l2_test/cros-camera-v4l2_test-0.0.1-r329.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="57779f9c27d62896f66cced9cc88443ae9585372"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "da7b73732df1f454a05ffc3efe5a90d416295e3f" "4a915605af1cd7e632f8e36813007c5403431db2" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
+CROS_WORKON_COMMIT="e8780b992393a509fd81f84bad23a3e59185a869"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "c920da127f686c434165b6056b1cd740f228df6b" "4cc584c3493bd813e9013c73f8c48c8e3582f603" "4a915605af1cd7e632f8e36813007c5403431db2" "a491e4ec9caf7fe580d4ec7c9e168d15826716da" "316f9280ff87203d961bd29b773e08824f1c45d4" "52a8a8b6d3bbca5e90d4761aa308a5541d52b1bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_SUBTREE=".gn camera/build camera/common camera/include camera/hal/usb chromeos-config common-mk"