gentoo resync : 06.04.2022

4 files changed, 4 insertions, 216 deletions

diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 2c7aa66889ee..ef75ba3832c7 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -83,10 +83,9 @@ DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
-DIST watchman-2022.02.28.00.tar.gz 3778698 BLAKE2B d4c9cea5066cd187db53829f60d207eddfafc0db9f685ecc84217769d7fc269a409126dd6171d7e8146c3d2d945a45b09b97643c8e83932381d14a4933ad566c SHA512 2297ed75fb9fbe5d3c303eba7b701c06793b2dfa1dacdc1d2912e5c77449b06061ca2e54115d2de73f1f4e3358a84634b7a5510cdc6b327e961e2ecc04747092
-DIST watchman-2022.03.07.00.tar.gz 3780084 BLAKE2B e5ad1002ece9e7846c1806e10b48a595137ba4a86db73272d04faf3ba633d1935d2fa5609002c74cb989fe9fccbc366307d3241c9593730b401732c1c6773556 SHA512 93098f814b1b3340e43851000d1c3e579c2d0bb7b98539e435456e89eeddd002d602a69825a35e19f70e3db0b20ca3bbd2c8c86a7bf63901dd45b79fe5523c06
-DIST watchman-2022.03.14.00.tar.gz 3782279 BLAKE2B 5be4811347f0ef03718444d51c5654b1217b0263994c8a1ca0da901d0b72b6252a727746b8c00e727e8f305dfc54624a61c02effee8b1cc05b84aacbcf4bfbe8 SHA512 3c10a83889876e71d6665d25d9d524efc3d5bf50305000c085caf7712f26397bd33df8763a9686f86a5ac5e722ae56c54023ccb60b85223a01b4bb7a239bec44
 DIST watchman-2022.03.21.00.tar.gz 3782647 BLAKE2B 5a484d4900abf453fc5c6b2083367c5447131a832bb25e63d5edb98680d27ff3dc409a709a4335ccdd96133294e092e86fca889dfc6cc51f0eb6ca7b515ac09c SHA512 954a80e761f59e56b779355bb4fbc70b3e72ce95adaa2da9500927c4d3b0803eeb7f5e1f9ffa4e5ef164f99ee4afc23117a71af9067e823d01d71a585766522b
+DIST watchman-2022.03.28.00.tar.gz 3781468 BLAKE2B 5db1f60c7149af418037a0ce7a00656bc652ec90a4bae261dd48c0bc21d2424ad30e049fe1142b072b5a01ca1380a5cd495fafa74d5c10785e097685f8fb5b21 SHA512 3275e66fe522fc45b3f0c8c458d6d2f61ee314f04d6b12935100535bc060603cafe76c8b13c0b8d334c13b63320ff4b84dc8dfb0f5ce09efc28d94e5d7a5974d
+DIST watchman-2022.04.04.00.tar.gz 3781625 BLAKE2B bc91cf10f89407eaad6a5b4c79752a9b05c939fadfd9f831c09afb04eaaab0a529119db10f2d5ed8eb92c713d9329d67f0673f1a514b0d4b6e333311882e19fb SHA512 bd4ef4e423164b27f690b75c70d478778f4ca98d556169abfebf79abe5aa7675cc3f1c6cd8d447595f8bd8393338ded13b9b5f994eb52767fbb91d079f56c398
 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
@@ -96,8 +95,7 @@ DIST windows_i686_gnu-0.32.0.crate 772251 BLAKE2B 60a6e4fe3783361fe773aa90aa2696
 DIST windows_i686_msvc-0.32.0.crate 733422 BLAKE2B fa1c9c2e5a879797212caff8cbaf17043d4019bb88070eeba39ea64fae46eb4d4c254527a74f21b5604a817859c5a5647b631e743d412e0c3a92bc523f778053 SHA512 3d8b8db6ce629f8a3598b00f4a11f8af81cd8da1b9ed5f14e0b200c0512539118a7206866e9c63bb73528877ce74b33e92bbcc88f036afefe07936298eaff932
 DIST windows_x86_64_gnu-0.32.0.crate 744209 BLAKE2B 76106af387f443f2a24a0cd15d53b59a9e66977df8a0a4074993b4efded7cf63f88d18ddd0bfae467bf37b47b4f9400bdcd3db9cec31bc8febaabef995f406d6 SHA512 35cf64bf981a16a011b2276dbbb65200834235075d369fe60ca06092e1c0631c114c402eb43db223ec885f0ab07a77aa9f1822d1db44c5e6747645c65a7ac182
 DIST windows_x86_64_msvc-0.32.0.crate 669835 BLAKE2B f8c9dc578d652c2abf0d689dfa9681da29f760bc45ecec83b7d994e7df7c04f91fbcebee464ebd94d5fe7eb0dea90ac7c04578b56264d89ca9d91213fd89b17f SHA512 4720246d2aed3c3b3c252cda7773096642e78891b1a9776c920da908b2d3741e9e341060424327f1c16e4cb47b6e22af1be229589a51b5a3a04d2a6447275332
-EBUILD watchman-2022.02.28.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
-EBUILD watchman-2022.03.07.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
-EBUILD watchman-2022.03.14.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
 EBUILD watchman-2022.03.21.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
+EBUILD watchman-2022.03.28.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
+EBUILD watchman-2022.04.04.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47
 MISC metadata.xml 691 BLAKE2B 68506bb31b8d7524b07a12bd2a237ed985215701eb2a28bacfd63ba5f3d61713b0369523a369c5880392e2f4790da4f908538627f3c3d58fe7c78faf9ebc9a15 SHA512 71c073c60fd880455dee0af9193a4279975ba34558144cfe03baa50d2a7c2c5074631a53fb89504d852e9782478f0add9dcea361f36cefe8a42f8f94ae27831a
diff --git a/dev-util/watchman/watchman-2022.03.14.00.ebuild b/dev-util/watchman/watchman-2022.03.14.00.ebuild
deleted file mode 100644
index da684483d094..000000000000
--- a/dev-util/watchman/watchman-2022.03.14.00.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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
-"
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_USE_PEP517=setuptools
-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/libpcre
-	~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}"/watchman-2022.02.28.00-python-working-dir.patch
-	"${FILESDIR}"/watchman-2022.02.28.00-libatomic.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/watchman/watchman-2022.02.28.00.ebuild b/dev-util/watchman/watchman-2022.03.28.00.ebuild
index da684483d094..da684483d094 100644
--- a/dev-util/watchman/watchman-2022.02.28.00.ebuild
+++ b/dev-util/watchman/watchman-2022.03.28.00.ebuild
diff --git a/dev-util/watchman/watchman-2022.03.07.00.ebuild b/dev-util/watchman/watchman-2022.04.04.00.ebuild
index da684483d094..da684483d094 100644
--- a/dev-util/watchman/watchman-2022.03.07.00.ebuild
+++ b/dev-util/watchman/watchman-2022.04.04.00.ebuild