dev-python/pysimdjson: Revbump, simdjson dep <1.1 (bug #846905)

Closes: https://bugs.gentoo.org/846905
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

4 files changed, 1 insertions, 139 deletions

diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index 1009245d53eb..b08669c08034 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,2 +1 @@
-DIST pysimdjson-4.0.2.tar.gz 3740054 BLAKE2B 379c8637096074615f2045171e0950af0190e8485db6a1734f4fcd19d9eeeebd91cb79c18abd2fe6256287f15aa6a3c12c1283e4affa131db14f9948ab2f0d63 SHA512 537b7958dd3429831ee201b6a4fc5fa8fca50ad14def016b472d3f234f81175441152c1823eed0bcad06f59e274e2b6b036f26a3af8f6977ceea5807471de4a5
 DIST pysimdjson-4.0.3.gh.tar.gz 3783913 BLAKE2B 74c186e87540c4806ec311e7a6ca05bf28b2a2060ba078919c68d92812a1bc34efd9f0deb30b85dba134af9ce99dbfa2b8fa33c1b14926915e284f262a7ac4f1 SHA512 eb2cd8b96eed8985674fbcfeafc21b58c9985c46c7f46b72ee78fbf91ef659acd5139fa56c251bae22418007b3da6ff7e5cdd2d28b2ba22cf19771f2f74880e3
diff --git a/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch b/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch
deleted file mode 100644
index de52bc063a24..000000000000
--- a/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/setup.py b/setup.py
-index f1de675..4c23028 100644
---- a/setup.py
-+++ b/setup.py
-@@ -27,53 +27,59 @@ if system == 'Darwin':
-     os.environ.setdefault('MACOSX_DEPLOYMENT_TARGET', '10.14')
-     extra_compile_args.append('-std=c++11')
- 
--if os.getenv('BUILD_WITH_CYTHON') and not CYTHON_AVAILABLE:
-+build_with_cython = os.getenv('BUILD_WITH_CYTHON')
-+if build_with_cython and not CYTHON_AVAILABLE:
-     print(
-         'BUILD_WITH_CYTHON environment variable is set, but cython'
-         ' is not available. Falling back to pre-cythonized version if'
-         ' available.'
-     )
-+    build_with_cython = False
- 
--if os.getenv('BUILD_WITH_CYTHON') and CYTHON_AVAILABLE:
--    macros = []
--    compiler_directives = {
--        'embedsignature': True
--    }
-+build_with_system_lib = os.getenv('BUILD_WITH_SYSTEM_LIB')
-+
-+macros = []
-+compiler_directives = {}
-+libraries = []
-+sources = [
-+    'simdjson/errors.cpp',
-+]
-+
-+if build_with_system_lib:
-+    libraries.append('simdjson')
-+else:
-+    sources.append('simdjson/simdjson.cpp')
-+
-+if build_with_cython:
-+    compiler_directives['embedsignature'] = True
- 
-     if os.getenv('BUILD_FOR_DEBUG'):
-         # Enable line tracing, which also enables support for coverage
-         # reporting.
--        macros = [
-+        macros += [
-             ('CYTHON_TRACE', 1),
-             ('CYTHON_TRACE_NOGIL', 1)
-         ]
-         compiler_directives['linetrace'] = True
- 
--    extensions = cythonize([
--        Extension(
--            'csimdjson',
--            [
--                'simdjson/simdjson.cpp',
--                'simdjson/errors.cpp',
--                'simdjson/csimdjson.pyx'
--            ],
--            define_macros=macros,
--            extra_compile_args=extra_compile_args
--        )
--    ], compiler_directives=compiler_directives)
-+    sources.append('simdjson/csimdjson.pyx')
- else:
--    extensions = [
--        Extension(
--            'csimdjson',
--            [
--                'simdjson/simdjson.cpp',
--                'simdjson/errors.cpp',
--                'simdjson/csimdjson.cpp'
--            ],
--            extra_compile_args=extra_compile_args,
--            language='c++'
--        )
--    ]
-+    sources.append('simdjson/csimdjson.cpp')
-+
-+
-+extensions = [
-+    Extension(
-+        'csimdjson',
-+        sources,
-+        define_macros=macros,
-+        extra_compile_args=extra_compile_args,
-+        libraries=libraries,
-+        language='c++',
-+    )
-+]
-+
-+if build_with_cython:
-+    extensions = cythonize(extensions, compiler_directives=compiler_directives)
- 
- setup(
-     name='pysimdjson',
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
deleted file mode 100644
index aea670752664..000000000000
--- a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for simdjson"
-HOMEPAGE="https://github.com/TkTech/pysimdjson"
-SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-libs/simdjson:=
-"
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/pysimdjson-4.0.0-unbundle.patch
-)
-
-src_prepare() {
-	# benchmarks aren't run
-	sed -i -e 's:pytest-benchmark::' setup.cfg || die
-	# force regen
-	rm simdjson/csimdjson.cpp || die
-	# bundled lib :-(
-	rm simdjson/simdjson.{cpp,h} || die
-
-	distutils-r1_src_prepare
-
-	export BUILD_WITH_CYTHON=1
-	export BUILD_WITH_SYSTEM_LIB=1
-}
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.3-r1.ebuild
index 303773b7087e..0668ba9725c8 100644
--- a/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild
+++ b/dev-python/pysimdjson/pysimdjson-4.0.3-r1.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	dev-libs/simdjson:=
+	<dev-libs/simdjson-1.1:=
 "
 RDEPEND="
 	${DEPEND}