summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-12-21 21:20:57 +0000
committerSam James <sam@gentoo.org>2022-12-21 22:24:59 +0000
commit13fddaa4d020eba09a603eb63965880ff50a8747 (patch)
treef0c0931f76aeee96b1e7e4611f94bd0e97bac777 /dev-util/watchman
parentdev-util/ccache: drop 4.7.3 (diff)
downloadgentoo-13fddaa4d020eba09a603eb63965880ff50a8747.tar.gz
gentoo-13fddaa4d020eba09a603eb63965880ff50a8747.tar.bz2
gentoo-13fddaa4d020eba09a603eb63965880ff50a8747.zip
dev-util/watchman: drop 2022.03.28.00
Bug: https://bugs.gentoo.org/871144 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/watchman')
-rw-r--r--dev-util/watchman/Manifest1
-rw-r--r--dev-util/watchman/files/watchman-2022.02.28.00-python-working-dir.patch73
-rw-r--r--dev-util/watchman/watchman-2022.03.28.00.ebuild210
3 files changed, 0 insertions, 284 deletions
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 891bf6e2099f..c1731d78f868 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -80,7 +80,6 @@ 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.03.28.00.tar.gz 3781468 BLAKE2B 5db1f60c7149af418037a0ce7a00656bc652ec90a4bae261dd48c0bc21d2424ad30e049fe1142b072b5a01ca1380a5cd495fafa74d5c10785e097685f8fb5b21 SHA512 3275e66fe522fc45b3f0c8c458d6d2f61ee314f04d6b12935100535bc060603cafe76c8b13c0b8d334c13b63320ff4b84dc8dfb0f5ce09efc28d94e5d7a5974d
DIST watchman-2022.08.29.00.tar.gz 3787691 BLAKE2B faf3f6afe351f7596256424c9e4f0c31fe826ee1097e216d04d869b3adee7ca1d4d9afbbea99fb3ca4f095d06171a1afe56fc5a71022242c4fde99246c3a1781 SHA512 25f6f133253335ece931fdbb131e8df4961c4b73877e2caa5008d3bd5e66e44b1121b7d4f2cd3367b1759476307aad8d6642089c482a6b65178b0a05510ea5f1
DIST watchman-2022.09.12.00.tar.gz 3789078 BLAKE2B 57bb4f5e0e0c4fc3390296e78a62c4301997efcafe72f2cc9418c1d1527e03e6825c64c29aa1214d3cdedd6908a3e2ec89eb51e4c00cdf84129d8af6c3cb9fd9 SHA512 283db0b0d801ac5d0b87bf0edd054c0d4c90b1dee75b791f9fd999777dca9ba9efe46c26093ff932588e35679a9f835296b9109d0441c4dec1d37453f1373c1e
DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
diff --git a/dev-util/watchman/files/watchman-2022.02.28.00-python-working-dir.patch b/dev-util/watchman/files/watchman-2022.02.28.00-python-working-dir.patch
deleted file mode 100644
index 0f045bccb334..000000000000
--- a/dev-util/watchman/files/watchman-2022.02.28.00-python-working-dir.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/watchman/python/setup.py
-+++ b/watchman/python/setup.py
-@@ -13,30 +13,10 @@ try:
- except ImportError:
- from distutils.core import setup, Extension
-
--watchman_src_dir = os.environ.get("CMAKE_CURRENT_SOURCE_DIR")
--if watchman_src_dir is None:
-- watchman_src_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
--
--# Setuptools is very picky about the path on Windows. They have to be relative
--# paths, and on Windows that means we have to be on the same drive as the source
--# files. Otherwise it is impossible to obtain a relative path across different
--# drives. However this has an implication that we will not be able to build this
--# package outside the repository. Not great but it works.
--py_dir = os.path.join(watchman_src_dir, "watchman", "python")
--if os.name == "nt":
-- os.chdir(py_dir)
-- py_dir = os.path.relpath(py_dir)
--
--
--def srcs(names):
-- """transform a list of sources to be relative to py_dir"""
-- return ["%s/%s" % (py_dir, n) for n in names]
--
-
- setup(
- name="pywatchman",
- version="1.4.1",
-- package_dir={"": py_dir},
- description="Watchman client for python",
- author="Wez Furlong, Rain",
- author_email="wez@fb.com",
-@@ -47,7 +27,7 @@ setup(
- keywords=("watchman inotify fsevents kevent kqueue portfs filesystem watcher"),
- license="BSD",
- packages=["pywatchman"],
-- ext_modules=[Extension("pywatchman.bser", sources=srcs(["pywatchman/bser.c"]))],
-+ ext_modules=[Extension("pywatchman.bser", sources=["pywatchman/bser.c"])],
- platforms="Platform Independent",
- classifiers=[
- "Development Status :: 5 - Production/Stable",
-@@ -63,12 +43,10 @@ setup(
- "Programming Language :: Python :: 3.6",
- ],
- zip_safe=True,
-- scripts=srcs(
-- [
-+ scripts=[
- "bin/watchman-make",
- "bin/watchman-wait",
- "bin/watchman-replicate-subscription",
-- ]
-- ),
-+ ],
- test_suite="tests",
- )
---- a/watchman/python/tests/tests.py
-+++ b/watchman/python/tests/tests.py
-@@ -27,13 +27,6 @@ from pywatchman import (
- )
-
-
--if os.path.basename(bser.__file__) == "pybser.py":
-- raise Exception(
-- "bser module resolved to pybser! Something is broken in your build. __file__={!r}, sys.path={!r}".format(
-- bser.__file__, sys.path
-- )
-- )
--
- PILE_OF_POO = u"\U0001F4A9"
- NON_UTF8_STRING = b"\xff\xff\xff"
-
diff --git a/dev-util/watchman/watchman-2022.03.28.00.ebuild b/dev-util/watchman/watchman-2022.03.28.00.ebuild
deleted file mode 100644
index eb2f4ec03913..000000000000
--- a/dev-util/watchman/watchman-2022.03.28.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
-}