gentoo auto-resync : 15:08:2022 - 20:28:49

17 files changed, 231 insertions, 18 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 970e6bd803f8..17ab9178ee45 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 0fd26299f37f..1e9054f0d633 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,3 +1,3 @@
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
-EBUILD cmocka-1.1.5.ebuild 1104 BLAKE2B f9b2a3fd62107ea186ce6a4e7ab7e84e5de6fe0b74a649bd2bb97133ecf7d696d8049d276413c8fef97e7451b5bf50ccc9453567dfda125097f9db2d6ba2a4ab SHA512 4dac966dba90f30333321560be63bebd6b711026d48b218697ccbd84430629e38a36a8fc339b88f392a5e8ec34f21f0c42a9a7df804b50784287a23977f65f9f
+EBUILD cmocka-1.1.5.ebuild 1082 BLAKE2B b837e34a29f5b0c1f719082a87d4040834c1615e1e1a84dfe178b7e86265d430f65b44db35af9b0044e1a964fa6044f1843722bbbd5077b2406606bfbec5907a SHA512 e2797e77b3971a8b0058a50c478b391448db16937019e9c2033c1b43be8f730302b12cea2eb781753ab599df583196e79ac3c2898d062f4d564df7e10812ca20
 MISC metadata.xml 260 BLAKE2B f2a46bd04167517ee453a39cc2dcc848d4fb0760026483acd86fa86829779666837e81f8a9012c69c0eb89d5fbd9fb22002a2c786877ddd5c81ca1d80a0eead9 SHA512 a44f57da0d8fa3e4c8df9d9052e53ba139603c7312d4b13fc3c311455e41488c0bb855712817929c4f551747ee6651ac0c3428f28129e4a889a56622281b58b6
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 0327341cd209..b2f60df8bddb 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Unit testing framework for C"
@@ -16,9 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index b6f90636f720..0bfd8976ad10 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 EBUILD gdbus-codegen-2.72.2.ebuild 2193 BLAKE2B 5bbd1717305885363c6221e48488dd2d3aa23ea8bc49c561f420f5029c63cdf528fb027027d00b42dc54386c1ec3be6958b56289ed71287d28f04224cdf908cd SHA512 54a411c57910e57f033b92a437d44f1af9f4d7fb72b361b86ecb69fc38f39cac44aa45e95dae7fccbbed94f5043e703a2c71ff9464f54cdc3a3c274559ba3684
-EBUILD gdbus-codegen-2.72.3.ebuild 2198 BLAKE2B 45f7b3fb7770854b26aec865b9c7938d793207456a2114d10bc5900194b46639f1ce2bae565ab547025c9fc159dfba146a3581de1aa7e7037bb661f3d3381fbf SHA512 ea63f2ff887a1720fffc2b81cd6cf2ee57199c705a995bc470f1c42bc0fedeb2d1533daa24177896351733603382f46e0025b0063fe7d6a1e3ee04e96a136ba5
+EBUILD gdbus-codegen-2.72.3.ebuild 2196 BLAKE2B 23059cb0aefbe58109d72f319df7a677fae725eece0653bc97c7964579fcede8bc817122e1c489e529d86521431b7dc29552a9795cf63f51c5814f9ea2d2df1b SHA512 374748e87bc9d97b995b4cad9be7414476a1866b3785de13f222ec2e14c08f65bbb42bc42316f4352b6a08ad7b3ce87c712d3caff46d7975ea88e07a8f1685fa
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
index 7b4afa663b06..3c3c89486bde 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index a64a1b556f6b..7e61e7cba5c5 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,5 @@
 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 EBUILD glib-utils-2.72.2.ebuild 2332 BLAKE2B eae0be3ecd001de535ff7db1483b93bdcc5405ed13935073cec2c4c92755bbe6628f86c9477396b54280384f16487af9b842dd92b7214e8e127e7affbfd68520 SHA512 2095a7aa280bbff2ce40745fc1e349fcc8fd890634b4303ff1b65b7410d0f8f30e6ff05f7f580650b48dbdc2c682a82475d0cf1c6e791da6c20eea2a259f9ea1
