gentoo resync : 08.10.2021

5 files changed, 2 insertions, 173 deletions

diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 56169d34c024..593c06b0f0fa 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,10 +1,5 @@
-AUX watchdog-2.1.2-big-endian.patch 2861 BLAKE2B 05849a6c6a23b4ef55c5f92a46ab57cf8a76cc34624e570287c966ab4911023383e776ba8c13c098994fe3a7088b8dbc984c11717dcf3bda4e7f6480dfeaa5b2 SHA512 8347eefea383db8ea9648560bba03103c3fbce640ad54c2da479ea3525b9e944deab10671dcdf100c7cfab9f6a3fd85987a16c07fca2e784416226e1ee862395
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
-DIST watchdog-2.1.2.tar.gz 97407 BLAKE2B a847089409537391287a146670864c7721344ba8a6378c89483e9e08abe3f61690bfca48016f628ab0e6b0ff317679db3c72e27594e049ea03334dd20c305008 SHA512 2a127faffebb35f0b14d578570a4c5a7c27d6bd38042e34ea50f4b654be1ca07b193dfa72dfe25442d3e6da746f1cfbdda71c38be1386cc5a3e69204843c16f1
-DIST watchdog-2.1.4.tar.gz 98695 BLAKE2B 2a15b362c6e776146df4738096fe0cd8ec49894c6b767e86ed5749c2f97447fb890f172ec989a17140594070eefa1fa2b40275aff5ba9d212f77a059ac3ead25 SHA512 88bed725c045f59091902a1fe4673036a679d263c71269e36125df2a4c851864bddee0cf4f8c3f20bfc2d5f735804b7c7b1ff07a3d89d8649bfa16d3e7e1fe21
 DIST watchdog-2.1.5.tar.gz 98791 BLAKE2B b7663e5aa8918321d570c842abf7c70647712d2045f3cc06ccdff86e305fecc5b95c93048aae9f0a7b2629c2c4f10911ef21077a570b9fb0c3eb03e9597f555f SHA512 850feaf4f5d61b8c8f1521464853df65b72af80c86c63fa87769d17f2bc464112daf3e09a8d83e30474d398315ce854e5a45703c5eabad8b0f5f98f6840d2590
 EBUILD watchdog-1.0.2.ebuild 965 BLAKE2B 35bf7d74d9da00f8a7b69e6394619867c4cf6947e5c14d8aa833ea1a099515529f7bdb5bb02a59a76c5629e7e38dfd560df0fc63d23fef5210d5b42ac0dd9a7e SHA512 a709f107fce0b758f9a4e522052fc8a6b7bcc0c7b87aa79fb53cf8c8ce035bdd4141df117b983d869f21af7410c7d6cc373fb65069f74c049e2b703863c06fbe
