Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/watchman/
Date: Fri, 01 Apr 2022 03:54:04
Message-Id: 1648785221.65088227ed831582b78b9e96d403493ffd107d29.sam@gentoo
1 commit: 65088227ed831582b78b9e96d403493ffd107d29
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 1 02:08:18 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 1 03:53:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65088227
7
8 dev-util/watchman: drop 2022.02.28.00, 2022.03.07.00
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-util/watchman/Manifest | 2 -
13 dev-util/watchman/watchman-2022.02.28.00.ebuild | 210 ------------------------
14 dev-util/watchman/watchman-2022.03.07.00.ebuild | 210 ------------------------
15 3 files changed, 422 deletions(-)
16
17 diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
18 index 1db8bd5ea372..47c6e1f9deb5 100644
19 --- a/dev-util/watchman/Manifest
20 +++ b/dev-util/watchman/Manifest
21 @@ -80,8 +80,6 @@ DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd
22 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
23 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
24 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
25 -DIST watchman-2022.02.28.00.tar.gz 3778698 BLAKE2B d4c9cea5066cd187db53829f60d207eddfafc0db9f685ecc84217769d7fc269a409126dd6171d7e8146c3d2d945a45b09b97643c8e83932381d14a4933ad566c SHA512 2297ed75fb9fbe5d3c303eba7b701c06793b2dfa1dacdc1d2912e5c77449b06061ca2e54115d2de73f1f4e3358a84634b7a5510cdc6b327e961e2ecc04747092
26 -DIST watchman-2022.03.07.00.tar.gz 3780084 BLAKE2B e5ad1002ece9e7846c1806e10b48a595137ba4a86db73272d04faf3ba633d1935d2fa5609002c74cb989fe9fccbc366307d3241c9593730b401732c1c6773556 SHA512 93098f814b1b3340e43851000d1c3e579c2d0bb7b98539e435456e89eeddd002d602a69825a35e19f70e3db0b20ca3bbd2c8c86a7bf63901dd45b79fe5523c06
27 DIST watchman-2022.03.14.00.tar.gz 3782279 BLAKE2B 5be4811347f0ef03718444d51c5654b1217b0263994c8a1ca0da901d0b72b6252a727746b8c00e727e8f305dfc54624a61c02effee8b1cc05b84aacbcf4bfbe8 SHA512 3c10a83889876e71d6665d25d9d524efc3d5bf50305000c085caf7712f26397bd33df8763a9686f86a5ac5e722ae56c54023ccb60b85223a01b4bb7a239bec44
28 DIST watchman-2022.03.21.00.tar.gz 3782647 BLAKE2B 5a484d4900abf453fc5c6b2083367c5447131a832bb25e63d5edb98680d27ff3dc409a709a4335ccdd96133294e092e86fca889dfc6cc51f0eb6ca7b515ac09c SHA512 954a80e761f59e56b779355bb4fbc70b3e72ce95adaa2da9500927c4d3b0803eeb7f5e1f9ffa4e5ef164f99ee4afc23117a71af9067e823d01d71a585766522b
29 DIST watchman-2022.03.28.00.tar.gz 3781468 BLAKE2B 5db1f60c7149af418037a0ce7a00656bc652ec90a4bae261dd48c0bc21d2424ad30e049fe1142b072b5a01ca1380a5cd495fafa74d5c10785e097685f8fb5b21 SHA512 3275e66fe522fc45b3f0c8c458d6d2f61ee314f04d6b12935100535bc060603cafe76c8b13c0b8d334c13b63320ff4b84dc8dfb0f5ce09efc28d94e5d7a5974d
30
31 diff --git a/dev-util/watchman/watchman-2022.02.28.00.ebuild b/dev-util/watchman/watchman-2022.02.28.00.ebuild
32 deleted file mode 100644
33 index da684483d094..000000000000
34 --- a/dev-util/watchman/watchman-2022.02.28.00.ebuild
35 +++ /dev/null
36 @@ -1,210 +0,0 @@
37 -# Copyright 2020-2022 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=8
41 -
42 -# TODO: Split into different variables then combine for each component?
43 -# Not all is in rust/ dir.
44 -# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client
45 -CRATES="
46 -ahash-0.3.8
47 -ansi_term-0.12.1
48 -anyhow-1.0.55
49 -atty-0.2.14
50 -autocfg-1.1.0
51 -bitflags-1.3.2
52 -byteorder-1.4.3
53 -bytes-1.1.0
54 -cfg-if-1.0.0
55 -clap-2.34.0
56 -const-random-0.1.13
57 -const-random-macro-0.1.13
58 -crossbeam-0.8.1
59 -crossbeam-channel-0.5.2
60 -crossbeam-deque-0.8.1
61 -crossbeam-epoch-0.9.7
62 -crossbeam-queue-0.3.4
63 -crossbeam-utils-0.8.7
64 -crunchy-0.2.2
65 -either-1.6.1
66 -futures-0.1.31
67 -futures-0.3.21
68 -futures-channel-0.3.21
69 -futures-core-0.3.21
70 -futures-executor-0.3.21
71 -futures-io-0.3.21
72 -futures-macro-0.3.21
73 -futures-sink-0.3.21
74 -futures-task-0.3.21
75 -futures-util-0.3.21
76 -getrandom-0.2.5
77 -heck-0.3.3
78 -hermit-abi-0.1.19
79 -jwalk-0.6.0
80 -lazy_static-1.4.0
81 -libc-0.2.119
82 -lock_api-0.4.6
83 -log-0.4.14
84 -maplit-1.0.2
85 -memchr-2.4.1
86 -memoffset-0.6.5
87 -mio-0.8.0
88 -miow-0.3.7
89 -ntapi-0.3.7
90 -num_cpus-1.13.1
91 -once_cell-1.9.0
92 -parking_lot-0.12.0
93 -parking_lot_core-0.9.1
94 -pin-project-lite-0.2.8
95 -pin-utils-0.1.0
96 -proc-macro2-1.0.36
97 -proc-macro-error-1.0.4
98 -proc-macro-error-attr-1.0.4
99 -proc-macro-hack-0.5.19
100 -quote-1.0.15
101 -rayon-1.5.1
102 -rayon-core-1.9.1
103 -redox_syscall-0.2.10
104 -scopeguard-1.1.0
105 -serde-1.0.136
106 -serde_derive-1.0.136
107 -signal-hook-registry-1.4.0
108 -slab-0.4.5
109 -smallvec-1.8.0
110 -socket2-0.4.4
111 -strsim-0.8.0
112 -structopt-0.3.26
113 -structopt-derive-0.4.18
114 -syn-1.0.86
115 -textwrap-0.11.0
116 -thiserror-1.0.30
117 -thiserror-impl-1.0.30
118 -tiny-keccak-2.0.2
119 -tokio-1.17.0
120 -tokio-macros-1.7.0
121 -tokio-util-0.6.9
122 -unicode-segmentation-1.9.0
123 -unicode-width-0.1.9
124 -unicode-xid-0.2.2
125 -vec_map-0.8.2
126 -version_check-0.9.4
127 -wasi-0.10.2+wasi-snapshot-preview1
128 -winapi-0.3.9
129 -winapi-i686-pc-windows-gnu-0.4.0
130 -winapi-x86_64-pc-windows-gnu-0.4.0
131 -windows_aarch64_msvc-0.32.0
132 -windows_i686_gnu-0.32.0
133 -windows_i686_msvc-0.32.0
134 -windows-sys-0.32.0
135 -windows_x86_64_gnu-0.32.0
136 -windows_x86_64_msvc-0.32.0
137 -"
138 -
139 -PYTHON_COMPAT=( python3_{8,9,10} )
140 -DISTUTILS_USE_PEP517=setuptools
141 -inherit cargo cmake distutils-r1 tmpfiles
142 -
143 -DESCRIPTION="A file watching service"
144 -HOMEPAGE="https://facebook.github.io/watchman/"
145 -SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
146 -SRC_URI+=" $(cargo_crate_uris)"
147 -
148 -LICENSE="Apache-2.0"
149 -SLOT="0"
150 -KEYWORDS="~amd64"
151 -IUSE="llvm-libunwind python"
152 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
153 -
154 -# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent
155 -RDEPEND="
156 - dev-libs/libevent:=
157 - dev-libs/libpcre
158 - ~dev-cpp/folly-${PV}:=
159 - dev-cpp/glog:=
160 - >=dev-libs/libfmt-8.1.1-r1:=
161 - dev-libs/openssl:=
162 - llvm-libunwind? ( sys-libs/llvm-libunwind:= )
163 - !llvm-libunwind? ( sys-libs/libunwind:= )
164 - python? ( ${PYTHON_DEPS} )"
165 -# TODO: Make gtest test-only (needs a fair bit of patching)
166 -DEPEND="${RDEPEND}
167 - dev-cpp/gtest"
168 -
169 -PATCHES=(
170 - "${FILESDIR}"/watchman-2022.02.28.00-python-working-dir.patch
171 - "${FILESDIR}"/watchman-2022.02.28.00-libatomic.patch
172 -)
173 -
174 -# Rust utility
175 -QA_FLAGS_IGNORED="usr/bin/watchmanctl"
176 -
177 -distutils_enable_tests unittest
178 -
179 -src_prepare() {
180 - cmake_src_prepare
181 -}
182 -
183 -src_configure() {
184 - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17
185 - export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}"
186 - export RUST_CARGO_HOME="${ECARGO_HOME}"
187 - export CARGO_HOME="${ECARGO_HOME}"
188 - # Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue
189 - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69
190 - # so no need to force -j1 via cargo jobs
191 -
192 - local mycmakeargs=(
193 - # Rust wrangling
194 - -DUSE_CARGO_VENDOR=ON
195 - -DGENERATE_CARGO_VENDOR_CONFIG=OFF
196 - -DRUST_CARGO_HOME="${RUST_CARGO_HOME}"
197 -
198 - # General bits
199 - -DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman
200 - -DWATCHMAN_VERSION_OVERRIDE=${PV}
201 -
202 - # Fails to build against fbthrift for now in libatomic troubles
203 - -DENABLE_EDEN_SUPPORT=OFF
204 -
205 - # We handle this ourselves
206 - -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
207 - )
208 -
209 - cmake_src_configure
210 -}
211 -
212 -src_compile() {
213 - cmake_src_compile
214 -
215 - if use python ; then
216 - pushd watchman/python >/dev/null || die
217 - distutils-r1_src_compile
218 - popd >/dev/null || die
219 - fi
220 -}
221 -
222 -src_test() {
223 - cmake_src_test
224 -
225 - if use python ; then
226 - pushd watchman/python >/dev/null || die
227 - distutils-r1_src_test
228 - popd >/dev/null || die
229 - fi
230 -}
231 -
232 -src_install() {
233 - cmake_src_install
234 -
235 - newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf
236 -
237 - if use python ; then
238 - pushd watchman/python >/dev/null || die
239 - distutils-r1_src_install
240 - popd >/dev/null || die
241 - fi
242 -}
243 -
244 -pkg_postinst() {
245 - tmpfiles_process watchman.conf
246 -}
247
248 diff --git a/dev-util/watchman/watchman-2022.03.07.00.ebuild b/dev-util/watchman/watchman-2022.03.07.00.ebuild
249 deleted file mode 100644
250 index da684483d094..000000000000
251 --- a/dev-util/watchman/watchman-2022.03.07.00.ebuild
252 +++ /dev/null
253 @@ -1,210 +0,0 @@
254 -# Copyright 2020-2022 Gentoo Authors
255 -# Distributed under the terms of the GNU General Public License v2
256 -
257 -EAPI=8
258 -
259 -# TODO: Split into different variables then combine for each component?
260 -# Not all is in rust/ dir.
261 -# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client
262 -CRATES="
263 -ahash-0.3.8
264 -ansi_term-0.12.1
265 -anyhow-1.0.55
266 -atty-0.2.14
267 -autocfg-1.1.0
268 -bitflags-1.3.2
269 -byteorder-1.4.3
270 -bytes-1.1.0
271 -cfg-if-1.0.0
272 -clap-2.34.0
273 -const-random-0.1.13
274 -const-random-macro-0.1.13
275 -crossbeam-0.8.1
276 -crossbeam-channel-0.5.2
277 -crossbeam-deque-0.8.1
278 -crossbeam-epoch-0.9.7
279 -crossbeam-queue-0.3.4
280 -crossbeam-utils-0.8.7
281 -crunchy-0.2.2
282 -either-1.6.1
283 -futures-0.1.31
284 -futures-0.3.21
285 -futures-channel-0.3.21
286 -futures-core-0.3.21
287 -futures-executor-0.3.21
288 -futures-io-0.3.21
289 -futures-macro-0.3.21
290 -futures-sink-0.3.21
291 -futures-task-0.3.21
292 -futures-util-0.3.21
293 -getrandom-0.2.5
294 -heck-0.3.3
295 -hermit-abi-0.1.19
296 -jwalk-0.6.0
297 -lazy_static-1.4.0
298 -libc-0.2.119
299 -lock_api-0.4.6
300 -log-0.4.14
301 -maplit-1.0.2
302 -memchr-2.4.1
303 -memoffset-0.6.5
304 -mio-0.8.0
305 -miow-0.3.7
306 -ntapi-0.3.7
307 -num_cpus-1.13.1
308 -once_cell-1.9.0
309 -parking_lot-0.12.0
310 -parking_lot_core-0.9.1
311 -pin-project-lite-0.2.8
312 -pin-utils-0.1.0
313 -proc-macro2-1.0.36
314 -proc-macro-error-1.0.4
315 -proc-macro-error-attr-1.0.4
316 -proc-macro-hack-0.5.19
317 -quote-1.0.15
318 -rayon-1.5.1
319 -rayon-core-1.9.1
320 -redox_syscall-0.2.10
321 -scopeguard-1.1.0
322 -serde-1.0.136
323 -serde_derive-1.0.136
324 -signal-hook-registry-1.4.0
325 -slab-0.4.5
326 -smallvec-1.8.0
327 -socket2-0.4.4
328 -strsim-0.8.0
329 -structopt-0.3.26
330 -structopt-derive-0.4.18
331 -syn-1.0.86
332 -textwrap-0.11.0
333 -thiserror-1.0.30
334 -thiserror-impl-1.0.30
335 -tiny-keccak-2.0.2
336 -tokio-1.17.0
337 -tokio-macros-1.7.0
338 -tokio-util-0.6.9
339 -unicode-segmentation-1.9.0
340 -unicode-width-0.1.9
341 -unicode-xid-0.2.2
342 -vec_map-0.8.2
343 -version_check-0.9.4
344 -wasi-0.10.2+wasi-snapshot-preview1
345 -winapi-0.3.9
346 -winapi-i686-pc-windows-gnu-0.4.0
347 -winapi-x86_64-pc-windows-gnu-0.4.0
348 -windows_aarch64_msvc-0.32.0
349 -windows_i686_gnu-0.32.0
350 -windows_i686_msvc-0.32.0
351 -windows-sys-0.32.0
352 -windows_x86_64_gnu-0.32.0
353 -windows_x86_64_msvc-0.32.0
354 -"
355 -
356 -PYTHON_COMPAT=( python3_{8,9,10} )
357 -DISTUTILS_USE_PEP517=setuptools
358 -inherit cargo cmake distutils-r1 tmpfiles
359 -
360 -DESCRIPTION="A file watching service"
361 -HOMEPAGE="https://facebook.github.io/watchman/"
362 -SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
363 -SRC_URI+=" $(cargo_crate_uris)"
364 -
365 -LICENSE="Apache-2.0"
366 -SLOT="0"
367 -KEYWORDS="~amd64"
368 -IUSE="llvm-libunwind python"
369 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
370 -
371 -# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent
372 -RDEPEND="
373 - dev-libs/libevent:=
374 - dev-libs/libpcre
375 - ~dev-cpp/folly-${PV}:=
376 - dev-cpp/glog:=
377 - >=dev-libs/libfmt-8.1.1-r1:=
378 - dev-libs/openssl:=
379 - llvm-libunwind? ( sys-libs/llvm-libunwind:= )
380 - !llvm-libunwind? ( sys-libs/libunwind:= )
381 - python? ( ${PYTHON_DEPS} )"
382 -# TODO: Make gtest test-only (needs a fair bit of patching)
383 -DEPEND="${RDEPEND}
384 - dev-cpp/gtest"
385 -
386 -PATCHES=(
387 - "${FILESDIR}"/watchman-2022.02.28.00-python-working-dir.patch
388 - "${FILESDIR}"/watchman-2022.02.28.00-libatomic.patch
389 -)
390 -
391 -# Rust utility
392 -QA_FLAGS_IGNORED="usr/bin/watchmanctl"
393 -
394 -distutils_enable_tests unittest
395 -
396 -src_prepare() {
397 - cmake_src_prepare
398 -}
399 -
400 -src_configure() {
401 - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17
402 - export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}"
403 - export RUST_CARGO_HOME="${ECARGO_HOME}"
404 - export CARGO_HOME="${ECARGO_HOME}"
405 - # Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue
406 - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69
407 - # so no need to force -j1 via cargo jobs
408 -
409 - local mycmakeargs=(
410 - # Rust wrangling
411 - -DUSE_CARGO_VENDOR=ON
412 - -DGENERATE_CARGO_VENDOR_CONFIG=OFF
413 - -DRUST_CARGO_HOME="${RUST_CARGO_HOME}"
414 -
415 - # General bits
416 - -DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman
417 - -DWATCHMAN_VERSION_OVERRIDE=${PV}
418 -
419 - # Fails to build against fbthrift for now in libatomic troubles
420 - -DENABLE_EDEN_SUPPORT=OFF
421 -
422 - # We handle this ourselves
423 - -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
424 - )
425 -
426 - cmake_src_configure
427 -}
428 -
429 -src_compile() {
430 - cmake_src_compile
431 -
432 - if use python ; then
433 - pushd watchman/python >/dev/null || die
434 - distutils-r1_src_compile
435 - popd >/dev/null || die
436 - fi
437 -}
438 -
439 -src_test() {
440 - cmake_src_test
441 -
442 - if use python ; then
443 - pushd watchman/python >/dev/null || die
444 - distutils-r1_src_test
445 - popd >/dev/null || die
446 - fi
447 -}
448 -
449 -src_install() {
450 - cmake_src_install
451 -
452 - newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf
453 -
454 - if use python ; then
455 - pushd watchman/python >/dev/null || die
456 - distutils-r1_src_install
457 - popd >/dev/null || die
458 - fi
459 -}
460 -
461 -pkg_postinst() {
462 - tmpfiles_process watchman.conf
463 -}