-EBUILD glib-utils-2.72.3.ebuild 2337 BLAKE2B 817550cb43f2b922e8e554189073f78811a4ac09e51d09c0187a094dcb6e8c4d3ac2ac6b4b79c9a607c14b64c59d17b9bc327031089176253a60b758693d854a SHA512 7e1bdc47851486a35819d205b8652629d08cc2eb74bf9b3a194a858524056e35280d539b2677dac9c6a8d812395de0c593c662756d166e68df69a388ccb6a50d
+EBUILD glib-utils-2.72.3.ebuild 2335 BLAKE2B 7090182ae8c53ef9950f93e0ea5d56771d1bb16cf495f02059c22f9a084dab7a5b72ffe6605822f9f17f681d39d16d9bea3ce2c86675257bb023d31d720d476f SHA512 51e05fe689ef1229991c2cba4fdee21d33acd241c289ec0ea59e52e73995eeca2ed1476a67fea02b7928764bb20db04fbee1e5a2ffbaa3de2b16a2d4f09cc878
 MISC metadata.xml 333 BLAKE2B 70d0e83f8a0437baadea4b6771019a55d0d6f6a292bcb4263a7d811ec0b63a2ee4838b94371e03d62c4c43678eb7ae542b611166e2aecdea8c5194955ef1cda3 SHA512 0eab24184eba31bfda9752b62211472d6d8607644a2a3c2352a4483bc34975b87252aa5482a76499c5afe30414a75ba5958bd5bbf1bc755850806824e4267031
diff --git a/dev-util/glib-utils/glib-utils-2.72.3.ebuild b/dev-util/glib-utils/glib-utils-2.72.3.ebuild
index 17ca9578e4d0..c5874570fff4 100644
--- a/dev-util/glib-utils/glib-utils-2.72.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.72.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 0f49bca2dda7..6451159f508c 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,3 +1,3 @@
 DIST kdev-php-22.04.3.tar.xz 1081120 BLAKE2B 252aecf224ac8059b0b24042b0d3d8a369125e3cf881aabda10fc999348104db9bdb23fadf08115281ae6332b8c2bc068e75078e63d761fb495d3808c879bfb7 SHA512 95fd3c3d6dc92351eaf470d4047d77622eae9629e7010c52b01f5b2b96c710664e1d8b32082f70942bd7f30d2161e1f61d596f62de36b38a173cf60594d277b8
-EBUILD kdevelop-php-22.04.3.ebuild 1238 BLAKE2B db3bfaacd8320ea4527279e5eb981169819c84b7336ec530ae4b34df52252996ad337ce5d7862b3a465e00dfc7d0f0ce5e3aae6d415d84b0cdb3e52b08781fc1 SHA512 3b2953453b924f68d8ca9c7c93705d15b8aa47033ee113b1ac4be6ec68f16b3eba857c86f9d5faeb5f8ec8b635b3309cc931afd271d3f767cc1d81245af0f3c0
+EBUILD kdevelop-php-22.04.3.ebuild 1222 BLAKE2B 47c481c8bd6f6ddc0353614925d1ee42b16cefd75bd3f62c0bef73f45e52df912bccf192a975cc70e6edc0c8b000d42cbc5c182f57b74d89df7e615abd28af22 SHA512 a048b5251f6e2a9751102a85c5979efc3e9235aeaeca7c6d653d21aeb7c2d439f610cd5a7f11eaea52f6d45a79ca6ab5a9d153b15e3f0d83dd3ea4c3c75180d5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-22.04.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-22.04.3.ebuild
index d65073c578b8..9400448210d3 100644
--- a/dev-util/kdevelop-php/kdevelop-php-22.04.3.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-22.04.3.ebuild
@@ -6,7 +6,6 @@ EAPI=8
 ECM_HANDBOOK="forceoptional"
 ECM_HANDBOOK_DIR="docs"
 ECM_TEST="true"
