From f2e359c456b051f95efc92e21299d55a302e58ed Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Nov 2024 03:03:00 +0000 Subject: gentoo auto-resync : 19:11:2024 - 03:03:00 --- dev-util/watchman/Manifest | 2 +- dev-util/watchman/watchman-2023.06.19.00-r1.ebuild | 251 -------------------- dev-util/watchman/watchman-2023.06.19.00-r2.ebuild | 253 +++++++++++++++++++++ 3 files changed, 254 insertions(+), 252 deletions(-) delete mode 100644 dev-util/watchman/watchman-2023.06.19.00-r1.ebuild create mode 100644 dev-util/watchman/watchman-2023.06.19.00-r2.ebuild (limited to 'dev-util/watchman') diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest index 70bdbcf8921a..831189738c1c 100644 --- a/dev-util/watchman/Manifest +++ b/dev-util/watchman/Manifest @@ -290,6 +290,6 @@ DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007 DIST xi-unicode-0.2.1.crate 88229 BLAKE2B a091b894959e665e2b46086a3512a6193b54bd8328816d7f3ba31e30fab71ad507eb970e6bcb93ae4a4ba339154b55c4bf9ef513560d6067a46cd53735c24414 SHA512 cd5dde20cde2c9180247df4f6912139a436f7ab71ef86dac66418c0459df665c09fc3c5b497f8157a6209da32b3e9fda5f50d1ef06c1c8cc2557c4b90363e586 DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb -EBUILD watchman-2023.06.19.00-r1.ebuild 5591 BLAKE2B a11bc7c23b23446ce817eb3759d3fc9452330de68c16f66aa2521dbf0c6fabe9b677b92af007f72ef9465e64fc01b81e738348ecd6cf31a55a2d55dfd530f80b SHA512 facbd074d59f5f153af10cf89990b4187a3cd7003807bd9da8d41d535eecc5c4ace1e16dff2670ba0b508a5436538b542104c2f3a2130ad0e7baa373f1e1320c +EBUILD watchman-2023.06.19.00-r2.ebuild 5674 BLAKE2B e22d3e491b4c439ceaa7973a2c0470ec9d197389624f638e23087d8699bf2464af964b905c67aef8b6a4f6842588939b8ba3f818be9333d5096b6069d0911863 SHA512 7fabaa014bafbf3ecec4f4af1779c2b59007bcf6970c80ddfeed6fff186a0770c3a101531ad9eebea13c5fad92a6b5109273fb90b5d907e1ec24a5d607bfb1cc EBUILD watchman-2024.11.04.00.ebuild 7580 BLAKE2B 2b1de95244795bee971b7df82aebfbf4bf2c703b2294535c325dda18be411c89b01a0d9f33f6870818f9cc201340fd0c809d18a08cb98cb124aca128486d125f SHA512 7ecfc4d45d4681765c2e790c27caf3a28e3b0d073685d6462659499e57ba24fe60a1a700a6c276e6267b0bb48035888e6f3766ac41e971b783ba33536f00dddf MISC metadata.xml 582 BLAKE2B 9a1e25a4a46f649c5a39643e52f3b06de92e51701c3948454c769272c32385f4163038edfd59d10591fe83696c46efdcb262a6ff79ce81e537bd3b908c069e1e SHA512 e30706692c771c1e55493b241197cc1c1c68dd2f0412777c97f40c00432f9f01268397a6b9726f15587f84d8e9e35d82a3b8e99233573f60f9670978e37e4d7a diff --git a/dev-util/watchman/watchman-2023.06.19.00-r1.ebuild b/dev-util/watchman/watchman-2023.06.19.00-r1.ebuild deleted file mode 100644 index 18a9a02d8d3d..000000000000 --- a/dev-util/watchman/watchman-2023.06.19.00-r1.ebuild +++ /dev/null @@ -1,251 +0,0 @@ -# Copyright 2020-2024 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: -# - thirdparty/deelevate_binding/Cargo.toml -# - rust/watchman_client/Cargo.toml -# - rust/serde_bser/Cargo.toml -# - cli/Cargo.toml -CRATES=" - ahash@0.8.3 - ansi_term@0.12.1 - anyhow@1.0.71 - atty@0.2.14 - autocfg@1.1.0 - bitflags@1.3.2 - byteorder@1.4.3 - bytes@1.4.0 - cfg-if@1.0.0 - clap@2.34.0 - core-foundation-sys@0.8.4 - crossbeam-channel@0.5.8 - crossbeam-deque@0.8.3 - crossbeam-epoch@0.9.15 - crossbeam-queue@0.3.8 - crossbeam-utils@0.8.16 - crossbeam@0.8.2 - duct@0.13.6 - either@1.8.1 - futures-channel@0.3.28 - futures-core@0.3.28 - futures-executor@0.3.28 - futures-io@0.3.28 - futures-macro@0.3.28 - futures-sink@0.3.28 - futures-task@0.3.28 - futures-util@0.3.28 - futures@0.1.31 - futures@0.3.28 - getrandom@0.2.10 - heck@0.3.3 - hermit-abi@0.1.19 - hermit-abi@0.2.6 - itoa@1.0.6 - jwalk@0.6.2 - lazy_static@1.4.0 - libc@0.2.146 - lock_api@0.4.10 - log@0.4.19 - maplit@1.0.2 - memchr@2.5.0 - memoffset@0.6.5 - memoffset@0.9.0 - mio@0.8.8 - nix@0.25.1 - ntapi@0.4.1 - num_cpus@1.15.0 - once_cell@1.18.0 - os_pipe@1.1.4 - parking_lot@0.12.1 - parking_lot_core@0.9.8 - pin-project-lite@0.2.9 - pin-utils@0.1.0 - proc-macro-error-attr@1.0.4 - proc-macro-error@1.0.4 - proc-macro2@1.0.60 - quote@1.0.28 - rayon-core@1.11.0 - rayon@1.7.0 - redox_syscall@0.3.5 - ryu@1.0.13 - scopeguard@1.1.0 - serde@1.0.164 - serde_bytes@0.11.9 - serde_derive@1.0.164 - serde_json@1.0.99 - shared_child@1.0.0 - signal-hook-registry@1.4.1 - slab@0.4.8 - smallvec@1.10.0 - socket2@0.4.9 - strsim@0.8.0 - structopt-derive@0.4.18 - structopt@0.3.26 - syn@1.0.109 - syn@2.0.20 - sysinfo@0.26.9 - tabular@0.2.0 - textwrap@0.11.0 - thiserror-impl@1.0.40 - thiserror@1.0.40 - tokio-macros@2.1.0 - tokio-util@0.6.10 - tokio@1.28.2 - tracing-core@0.1.31 - tracing@0.1.37 - unicode-ident@1.0.9 - unicode-segmentation@1.10.1 - unicode-width@0.1.10 - vec_map@0.8.2 - version_check@0.9.4 - wasi@0.11.0+wasi-snapshot-preview1 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-x86_64-pc-windows-gnu@0.4.0 - winapi@0.3.9 - windows-sys@0.48.0 - windows-targets@0.48.0 - windows_aarch64_gnullvm@0.48.0 - windows_aarch64_msvc@0.48.0 - windows_i686_gnu@0.48.0 - windows_i686_msvc@0.48.0 - windows_x86_64_gnu@0.48.0 - windows_x86_64_gnullvm@0.48.0 - windows_x86_64_msvc@0.48.0 -" - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -# stdsimd -RUST_MAX_VER="1.77.1" - -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" -# Dependent crate licenses -LICENSE+=" - MIT Unicode-DFS-2016 - || ( Apache-2.0 Boost-1.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-${PV}:= - ~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}-2023.01.16.00-python-working-dir.patch - "${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch - "${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch - "${FILESDIR}"/${PN}-2023.06.19.00-rust-1.70-avoidance.patch - "${FILESDIR}"/${PN}-2023.06.19.00-unused.patch - "${FILESDIR}"/${PN}-2023.06.19.00-gcc15.patch -) - -# Rust utility -QA_FLAGS_IGNORED="usr/bin/watchmanctl" - -distutils_enable_tests unittest - -src_prepare() { - # Avoid cargo_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-2023.06.19.00-r2.ebuild b/dev-util/watchman/watchman-2023.06.19.00-r2.ebuild new file mode 100644 index 000000000000..591c4924066c --- /dev/null +++ b/dev-util/watchman/watchman-2023.06.19.00-r2.ebuild @@ -0,0 +1,253 @@ +# Copyright 2020-2024 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: +# - thirdparty/deelevate_binding/Cargo.toml +# - rust/watchman_client/Cargo.toml +# - rust/serde_bser/Cargo.toml +# - cli/Cargo.toml +CRATES=" + ahash@0.8.3 + ansi_term@0.12.1 + anyhow@1.0.71 + atty@0.2.14 + autocfg@1.1.0 + bitflags@1.3.2 + byteorder@1.4.3 + bytes@1.4.0 + cfg-if@1.0.0 + clap@2.34.0 + core-foundation-sys@0.8.4 + crossbeam-channel@0.5.8 + crossbeam-deque@0.8.3 + crossbeam-epoch@0.9.15 + crossbeam-queue@0.3.8 + crossbeam-utils@0.8.16 + crossbeam@0.8.2 + duct@0.13.6 + either@1.8.1 + futures-channel@0.3.28 + futures-core@0.3.28 + futures-executor@0.3.28 + futures-io@0.3.28 + futures-macro@0.3.28 + futures-sink@0.3.28 + futures-task@0.3.28 + futures-util@0.3.28 + futures@0.1.31 + futures@0.3.28 + getrandom@0.2.10 + heck@0.3.3 + hermit-abi@0.1.19 + hermit-abi@0.2.6 + itoa@1.0.6 + jwalk@0.6.2 + lazy_static@1.4.0 + libc@0.2.146 + lock_api@0.4.10 + log@0.4.19 + maplit@1.0.2 + memchr@2.5.0 + memoffset@0.6.5 + memoffset@0.9.0 + mio@0.8.8 + nix@0.25.1 + ntapi@0.4.1 + num_cpus@1.15.0 + once_cell@1.18.0 + os_pipe@1.1.4 + parking_lot@0.12.1 + parking_lot_core@0.9.8 + pin-project-lite@0.2.9 + pin-utils@0.1.0 + proc-macro-error-attr@1.0.4 + proc-macro-error@1.0.4 + proc-macro2@1.0.60 + quote@1.0.28 + rayon-core@1.11.0 + rayon@1.7.0 + redox_syscall@0.3.5 + ryu@1.0.13 + scopeguard@1.1.0 + serde@1.0.164 + serde_bytes@0.11.9 + serde_derive@1.0.164 + serde_json@1.0.99 + shared_child@1.0.0 + signal-hook-registry@1.4.1 + slab@0.4.8 + smallvec@1.10.0 + socket2@0.4.9 + strsim@0.8.0 + structopt-derive@0.4.18 + structopt@0.3.26 + syn@1.0.109 + syn@2.0.20 + sysinfo@0.26.9 + tabular@0.2.0 + textwrap@0.11.0 + thiserror-impl@1.0.40 + thiserror@1.0.40 + tokio-macros@2.1.0 + tokio-util@0.6.10 + tokio@1.28.2 + tracing-core@0.1.31 + tracing@0.1.37 + unicode-ident@1.0.9 + unicode-segmentation@1.10.1 + unicode-width@0.1.10 + vec_map@0.8.2 + version_check@0.9.4 + wasi@0.11.0+wasi-snapshot-preview1 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.48.0 + windows-targets@0.48.0 + windows_aarch64_gnullvm@0.48.0 + windows_aarch64_msvc@0.48.0 + windows_i686_gnu@0.48.0 + windows_i686_msvc@0.48.0 + windows_x86_64_gnu@0.48.0 + windows_x86_64_gnullvm@0.48.0 + windows_x86_64_msvc@0.48.0 +" + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +# stdsimd +RUST_MAX_VER="1.77.1" + +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" +# Dependent crate licenses +LICENSE+=" + MIT Unicode-DFS-2016 + || ( Apache-2.0 Boost-1.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 +# /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 +} -- cgit v1.2.3