-EBUILD watchdog-2.1.2.ebuild 1105 BLAKE2B 1761e1cf618be7b611c7483a13a3fc399b0164f064a138361bc4226ac2a7d329dd48aee62afaa4e57776f146c78a8ff960b556ceee0e42a1fb0791e2bf33f6a3 SHA512 98532227f30ee84a91005b303e959cd720aa2cfa508d7c7392a969482e7d1b4917b846a0f358a5f3103a0e937a224d0d2d2e1562aa5f2d249b72806ec9942d42
-EBUILD watchdog-2.1.4.ebuild 1046 BLAKE2B 52b42d15c8a712005fa02dd9ab5405ceaecf2f86eff9f56f227b2df05dc00979d7aae4a73ac320806180f1168ba6a67334080b9297173ead2571485f175b9c34 SHA512 ecd0f21a72849edd23828b5bbd45546e90eb855679a9773e59beb635167ea2a9614f21e3d42a825c6d672bf0baf24d5377168c95def22d8588fb3d37557c61ff
-EBUILD watchdog-2.1.5.ebuild 1053 BLAKE2B a7ed523caeb5253b9e8ba12f648601b68e568adfce137e4bf2b53c1b5b214730afcf6b07460e197bf7f2f9c6463fd24b3531efafbc98b122131047d461388e53 SHA512 0f654bfb015629ef6d7e1dafe2f55d886234d7d67f62d39141c779fb02f73ec6f89f31ca3c8e6fc485caa7f8d40ae0b43cc16289e98046827b945c1a45c33a63
+EBUILD watchdog-2.1.5.ebuild 1058 BLAKE2B 5026b5d0cc5686afc160ad8a5bd566caf1d60b8bb3f0339fc0cb5194be33efd41c11e9cb2d16200e69f57ab635001bf39a54d76ff4b5e92a1ba0531bb016329f SHA512 47433d4c12ef0bb847d203d4cdda59ab6c03703bb4428014b3f4a13afebbfcbb92845101426ca2e8e05e4742556c09941a84407b4b4f8ec24a99c333901c3b1b
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/files/watchdog-2.1.2-big-endian.patch b/dev-python/watchdog/files/watchdog-2.1.2-big-endian.patch
deleted file mode 100644
index 61ddff816a88..000000000000
--- a/dev-python/watchdog/files/watchdog-2.1.2-big-endian.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From ab6508716f95fb65481ab6232301a095452e9b49 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 19 Aug 2021 15:13:39 +0200
-Subject: [PATCH] Fix test mocks for big endian systems
-
-Fix the mocked inotify data to respect system endianness.  Instead of
-harcoding the raw data, reconstruct it using struct.pack(), respecting
-host endianness.  This should also benefit readability a bit.
-
-Closes #804
----
- tests/test_inotify_c.py | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/tests/test_inotify_c.py b/tests/test_inotify_c.py
-index 81f6586..dc336a3 100644
---- a/tests/test_inotify_c.py
-+++ b/tests/test_inotify_c.py
-@@ -10,6 +10,7 @@ import ctypes
- import errno
- import logging
- import os
-+import struct
- from functools import partial
- from queue import Queue
- 
-@@ -52,6 +53,19 @@ def teardown_function(function):
-         pass
- 
- 
-+def struct_inotify(wd, mask, cookie, length, name):
-+    assert len(name) <= length
-+    struct_format = (
-+        "=" # (native endianness, standard sizes)
-+        "i" # int      wd
-+        "i" # uint32_t mask
-+        "i" # uint32_t cookie
-+        "i" # uint32_t len
-+        "%ds" % (length,) # char[] name
-+    )
-+    return struct.pack(struct_format, wd, mask, cookie, length, name)
-+
-+
- def test_late_double_deletion(monkeypatch):
-     inotify_fd = type(str("FD"), (object,), {})()  # Empty object
-     inotify_fd.last = 0
-@@ -60,20 +74,18 @@ def test_late_double_deletion(monkeypatch):
-     # CREATE DELETE CREATE DELETE DELETE_SELF IGNORE DELETE_SELF IGNORE
-     inotify_fd.buf = (
-         # IN_CREATE|IS_DIR (wd = 1, path = subdir1)
--        b"\x01\x00\x00\x00\x00\x01\x00\x40\x00\x00\x00\x00\x10\x00\x00\x00"
--        b"\x73\x75\x62\x64\x69\x72\x31\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(1, 0x40000100, 0, 16, b"subdir1") +
-         # IN_DELETE|IS_DIR (wd = 1, path = subdir1)
--        b"\x01\x00\x00\x00\x00\x02\x00\x40\x00\x00\x00\x00\x10\x00\x00\x00"
--        b"\x73\x75\x62\x64\x69\x72\x31\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(1, 0x40000200, 0, 16, b"subdir1")
-     ) * 2 + (
-         # IN_DELETE_SELF (wd = 2)
--        b"\x02\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(2, 0x00000400, 0, 0, b"") +
-         # IN_IGNORE (wd = 2)
--        b"\x02\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(2, 0x00008000, 0, 0, b"") +
-         # IN_DELETE_SELF (wd = 3)
--        b"\x03\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(3, 0x00000400, 0, 0, b"") +
-         # IN_IGNORE (wd = 3)
--        b"\x03\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-+        struct_inotify(3, 0x00008000, 0, 0, b"")
-     )
- 
-     os_read_bkp = os.read
--- 
-2.33.0
-
diff --git a/dev-python/watchdog/watchdog-2.1.2.ebuild b/dev-python/watchdog/watchdog-2.1.2.ebuild
deleted file mode 100644
index cac5d8992dd1..000000000000
--- a/dev-python/watchdog/watchdog-2.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-big-endian.patch
-	)
-
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_inotify_buffer.py::test_move_internal_batch
-	)
-
-	epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.4.ebuild b/dev-python/watchdog/watchdog-2.1.4.ebuild
deleted file mode 100644
index 7b9fe168c229..000000000000
--- a/dev-python/watchdog/watchdog-2.1.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_inotify_buffer.py::test_move_internal_batch
-	)
-
-	epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.5.ebuild b/dev-python/watchdog/watchdog-2.1.5.ebuild
index 19dab80e9b44..6ff4d4193bde 100644
--- a/dev-python/watchdog/watchdog-2.1.5.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}