diff options
| -rw-r--r-- | dev-util/watchman/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/watchman/files/4.9.0-changes.patch | 80 | ||||
| -rw-r--r-- | dev-util/watchman/files/4.9.0-python3.patch | 65 | ||||
| -rw-r--r-- | dev-util/watchman/watchman-4.9.0.ebuild | 62 |
4 files changed, 0 insertions, 208 deletions
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest index 0975e613cd75..98ead980b5b1 100644 --- a/dev-util/watchman/Manifest +++ b/dev-util/watchman/Manifest @@ -83,7 +83,6 @@ DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856 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-4.9.0.tar.gz 3508045 BLAKE2B 413b779f02736442c371af1d9e18e5c84f05f9e9465c114dc4bdf79cbc1d823f1ad3167abef22818652a924ca2cb563c54d18f7599b987f579655d8a2b82162a SHA512 3c1222ba41383b26c2c427415e75abdb4bef5a95001438c3debe7cf3ca654944ecf08e432c5ad0aefa2a6554ae73ff0f6995e7f4ee61cdb2cde80f8378d3a704 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 diff --git a/dev-util/watchman/files/4.9.0-changes.patch b/dev-util/watchman/files/4.9.0-changes.patch deleted file mode 100644 index 4625bc815539..000000000000 --- a/dev-util/watchman/files/4.9.0-changes.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -ru old/python/bin/watchman-make new/python/bin/watchman-make ---- old/python/bin/watchman-make 2020-09-06 11:36:12.202435809 +0200 -+++ new/python/bin/watchman-make 2020-09-06 11:36:14.105482419 +0200 -@@ -55,7 +55,14 @@ - data = client.getSubscription(self.name) - if data is None: - return -- self.triggered = True -+ for item in data: -+ # We only want to trigger if files matched; -+ # updates without a files list are metadata -+ # such as state-enter/leave notices so we skip them -+ if 'files' in item: -+ self.triggered = True -+ if 'canceled' in item: -+ raise RuntimeError('Watch was cancelled') - - def execute(self): - if not self.triggered: -@@ -165,6 +172,11 @@ - parser.add_argument('-r', '--run', type=str, help=""" - The script that should be run when changes are detected - """) -+parser.add_argument('--connect-timeout', type=float, default=600, help=""" -+Initial watchman client connection timeout. It should be sufficiently large to -+prevent timeouts when watchman is busy (eg. performing a crawl). The default -+value is 600 seconds. -+""") - args = parser.parse_args() - - if args.target is None and args.run is None: -@@ -187,7 +199,7 @@ - sys.exit(1) - - targets = {} --client = pywatchman.client(timeout=600) -+client = pywatchman.client(timeout=args.connect_timeout) - try: - client.capabilityCheck( - required=['cmd-watch-project', 'wildmatch']) -diff -ru old/python/bin/watchman-wait new/python/bin/watchman-wait ---- old/python/bin/watchman-wait 2020-09-06 11:36:12.202435809 +0200 -+++ new/python/bin/watchman-wait 2020-09-06 11:36:14.106482444 +0200 -@@ -76,6 +76,11 @@ - Exit if no events trigger within the specified timeout. If timeout is - zero (the default) then keep running indefinitely. - """) -+parser.add_argument('--connect-timeout', type=float, default=100, help=""" -+Initial watchman client connection timeout. It should be sufficiently large to -+prevent timeouts when watchman is busy (eg. performing a crawl). The default -+value is 100 seconds. -+""") - args = parser.parse_args() - - -@@ -141,7 +146,7 @@ - def formatField(self, fname, val): - if fname == 'name': - # Respect the --relative path printing option -- return os.path.relpath(val, args.relative) -+ return os.path.relpath(os.path.join(self.name, val), args.relative) - # otherwise just make sure it's a string so that we can join it - return str(val) - -@@ -173,12 +178,13 @@ - for path in args.path: - sub = Subscription(path) - -+# and start up the client + subscriptions -+client = pywatchman.client(timeout=args.connect_timeout) -+ - deadline = None - if args.timeout > 0: - deadline = time.time() + args.timeout - --# and start up the client + subscriptions --client = pywatchman.client() - try: - client.capabilityCheck( - required=['term-dirname', 'cmd-watch-project', 'wildmatch']) diff --git a/dev-util/watchman/files/4.9.0-python3.patch b/dev-util/watchman/files/4.9.0-python3.patch deleted file mode 100644 index 5b416f24ae46..000000000000 --- a/dev-util/watchman/files/4.9.0-python3.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -ru backup/old/python/bin/watchman-make old/python/bin/watchman-make ---- backup/old/python/bin/watchman-make 2020-09-06 11:33:34.449582111 +0200 -+++ old/python/bin/watchman-make 2020-09-06 11:33:43.473801969 +0200 -@@ -100,7 +100,7 @@ - targets = [] - setattr(namespace, self.dest, targets) - -- if isinstance(values, basestring): -+ if isinstance(values, (str, bytes)): - values = [values] - - if namespace.pattern is None or len(namespace.pattern) == 0: -@@ -209,7 +209,7 @@ - client.setTimeout(600) - - result = client.receive() -- for _, t in targets.iteritems(): -+ for _, t in targets.items(): - t.consumeEvents(client) - - # Now we wait for events to settle -@@ -218,7 +218,7 @@ - while not settled: - try: - result = client.receive() -- for _, t in targets.iteritems(): -+ for _, t in targets.items(): - t.consumeEvents(client) - except pywatchman.SocketTimeout as ex: - # Our short settle timeout hit, so we're now settled -@@ -226,7 +226,7 @@ - break - - # Now we can work on executing the targets -- for _, t in targets.iteritems(): -+ for _, t in targets.items(): - t.execute() - - # Print this at the bottom of the loop rather than the top -@@ -249,4 +249,3 @@ - except KeyboardInterrupt: - # suppress ugly stack trace when they Ctrl-C - break -- -diff -ru backup/old/python/bin/watchman-wait old/python/bin/watchman-wait ---- backup/old/python/bin/watchman-wait 2020-09-06 11:33:34.449582111 +0200 -+++ old/python/bin/watchman-wait 2020-09-06 11:33:43.473801969 +0200 -@@ -182,7 +182,7 @@ - try: - client.capabilityCheck( - required=['term-dirname', 'cmd-watch-project', 'wildmatch']) -- for _, sub in subscriptions.iteritems(): -+ for _, sub in subscriptions.items(): - sub.start(client) - - except pywatchman.CommandError as ex: -@@ -200,7 +200,7 @@ - # the client object will accumulate all subscription results - # over time, so we ask it to remove and return those values - # for each of the subscriptions -- for _, sub in subscriptions.iteritems(): -+ for _, sub in subscriptions.items(): - sub.emit(client) - - except pywatchman.SocketTimeout as ex: diff --git a/dev-util/watchman/watchman-4.9.0.ebuild b/dev-util/watchman/watchman-4.9.0.ebuild deleted file mode 100644 index e3da13e7dd3f..000000000000 --- a/dev-util/watchman/watchman-4.9.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit autotools distutils-r1 - -COMMIT="8e0ba724d85de2c89f48161807e878667b9ed089" # v4.9.0 tag -DESCRIPTION="A file watching service" -HOMEPAGE="https://facebook.github.io/watchman/" -SRC_URI="https://github.com/facebook/watchman/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="pcre python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="pcre? ( dev-libs/libpcre ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PV}-python3.patch" - "${FILESDIR}/${PV}-changes.patch" -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - --enable-lenient \ - --disable-statedir \ - --disable-cppclient \ - --without-python \ - $(use_with pcre) -} - -src_compile() { - default - - if use python; then - pushd python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - default - - if use python; then - pushd python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi -} |