gentoo auto-resync : 28:07:2023 - 16:37:22

3 files changed, 47 insertions, 2 deletions

diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index a8413a000c5e..3cf7d86e24b3 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,4 +1,5 @@
 AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea733d07d879e6f58dd62003f30812cb4320e41484797cae4f113d271dc8c8625fe847270cae7e35085c2ae67a357 SHA512 f66c13ddee81acc63cb65c09f2836c9a2409f24bebc5b7e3b5fea3f7e626aa52e5d19798ef5ab281d0dd31c3efbc4378003bd93461cfda36fcc726fc871aadf4
+AUX llfuse-1.4.4-cython3.patch 1651 BLAKE2B 37fe3686b3ececaf34659614a99e3f9099d15512234dceedde319722301f4a7d2dc92c7c0ee9c93b2e766703aefa1ff64b5008f413a63ca616a85fa8a4666d88 SHA512 9477a9788a644d230b46082f35ff1e8e8ff1346f2852c976d3d7c30d00a90ce720876f79775a73f850f443313e63402bbeddb5311cd2cb28195b3c8843899826
 DIST llfuse-1.4.4.tar.gz 293728 BLAKE2B aba684a0b7b06a0cdb97fb8851639ee0c6b5dc100e3d216430e26f122a78ac7933b7d5725f271328804a592b343988d6ceb79bd8c682620464dcef1d26cc20b0 SHA512 3e61f1f82194dc915947e4f0c2edf44ce0e87c4da142e39c2b19bb7db3f387a348f9c1bb02b6d0f2507b57cbfc20ad83c11ce513c685dc276d6a382e4dd449eb
-EBUILD llfuse-1.4.4.ebuild 1024 BLAKE2B cd6558f91785b9cfb9cb42e2fcd01609b80f5c1d76d395d623df6efa731d3a66d24e26f583c1f1b7a2f8090c9a53dcd5ca5ab385401e0930d5b2d211bc2dc859 SHA512 d8d620b8f0482b9863a20744a4494f1d4002f2689f01f24ed3733cc54ccfcb4782f2761b8655a2ad95dbe146ff51231a6b7bc7544a7baf26f13a49693df6ea4c
+EBUILD llfuse-1.4.4.ebuild 1094 BLAKE2B d720dcbb931eec6a4bbd49109b5e15aef014ceb4aacd69a2e8d1d1a264a1b8553eba957d4811da673d1ea1189e606a89b1a3838760e7339685a19b1ab56b5efd SHA512 a9f52df6fc687a6576a478e6d716e3963e8cecbbcca8bba1e88ce6ccca960f4be73091de616c08e6afcee6a62d9c2b37f34408392d15d5dbc841bcf1e7c6708f
 MISC metadata.xml 377 BLAKE2B 8e7aa00ada5481ed2fc9fedf47334ec81ca26e7788ee5f7c6965151cf6f42e305c33d2b1f1a697094d11668ea5939de99e9ae00de7fbe95b75bbc9577adcff9b SHA512 70eaac052525ddf94287b100e7dc6d4429499d49b6aac109659757cf6ca41f6aac220a1b931e4fb196e322b259e9884b1ecf49947b48b1f76c8350434f811aa7
diff --git a/dev-python/llfuse/files/llfuse-1.4.4-cython3.patch b/dev-python/llfuse/files/llfuse-1.4.4-cython3.patch
new file mode 100644
index 000000000000..38fea36a5fac
--- /dev/null
+++ b/dev-python/llfuse/files/llfuse-1.4.4-cython3.patch
@@ -0,0 +1,42 @@
+https://github.com/python-llfuse/python-llfuse/commit/8c0160545ce01b3624c8ecad669f06fb6d22d2f6
+
+From 8c0160545ce01b3624c8ecad669f06fb6d22d2f6 Mon Sep 17 00:00:00 2001
+From: Thomas Waldmann <tw@waldmann-edv.de>
+Date: Sun, 21 May 2023 01:31:38 +0200
+Subject: [PATCH] remove Cython version check, fixes #81
+
+distutils Version classes are deprecated.
+
+I decided to remove the Cython version check completely,
+it is not as simple as checking a minimum version anyway.
+
+E.g. we can work with Cython 0.29.x and also 3.0.0b2,
+but earlier 3.0.0 releases are of unknown compatibility.
+
+Also, latest Python 3.12-dev versions require 0.29.34,
+while older Pythons are happy with stuff compiled by earlier
+0.29.x releases.
+--- a/setup.py
++++ b/setup.py
+@@ -34,7 +34,6 @@
+ 
+ import setuptools
+ from setuptools import Extension
+-from distutils.version import LooseVersion
+ 
+ basedir = os.path.abspath(os.path.dirname(__file__))
+ sys.path.insert(0, os.path.join(basedir, 'util'))
+@@ -218,11 +217,7 @@ def run(self):
+                                               stderr=subprocess.STDOUT)
+         except OSError:
+             raise SystemExit('Cython needs to be installed for this command')
+-
+-        hit = re.match('^Cython version (.+)$', version)
+-        if not hit or LooseVersion(hit.group(1)) < "0.29":
+-            # in fact, we need a very recent Cython version to support the latest pythons
+-            raise SystemExit('Need Cython 0.29 or newer, found ' + version)
++        print(f"Using {version.strip()}.")
+ 
+         cmd = ['cython', '-Wextra', '--force', '-3', '--fast-fail',
+                '--directive', 'embedsignature=True', '--include-dir',
+
diff --git a/dev-python/llfuse/llfuse-1.4.4.ebuild b/dev-python/llfuse/llfuse-1.4.4.ebuild
index 6bcd11762ba5..f6edb91dd6d3 100644
--- a/dev-python/llfuse/llfuse-1.4.4.ebuild
+++ b/dev-python/llfuse/llfuse-1.4.4.ebuild
@@ -27,13 +27,15 @@ DEPEND="
 	${RDEPEND}
 	sys-apps/attr
 "
+# <cython-3: bug #911373
 BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
+	<dev-python/cython-3[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 "
 
 PATCHES=(
 	"${FILESDIR}"/llfuse-1.3.5-cflags.patch
+	"${FILESDIR}"/llfuse-1.4.4-cython3.patch
 )
 
 distutils_enable_sphinx rst