gentoo resync : 02.02.2022

4 files changed, 8 insertions, 174 deletions

diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index e2487ff5e9d0..9c42bb409ff5 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -1,6 +1,4 @@
-AUX python-lzo-1.12-fix-py3.10.patch 4320 BLAKE2B 30fc47fbb2d99d1cd86771bd819fe6f549e8429d3d76a23b0051e7fafb3f93f689958400bb41af51cdccedfaba483b2d82fe14454b9bf27652955203e1e89dc5 SHA512 458ff5700ed6d50dcb03321319286e16d852f3158670b625be8dd0cfbb55483a79e2f8f0de9eb33bcb1b5a76fb46b96074bb7711a15535701337d0a68302a3e3
-DIST python-lzo-1.12.tar.gz 14042 BLAKE2B 7375e9b200a17cc1ad2c4dfdbe6491082af8d120b2b659b1e9bbff00eaae568e04dc12e5c13de3a028267a1e8e02bd1522a9335db73fa6a5a4ebc7ca4b341fff SHA512 811bdb282cfaf33427ad641d0342900c5af1f17b7033d76593288c3846b0feefe6ef93253152add97b2d6420f937de2745c8e7508dadf33e72b11545cac3be4d
 DIST python-lzo-1.14.tar.gz 14050 BLAKE2B e1df6b842562064ca13ddbacb194047ca343694d480a5a65e7d2876ec98a4215b4badb3b2a839f308dea8624c162a0536f363c093bcb2e5b48c68b69fb472729 SHA512 036cf7199afe12cec8b9c7ee92134f58357e1f892870ade3a619541a69c9cc92155892d53bd43330732b848016c2997e096a9a492e52f15d04fa516ca7645b93
-EBUILD python-lzo-1.12-r2.ebuild 833 BLAKE2B 31048348486e74bb1fd46d6ef5a758b24cf6d4fff3c042c64fd63f69fa995ff85d8f5c4ee06186fb2de67d6becc90383c8a2a6b293d5b26251afda0ee73d6d37 SHA512 83cfe0cebc6c4fc32f886658f7edffd30bec66de056e7051b43c01173e505aeb368b1bbb06204f5f929a3e771e290d274d6d36ce27992e54690a4d615fc4e851
-EBUILD python-lzo-1.14.ebuild 722 BLAKE2B 525da0188cb791df370054cb93652109ff9addf07e1c101beac50d64ef938ce9a43a4eefb99ca3e4f9776bbaf31ffaff6eddd1c7c80c0e97d9bf13285b32e479 SHA512 18f4db8f9d853f6f54746fa16058c1e22cfd775bfd180b23897ceb738c0d77be6e5a7818f7feeac06be09a022ad59badb2685aadd288fe82c94dcd312c5f4e79
+EBUILD python-lzo-1.14-r1.ebuild 716 BLAKE2B d31429916ad11a477b37021cf929e814870d49af8c295606a3ef9850263c393f9a54c13db27b07b0d32d5266e32762f2e324bca0a83501ba28bfe7763610c87f SHA512 3154bc7a5eff7dc463e6e5bd20fe6330198809577e6b1698492b46b4cad94ede83ae506384d34d03519128dedf5d385c65c651bb25932516b9605f2e31c9a071
+EBUILD python-lzo-1.14.ebuild 720 BLAKE2B 97ae962735b2fd7868c57a367aab03ff0d33eede0274c486d2deebd0f276bef847d0815483eb1f61bbc1772b22c3798540611c99856d6d7872c80e89b827471e SHA512 59b20bea0af067b32133786c5a4fd8f69ccf1bdc0bfd4698bbb5477770887de9250e456f9a8dedbfa3c9357e623295506ed37d2c0fdebfef88ff9a851634ae5f
 MISC metadata.xml 386 BLAKE2B d9e750b2ca0a3d46a031a5fab249197e73847ee5997a12c71f441eb5e386821818df07dadb272d5a726255a9310afecafa34b5f2196b49095a5ddd768054f5b4 SHA512 d98f79fd1e62456f1603ba412cdfb14e986c6d7831b6c88d9b561da24d36924aa3a979411f1d216cbbaf4740af2db733f61dd13f64ef94fe0e6d8e5e80545630