-KDE_GEAR="true"
 KDE_ORG_CATEGORY="kdevelop"
 KDE_ORG_NAME="kdev-php"
 KFMIN=5.92.0
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index d9b9e5d4b48e..b35b4562820a 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1,3 @@
 DIST kdev-python-22.04.3.tar.xz 1091116 BLAKE2B 2512597a4a741de579d82af9d331cf8a7eed60c147e65e78817702649ea59be3dca14a91c9a7407d7825ef91d113881644b89ca736cea6ec02e697b0e2316e8c SHA512 1070b60e513ac0abe15ea0de17606833c87b6ed5e8a15a8230c240c0777b5ee5d021164db0270ef77f5190eb75b64514c30c64761aaeb9ddfc37fab330c257c9
-EBUILD kdevelop-python-22.04.3.ebuild 1241 BLAKE2B 88a0cc23647e3460f444620619d1b81f9c32d4b5b1db7402710d025b629869e2b82ee199251e59db3afb1c31c50e4f1fa5351b2d9ede4b105463f893a5054144 SHA512 dd09087921d419b1e06feadc9a0bb7fbeeb24f8919c0d2dd49a0b5edbdb54c5ffde823918aa8a792d12a96953cd68fbb06b5e0ed8578885a3d2969eb0c558c2f
+EBUILD kdevelop-python-22.04.3.ebuild 1225 BLAKE2B b8b17ddfe7eeb22c17d1b3223c7847e3eef6b917b59d1c6f367f47d55ddc9827de08d50759e01c810a9a55d35f12799c984ca372aaaa634592dd12d89cd45d15 SHA512 1b8a4a64333544231753ef83134ee0d76997672ddc9081fed6a07d0da0ede4877ddf6793eb629fac1f6e050051f3a2ba9406e6ee5cc3a4c4a8e06b47d36270d4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/kdevelop-python-22.04.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-22.04.3.ebuild
index 78fa2e6911ae..6ff29bd2ab6a 100644
--- a/dev-util/kdevelop-python/kdevelop-python-22.04.3.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-22.04.3.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 ECM_TEST="forceoptional"
-KDE_GEAR="true"
 KDE_ORG_CATEGORY="kdevelop"
 KDE_ORG_NAME="kdev-python"
 PYTHON_COMPAT=( python3_{8..9} )
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 9cc1fe825d3a..575183c39d63 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,3 @@
 DIST kdevelop-22.04.3.tar.xz 8426644 BLAKE2B 114ec3d6f94712482ccf485cdb746f51f0898bda62d40a24a21222098596f1026dadebb0f901a030cfbf5cfd8bf6d66a22b4960bbeeadb16baf12b62d90e5816 SHA512 a78a2a1e5232369a676297ff52f8f3cf0e003c28d0513628e4a0c37a91018232f4c7f485021a73d4bb617f383483b8795713038fa30c7e5d63675e9b78251a71
