gentoo resync : 04.01.2022

4 files changed, 2 insertions, 69 deletions

diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index ca292b6c29d4..94ba4fc323e8 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,6 +1,3 @@
-AUX lz4-3.1.3-310-readall.patch 922 BLAKE2B 6379760b22c54cc55c62aa8b97bdb7329f5f38e71053a601f8484552654b045f771a049018f98ec6bd3a29d89dbb289d405345594d320a472208e2b80766b81e SHA512 232734e63288e99c11af497d019bf75e2c6833bc4394e280104d17073cd35fc02dfd6fe1a06c72bc4e398f0e335357786b3b6ad220aca4a7d9e9cb6c6b6023a7
 DIST lz4-3.1.10.tar.gz 162886 BLAKE2B d87a84e619b62b0fb13c942c5bee1ba78c1457e1f8bef093d5be732ea6b1481ad1de38a3e3e9e3479fb407477d43183b376fd1ce2a2b5d6289d293a6c79dc414 SHA512 61983e77fa445f59503ccf8ed5fe0605d79754cdeb166e16a7093a856b23369634db7d105d57b3829e680dad0a3728adec9d18dccd92c994347b74c5af95580e
-DIST lz4-3.1.3.tar.gz 159016 BLAKE2B 2ab86799cbd37b96550ebb5d0e1a3c301cbcee2a42c6da189f5ae0fee4eb9c5614860dd044363e2c9312e3ab275eb527a116210604a72bd74354f49589d6567b SHA512 170b5330a8ec0eb4d69f3692c54eaa384fd4de78a7e7db95721d2f1e521ae9558f814e63bbb31db2775a81f7cd7eaea1420ad2c96406cff95d25bc5d30811aba
-EBUILD lz4-3.1.10.ebuild 646 BLAKE2B 5b82db7728c6a511716be7e585c6690e04c4cca1b06824672db90798b87a9d790c10b840601b96525a0a64a229f55b2fcc100731acb609a2e8289c4aa23229dd SHA512 c9e30268aa951180aebd4e0e285145771ab6e2f10679a61cb20a3a0dff3fb51395518976c4ae182f75f48efa745d6de71841221b1f1abf0b10a43dc7ba4010c6
-EBUILD lz4-3.1.3.ebuild 694 BLAKE2B 26c8f7145aa1cc911f84cf9601e5e7aac97c82b2df7813ed708463a3a8791105220c79446b19faf99c9fd45a2dce09eb057f2ee06d7fcba6f847b2866237bf74 SHA512 2eda64eb02e540a94d2fac5fc26d2630059c29dbbf881d6a741f76bf9d003df549e331a15264596b57bc137188b1f63fc55886f22aba203333eb7d3a5937b54f
+EBUILD lz4-3.1.10.ebuild 642 BLAKE2B b4229401b368d1e36f70bfce1057d72753ccdca0ecd346dd4ad86e0affda1cfda60a1c588502dfb7bc71609142bbf59bf95183a330ed436e508951efb483c8ef SHA512 cbf13d5f87bf1a00e3359c51b2971a40d13aea551f246f7e3ccb692a0f706e73f59bb52464ffd9ff23e58a3f0db01bc108f2ddda9a4240c7e09afe1366ec7108
 MISC metadata.xml 454 BLAKE2B b02d4acc9eb7d4fb35bf36371cb660d099c77f807fc08fc351b7e0e1d2e0199fdab82d83bb6bc31a56bfdb9a5b020b2f57aa9b89b59a7e5c22fcce554b6b0859 SHA512 a1b61eb4d3ce636b10abcff25ee3315bf5ecb3bdee58e1c45ff99f0b40717b13e3a8ec33c9abcb926bd716990a31749b1bf6729d8137b7859857318c386a8ec7
diff --git a/dev-python/lz4/files/lz4-3.1.3-310-readall.patch b/dev-python/lz4/files/lz4-3.1.3-310-readall.patch
deleted file mode 100644
index 63b306b4e4f3..000000000000
--- a/dev-python/lz4/files/lz4-3.1.3-310-readall.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/lz4/frame/__init__.py b/lz4/frame/__init__.py
-index 5fa03ce..b77c425 100644
---- a/lz4/frame/__init__.py
-+++ b/lz4/frame/__init__.py
-@@ -617,6 +617,17 @@ class LZ4FrameFile(_compression.BaseStream):
-         # returns at least one byte (except at EOF)
-         return self._buffer.peek(size)
- 
-+    def readall(self):
-+        chunks = bytearray()
-+
-+        while True:
-+            data = self.read(io.DEFAULT_BUFFER_SIZE)
-+            chunks += data
-+            if not data:
-+                break
-+
-+        return bytes(chunks)
-+
-     def read(self, size=-1):
-         """Read up to ``size`` uncompressed bytes from the file.
- 
-@@ -632,6 +643,9 @@ class LZ4FrameFile(_compression.BaseStream):
- 
-         """
-         self._check_can_read()
-+
-+        if size < 0 and sys.version_info >= (3, 10):
-+            return self.readall()
-         return self._buffer.read(size)
- 
-     def read1(self, size=-1):
diff --git a/dev-python/lz4/lz4-3.1.10.ebuild b/dev-python/lz4/lz4-3.1.10.ebuild
index 2a3ea4a39b2a..e9132fc819bf 100644
--- a/dev-python/lz4/lz4-3.1.10.ebuild
+++ b/dev-python/lz4/lz4-3.1.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/lz4:="
 DEPEND=${RDEPEND}
diff --git a/dev-python/lz4/lz4-3.1.3.ebuild b/dev-python/lz4/lz4-3.1.3.ebuild
deleted file mode 100644
index b86d4cd56978..000000000000
--- a/dev-python/lz4/lz4-3.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="app-arch/lz4:="
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-310-readall.patch"
-)
-
-distutils_enable_tests pytest