diff --git a/dev-python/python-lzo/files/python-lzo-1.12-fix-py3.10.patch b/dev-python/python-lzo/files/python-lzo-1.12-fix-py3.10.patch
deleted file mode 100644
index 17bad96d6278..000000000000
--- a/dev-python/python-lzo/files/python-lzo-1.12-fix-py3.10.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff --git a/lzomodule.c b/lzomodule.c
-index b5fa542..e9ca432 100644
---- a/lzomodule.c
-+++ b/lzomodule.c
-@@ -31,6 +31,8 @@
- 
- #define MODULE_VERSION  "1.12"
- 
-+#define PY_SSIZE_T_CLEAN
-+
- #include <Python.h>
- #include <lzo/lzo1x.h>
- 
-@@ -83,7 +85,7 @@ compress(PyObject *dummy, PyObject *args)
-     lzo_uint in_len;
-     lzo_uint out_len;
-     lzo_uint new_len;
--    int len;
-+    Py_ssize_t len;
-     int level = 1;
-     int header = 1;
-     int err;
-@@ -95,6 +97,16 @@ compress(PyObject *dummy, PyObject *args)
-     if (len < 0)
-         return NULL;
- 
-+    if (len > LZO_UINT_MAX) {
-+      PyErr_SetString(LzoError, "Input size is larger than LZO_UINT_MAX");
-+      return NULL;
-+    }
-+
-+    if ((len + len / 16 + 64 + 3) > LZO_UINT_MAX) {
-+      PyErr_SetString(LzoError, "Output size is larger than LZO_UINT_MAX");
-+      return NULL;
-+    }
-+
-     in_len = len;
-     out_len = in_len + in_len / 16 + 64 + 3;
- 
-@@ -189,7 +201,7 @@ decompress(PyObject *dummy, PyObject *args)
-     lzo_uint in_len;
-     lzo_uint out_len;
-     lzo_uint new_len;
--    int len;
-+    Py_ssize_t len;
-     int buflen = -1;
-     int header = 1;
-     int err;
-@@ -274,7 +286,7 @@ optimize(PyObject *dummy, PyObject *args)
-     lzo_uint in_len;
-     lzo_uint out_len;
-     lzo_uint new_len;
--    int len;
-+    Py_ssize_t len;
-     int err;
-     int header = 1;
-     int buflen = -1;
-@@ -356,7 +368,7 @@ static PyObject *
- adler32(PyObject *dummy, PyObject *args)
- {
-     char *buf;
--    int len;
-+    Py_ssize_t len;
-     unsigned long val = 1; /* == lzo_adler32(0, NULL, 0); */
- 
-     UNUSED(dummy);
-@@ -392,7 +404,7 @@ static PyObject *
- crc32(PyObject *dummy, PyObject *args)
- {
-     char *buf;
--    int len;
-+    Py_ssize_t len;
-     unsigned long val = 0; /* == lzo_crc32(0, NULL, 0); */
- 
-     UNUSED(dummy);
-diff --git a/tests/test.py b/tests/test.py
-index 9a96ce7..af761d9 100644
---- a/tests/test.py
-+++ b/tests/test.py
-@@ -96,11 +96,17 @@ def test_version():
- 
- def test_lzo():
-     yield gen, b"aaaaaaaaaaaaaaaaaaaaaaaa"
--    yield gen_raw, b"aaaaaaaaaaaaaaaaaaaaaaaa"
-     yield gen, b"abcabcabcabcabcabcabcabc"
--    yield gen_raw, b"abcabcabcabcabcabcabcabc"
-     yield gen, b"abcabcabcabcabcabcabcabc", 9
-+
-+
-+def test_lzo_raw():
-+    yield gen_raw, b"aaaaaaaaaaaaaaaaaaaaaaaa"
-+    yield gen_raw, b"abcabcabcabcabcabcabcabc"
-     yield gen_raw, b"abcabcabcabcabcabcabcabc", 9
-+
-+
-+def test_lzo_empty():
-     yield gen, b""
-     yield gen_raw, b""
- 
-@@ -113,41 +119,8 @@ def test_lzo_raw_big():
-     gen_raw(b" " * 131072)
- 
- 
--def main(args):
--    # display version information and module documentation
--    print("LZO version %s (0x%x), %s" % (lzo.LZO_VERSION_STRING, lzo.LZO_VERSION, lzo.LZO_VERSION_DATE))
--    print(lzo.__file__)
--    print()
--    print(lzo.__doc__)
--
--    # display additional module information
--    ## print dir(lzo)
--    ## print_modinfo()
--
--    # compress some simple strings
--    gen(b"aaaaaaaaaaaaaaaaaaaaaaaa")
--    gen_raw(b"aaaaaaaaaaaaaaaaaaaaaaaa")
--    gen(b"abcabcabcabcabcabcabcabc")
--    gen_raw(b"abcabcabcabcabcabcabcabc")
--    gen(b"abcabcabcabcabcabcabcabc", level=9)
--    gen_raw(b"abcabcabcabcabcabcabcabc", level=9)
--    gen(b" " * 131072)
--    gen_raw(b" " * 131072)
--    gen(b"")
--    gen_raw(b"")
--    print("Simple compression test passed.")
--
--    test_version()
--
--    # force an exception (because of invalid compressed data)
--    assert issubclass(lzo.error, Exception)
--    try:
--        x = lzo.decompress("xx")
--    except lzo.error:
--        pass
--    else:
--        print("Exception handling does NOT work !")
--    return 0
--
--if __name__ == '__main__':
--    sys.exit(main(sys.argv))
-+if sys.maxsize > 1<<32:
-+    # This test raises OverflowError on 32-bit Pythons. Compressing
-+    # this much data requires a 64-bit system.
-+    def test_lzo_compress_extremely_big():
-+        b = lzo.compress(bytes(bytearray((1024**3)*2)))
-diff --git a/tests/util.py b/tests/util.py
-index 0a2f4ed..c7bd5f0 100644
---- a/tests/util.py
-+++ b/tests/util.py
-@@ -45,7 +45,7 @@ def get_sys_path(p=None):
-     if p: p0 = p[0]
-     #
-     plat = get_platform()
--    plat_specifier = "%s-%s" % (plat, sys.version[:3])
-+    plat_specifier = "%s-%d.%d" % (plat, sys.version_info[0], sys.version_info[1])
-     ##print plat, plat_specifier
-     #
-     for prefix in (p0, os.curdir, os.pardir,):
diff --git a/dev-python/python-lzo/python-lzo-1.12-r2.ebuild b/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
index 505104db3542..73aa90f9490d 100644
--- a/dev-python/python-lzo/python-lzo-1.12-r2.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 prefix
@@ -14,19 +14,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/lzo:2"
 DEPEND="${RDEPEND}"
 
 # We can't use pytest at the moment because the package uses "yield tests"
 # https://docs.pytest.org/en/6.2.x/deprecations.html#yield-tests
-distutils_enable_tests --install nose
-
-PATCHES=(
-	# Upstream commits: 52440984, e63333e5, 15c40595 and 0a4272fc
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
+distutils_enable_tests nose
 
 python_prepare_all() {
 	hprefixify setup.py
diff --git a/dev-python/python-lzo/python-lzo-1.14.ebuild b/dev-python/python-lzo/python-lzo-1.14.ebuild
index 10b20a55d40a..85a9efaf3e9f 100644
--- a/dev-python/python-lzo/python-lzo-1.14.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/lzo:2"
 DEPEND="${RDEPEND}"