-EBUILD kdevelop-22.04.3.ebuild 4150 BLAKE2B 61057d1d9f53d11f0a4d60f68fa8603f6606cc29e04e4b6b3a0b62cece6145506803ef48248c1e66704613c2e280354228c76cbb76d59c14d7bb1b22fbadf2b5 SHA512 47f93beb2c26dbf424a5fedc4d8b8b861a11ce64f88ccd11c0a612092502201f36fe5de9394d2c37dff86c457338dd9bc30cd0a4b1af1d9aac7161ecea8793e6
+EBUILD kdevelop-22.04.3.ebuild 4134 BLAKE2B 8a471a9b0b29c1dcf81952b1dd56c2fb179915c027ccb52fd7b351f8af37ba3cc3f2d4c49974dcdf4b2b8e5dd6c4c050141526e18b7f3635d77cbc911d6ce585 SHA512 e8964f506e074f98bc76bdbfb09a40134b87f2d8a8cb20f226e4438201f8634fef89b90292225edc7ccaf1fa07d7b45105eea373db825248052dab9d1a08cf36
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/kdevelop-22.04.3.ebuild b/dev-util/kdevelop/kdevelop-22.04.3.ebuild
index a1562cb019b0..e99c8510ec01 100644
--- a/dev-util/kdevelop/kdevelop-22.04.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-22.04.3.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KDE_GEAR="true"
 KDE_ORG_CATEGORY="kdevelop"
 KFMIN=5.92.0
 QTMIN=5.15.4
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 081839e93cc2..852477dd2a4b 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -89,6 +89,7 @@ DIST watchman-2022.03.28.00.tar.gz 3781468 BLAKE2B 5db1f60c7149af418037a0ce7a006
 DIST watchman-2022.04.11.00.tar.gz 3783345 BLAKE2B 0b4b4cadfb45e5a894428ab27fde3e7b70e3e3021d0cf76a15f7d072e0c86589d4b9f8c32d75e0c055a8dd30832360e669cc3d7f86061d214a3e18adc61a3781 SHA512 129eaded13ecaff0f4bfa2ffcd5fd27a1685a5f98e53d7b9dba837ad09054c9f8054992d92009580e20f80f367eb71276edab11bfbd4604ade353b08a29076d7
 DIST watchman-2022.07.04.00.tar.gz 3785684 BLAKE2B b27f71cd5d505d9383858434eaa90dd9a70478507a2750f10c3fdc88e39978cc6f94402d498dc26e2b5043018913bf71a28c04870dbefe8ee79fbe3e963a86e8 SHA512 43bbccd5e69905105da54fb661f506d2b3ef43719660deb07cb4b3b47b1569af71edcdc798ffdae79ec26c7cf24988394321d0f183f20af51daf6d54f4a3d8e5
 DIST watchman-2022.08.08.00.tar.gz 3788351 BLAKE2B cdf5ea901bbe7ff46d32fadb7eb46d2346f3330fd20c2e14dd4faa54c3feabfaf4c0a76b83a4493bcd052b7fa9d08e7ed05ad3d1bc883edefef9812258afeba6 SHA512 537b52d50823ce27f0c42927f2c04a57bb273f53d9f4c91a6744a319ff8efef9f5ed202ec2f2a1dfd59b1c16f5e8044ba21148bd40ca45660813cc67c839d6a2
+DIST watchman-2022.08.15.00.tar.gz 3783166 BLAKE2B a2090fb9e62890ea77e264c6d2727d93e8799b96ad4eaf7e02c58a8526fbd57b3b6ff2fdeddfb67a41771e2c0e29ca2f7fab2246ef8455df9902685c40c96138 SHA512 497f7127fe6efc5419f9f169b580701bdf88c4774b2c2d35b5c3849b29f679bf72569885cbb4411ebfd92e8d34eb589bf327d2362d8b5a1c141f9c063833f3e7
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
@@ -102,4 +103,5 @@ EBUILD watchman-2022.03.28.00.ebuild 4692 BLAKE2B 380179dc8f5d8a8f98136d9078a695
 EBUILD watchman-2022.04.11.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
 EBUILD watchman-2022.07.04.00.ebuild 4687 BLAKE2B b9b8376653dab8674d042f6f5a0f4f99deeb1459e8dba60e975711d239e61f40a7871ea04dc1ba84e694a242a48957f3766b119a38aaafbd46ba52899fd638c3 SHA512 ac344b1bc10a34808b4a9453280cd682a77bc8e687e7cc8b8e50d9bb413d17a668863a3ebff904d459a0481dc67f4bc485d2a635c3251c25af3a03bb1d672883
 EBUILD watchman-2022.08.08.00.ebuild 4857 BLAKE2B 595589dd252817a04b4fd6cc73d794605f59455616ed25a7b478fcbfc763b9be196f28b6339aa0793f24de7a2e4786c73158b2a6a14b9815adb14fb2299ee9ea SHA512 a74284b7a14e154f38cb656bfa655b3053679f4c71ee13b3f2350a7a8f8e1eb28f92fdcecb9f036c7a94fbeb7235fd7ca066f6aaff1ba5d8134ffd8c834f6474
