gentoo resync : 30.05.2020

3 files changed, 61 insertions, 2 deletions

diff --git a/dev-python/mini-amf/Manifest b/dev-python/mini-amf/Manifest
index 5d6055699356..537bcb594126 100644
--- a/dev-python/mini-amf/Manifest
+++ b/dev-python/mini-amf/Manifest
@@ -1,3 +1,4 @@
+AUX mini-amf-0.9.1-setuptools-46-fix.patch 1561 BLAKE2B f488372c6d1832c5cbc62db6ea8f683d3c179411ace324a0b7d9a7155085face28f8edfaf3f346ae8a411167131dbde83e178aaef1c4f24fbefcfbcfc70cbcef SHA512 a711cf6051abf57809334152e47bb0659ce30d985ae9613863e9d4f848c9bc0ff910535e52dbbcd81a0358dc6280c9a8ea4f8ef55f2c72e72f17e42b302e0ac9
 DIST mini-amf-0.9.1.tar.gz 117016 BLAKE2B 22133a2a6f44ea8d485874924e6175383dfc9301d9bba193e4d9d2fd901671c64be3665617c02223dbd2075141071deed142e804a77816ae11ac4d00e72a870c SHA512 8487baa551a68f7882aedaa8b809089bf2e767b0055f292dab4074d48ed442cabc250297ded91daa2f2a1dcb950ddab5ddff60466ec84ab739a240b8e2665be0
-EBUILD mini-amf-0.9.1.ebuild 770 BLAKE2B ed68e62a347740b21e8ee4add65e28db5bc77c10d54b99f2a1ef6b8ea49f5eee16f937e4d911347a2553f523ddd5b63debe4d8ea03603fa8d6f21d75298bd2f7 SHA512 b732af1cd7c74326c830c684d3a4726e4827a6a1d202f908ecd88d3316253e7a47b403ec910858682f4f3ba70f28aca4a54fdf78d95486a6da77d85dde312c80
+EBUILD mini-amf-0.9.1-r1.ebuild 876 BLAKE2B 776efba926447ff8c037984a5bcdd19dcae20923c2cb75721e5231791461097d1d9e448c54cede33b63ce635d1d1c5448aee438b3599fc1480d8bc4071185108 SHA512 df5ffbbe8784330ced2ee7557f364368f932c0fdea68864009e64ebfc649b44c2e7f6b760616a2d14dcd952781fb6ea683cfe7efc2be1bc22df87850ed2cd398
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
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 000000000000..932aa3fc8fab
--- /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
index 5bd4f884b383..9afb1ea87a7f 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,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
 
@@ -27,8 +27,12 @@ DEPEND="${RDEPEND}
 		dev-python/flake8[${PYTHON_USEDEP}]
 	)"
 
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
+
 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
 }