[gentoo-commits] repo/gentoo:master commit in: dev-python/mini-amf/, dev-python/mini-amf/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/mini-amf/, dev-python/mini-amf/files/

[Joonas Niilola]

commit:     8fbe303be888d0b46c8c520143ce42ccc998b77d
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 06:17:32 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat May 16 06:21:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fbe303b

dev-python/mini-amf: add a patch to compile with setuptools-46

Closes: https://bugs.gentoo.org/723282
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/mini-amf-0.9.1-setuptools-46-fix.patch   | 54 ++++++++++++++++++++++
 ...i-amf-0.9.1.ebuild => mini-amf-0.9.1-r1.ebuild} |  3 +-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/dev-python/mini-amf/files/mini-amf-0.9.1-setuptools-46-fix.patch b/dev-python/mini-amf/files/mini-amf-0.9.1-setuptools-46-fix.patch
new file mode 100644
index 00000000000..932aa3fc8fa
--- /dev/null
+++ b/dev-python/mini-amf/files/mini-amf-0.9.1-setuptools-46-fix.patch
@@ -0,0 +1,54 @@
+--- a/setup.py.orig	2020-03-18 11:44:06.137323823 +0200
++++ b/setup.py	2020-03-18 11:43:55.230585230 +0200
+@@ -4,7 +4,7 @@
+ # See LICENSE.txt for details.
+ 
+ import os.path
+-from setuptools import Feature, setup
++from setuptools import setup
+ import sys
+ 
+ try:
+@@ -42,34 +42,6 @@
+ """
+ 
+ 
+-class AccelFeature(Feature):
+-    def __init__(self, have_cython):
+-        self.have_cython = have_cython
+-        self.extensions = []
+-
+-        Feature.__init__(
+-            self,
+-            description="optional C accelerator modules (broken)",
+-            standard=False,
+-            available=have_cython,
+-            ext_modules=self.extensions
+-        )
+-
+-    def include_in(self, dist):
+-        if not self.have_cython:
+-            sys.stderr.write(
+-                "ERROR: Cython is required to compile accelerator modules.\n")
+-            sys.exit(1)
+-
+-        sys.stderr.write(
+-            "WARNING: Accelerator modules are broken.\n"
+-            "WARNING: You should only use --with-accel "
+-            "if you are trying to fix them.\n")
+-
+-        self.extensions.extend(cythonize("miniamf/_accel/*.pyx"))
+-        Feature.include_in(self, dist)
+-
+-
+ def get_version():
+     """
+     Retrieve the version number from miniamf/_version.py.  It is
+@@ -147,7 +119,6 @@
+             "miniamf", "miniamf._accel", "miniamf.adapters", "miniamf.util"
+         ],
+         install_requires=["six", "defusedxml"],
+-        features={"accel": AccelFeature(have_cython)},
+         test_suite="tests",
+         zip_safe=True,
+         extras_require={

diff --git a/dev-python/mini-amf/mini-amf-0.9.1.ebuild b/dev-python/mini-amf/mini-amf-0.9.1-r1.ebuild
similarity index 91%
rename from dev-python/mini-amf/mini-amf-0.9.1.ebuild
rename to dev-python/mini-amf/mini-amf-0.9.1-r1.ebuild
index 5bd4f884b38..d611dce7a59 100644
--- a/dev-python/mini-amf/mini-amf-0.9.1.ebuild
+++ b/dev-python/mini-amf/mini-amf-0.9.1-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -29,6 +28,8 @@ DEPEND="${RDEPEND}
 
 distutils_enable_sphinx doc
 
+PATCHES=( "${FILESDIR}"/mini-amf-0.9.1-setuptools-46-fix.patch )
+
 python_test() {
 	coverage run --source=miniamf setup.py test || die
 }