+EBUILD watchman-2022.08.15.00.ebuild 4857 BLAKE2B 595589dd252817a04b4fd6cc73d794605f59455616ed25a7b478fcbfc763b9be196f28b6339aa0793f24de7a2e4786c73158b2a6a14b9815adb14fb2299ee9ea SHA512 a74284b7a14e154f38cb656bfa655b3053679f4c71ee13b3f2350a7a8f8e1eb28f92fdcecb9f036c7a94fbeb7235fd7ca066f6aaff1ba5d8134ffd8c834f6474
 MISC metadata.xml 691 BLAKE2B 68506bb31b8d7524b07a12bd2a237ed985215701eb2a28bacfd63ba5f3d61713b0369523a369c5880392e2f4790da4f908538627f3c3d58fe7c78faf9ebc9a15 SHA512 71c073c60fd880455dee0af9193a4279975ba34558144cfe03baa50d2a7c2c5074631a53fb89504d852e9782478f0add9dcea361f36cefe8a42f8f94ae27831a
diff --git a/dev-util/watchman/watchman-2022.08.15.00.ebuild b/dev-util/watchman/watchman-2022.08.15.00.ebuild
new file mode 100644
index 000000000000..030a28e8ed05
--- /dev/null
+++ b/dev-util/watchman/watchman-2022.08.15.00.ebuild
@@ -0,0 +1,217 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
+# TODO: Split into different variables then combine for each component?
+# Not all is in rust/ dir.
+# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client
+CRATES="
+ahash-0.3.8
+ansi_term-0.12.1
+anyhow-1.0.55
+atty-0.2.14
+autocfg-1.1.0
+bitflags-1.3.2
+byteorder-1.4.3
+bytes-1.1.0
+cfg-if-1.0.0
+clap-2.34.0
+const-random-0.1.13
+const-random-macro-0.1.13
+crossbeam-0.8.1
+crossbeam-channel-0.5.2
+crossbeam-deque-0.8.1
+crossbeam-epoch-0.9.7
+crossbeam-queue-0.3.4
+crossbeam-utils-0.8.7
+crunchy-0.2.2
+either-1.6.1
+futures-0.1.31
+futures-0.3.21
+futures-channel-0.3.21
+futures-core-0.3.21
+futures-executor-0.3.21
+futures-io-0.3.21
+futures-macro-0.3.21
+futures-sink-0.3.21
+futures-task-0.3.21
+futures-util-0.3.21
+getrandom-0.2.5
+heck-0.3.3
+hermit-abi-0.1.19
+jwalk-0.6.0
+lazy_static-1.4.0
+libc-0.2.119
+lock_api-0.4.6
+log-0.4.14
+maplit-1.0.2
+memchr-2.4.1
+memoffset-0.6.5
+mio-0.8.0
+miow-0.3.7
+ntapi-0.3.7
+num_cpus-1.13.1
+once_cell-1.9.0
+parking_lot-0.12.0
+parking_lot_core-0.9.1
+pin-project-lite-0.2.8
+pin-utils-0.1.0
+proc-macro2-1.0.36
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.19
+quote-1.0.15
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.10
+scopeguard-1.1.0
+serde-1.0.136
+serde_derive-1.0.136
+signal-hook-registry-1.4.0
+slab-0.4.5
+smallvec-1.8.0
+socket2-0.4.4
+strsim-0.8.0
+structopt-0.3.26
+structopt-derive-0.4.18
+syn-1.0.86
+textwrap-0.11.0
+thiserror-1.0.30
+thiserror-impl-1.0.30
+tiny-keccak-2.0.2
+tokio-1.17.0
+tokio-macros-1.7.0
+tokio-util-0.6.9
+unicode-segmentation-1.9.0
+unicode-width-0.1.9
+unicode-xid-0.2.2
+vec_map-0.8.2
+version_check-0.9.4
+wasi-0.10.2+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows_aarch64_msvc-0.32.0
+windows_i686_gnu-0.32.0
+windows_i686_msvc-0.32.0
+windows-sys-0.32.0
+windows_x86_64_gnu-0.32.0
+windows_x86_64_msvc-0.32.0
+"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cargo cmake distutils-r1 tmpfiles
+
+DESCRIPTION="A file watching service"
+HOMEPAGE="https://facebook.github.io/watchman/"
+SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent
+RDEPEND="
+	dev-libs/libevent:=
+	dev-libs/libpcre2
+	dev-cpp/edencommon:=
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/glog:=
+	>=dev-libs/libfmt-8.1.1-r1:=
+	dev-libs/openssl:=
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+	python? ( ${PYTHON_DEPS} )"
+# TODO: Make gtest test-only (needs a fair bit of patching)
+DEPEND="${RDEPEND}
+	dev-cpp/gtest"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2022.07.04.00-python-working-dir.patch
+	"${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch
+	"${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch
+)
+
+# Rust utility
+QA_FLAGS_IGNORED="usr/bin/watchmanctl"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17
+	export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}"
+	export RUST_CARGO_HOME="${ECARGO_HOME}"
+	export CARGO_HOME="${ECARGO_HOME}"
+	# Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue
+	# https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69
+	# so no need to force -j1 via cargo jobs
+
+	local mycmakeargs=(
+		# Rust wrangling
+		-DUSE_CARGO_VENDOR=ON
+		-DGENERATE_CARGO_VENDOR_CONFIG=OFF
+		-DRUST_CARGO_HOME="${RUST_CARGO_HOME}"
+
+		# General bits
+		-DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman
+		-DWATCHMAN_VERSION_OVERRIDE=${PV}
+
+		# Fails to build against fbthrift for now in libatomic troubles
+		-DENABLE_EDEN_SUPPORT=OFF
+
+		# We handle this ourselves
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	cmake_src_test
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_test
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf
+
+	if use python ; then
+		pushd watchman/python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process watchman.conf
+}
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index b55f4cfec333..e6ba81d56edd 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 EBUILD wayland-scanner-1.20.0.ebuild 992 BLAKE2B 47a95fe8fa62d143e48f397e255fcb5ba868c86a8253e58b354b453994718f7c362df9e2858d58ca3772309aa5f101e66508e622806090c84fe370469129d231 SHA512 316c93ac9e9f64e8a38639c905aa6ba622a0730d1e517734e748946750407651808cf4e9636fb0b58910c6fbbd3c2f18dd94cec656322e1582fdb8b8ce361502
-EBUILD wayland-scanner-1.21.0.ebuild 1028 BLAKE2B 5c3d2fdc9a499138f810f23f1a16f22daeb8cd4c2f2f95702e061d328b0bbcee16d4c3d1ffde2a0ff6261b6e1732b10d3346c71474c25a2f0fd5810b89b28b7c SHA512 df62c20ce5e1c708be0f948a79080df4e685606219ec5b0abc0d889fd3cfe5271fea9c9776f94b1ce1f60361d5a410b40a188dd736fcf24b2b0f2d5ed83c4d01
+EBUILD wayland-scanner-1.21.0.ebuild 1026 BLAKE2B 8b49dcae38131c5658b81023408eebe4cb3c681713f2410fb7f779695871c50ad789ca47e8245eecfc6f682c38931b81d3b88c6cd95906a6fbee7bd669abbce2 SHA512 4f6e731c7ffa3c3b36bc2eb007bd95c33cb7a637a37083820e36675e863043168273acdfd6904118cc87987f4640dbb21ee5cbb3897772b2554f4a24887c09c2
 EBUILD wayland-scanner-9999.ebuild 1030 BLAKE2B 69772afc5b2457fb4c2a3aa983a1b84776b94a03b220bc5d37dd76791188fb210d94c5299933737aa9e8d27c3cf7ef679c99bbff2f1daa7e9300241e9ca35041 SHA512 3e38ef866c22d8e8c4d125489577e4a72ef6e658b849714d7e79ef0c6092a86d66a6fda20b0043e83e52b30c96fbfd3eef6bb32a27918357d44f77c9ebda2349
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
index 93c27251878a..725331dbcae2 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
 inherit meson