gentoo resync : 29.12.2022

4 files changed, 5 insertions, 145 deletions

diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index 0944a5c0fa87..6c1fb3b6aa5f 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,6 +1,3 @@
-AUX pysimdjson-4.0.0-unbundle.patch 2582 BLAKE2B 2005c989186247775a8929b81fe5cf4ac2d7d7e83b6b4b3116f00456ad03cc2e9d6e554e624a129ef6e62e1e3310cdc57b97dbd5452d984865401ae88b057b07 SHA512 49a47e18b7da306bc347675fa1b1a822e9365ef3a5b9d4f3eccdef5b32d6bab9f5d110b93dd90c65075e6b21027d07e93ac6469388d6609b750ca9d72121de19
-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
-EBUILD pysimdjson-4.0.2.ebuild 875 BLAKE2B c3885af46c512f68eae0b2605368a09272dc2b61fe416e841101e6363191e574715fcca104c34f6c13f42dce61ba2b9e9e0230300eced63e3937555e36e6fd30 SHA512 92d93fdc48c43748f4e8359beb026b33899aa7cc71bae32196309fe5291ccf1d221af862112b376215ac275631c092ed4708633be4c25e2c5db11215a82cc680
-EBUILD pysimdjson-4.0.3.ebuild 996 BLAKE2B 6129b38ac39b0040c6ef0cbacd36d28643287d0b1817fc4573f443473e115021f147c3499dfec63832d0e4cc2b27148c9e5cced5f297fa86b52ccfeda378d6c2 SHA512 9148a1b1fc0e5da24ea4a63fe7e1dee2fbdf1c7219141119865714b5427bd92a201d04ef13f8e7407caf4135de0bf628abd645640463bc83bd58eaf91602f127
+DIST pysimdjson-5.0.1.gh.tar.gz 3827732 BLAKE2B e42d3fd2ef857ab7c22a5afa6abc3313ff1ea0aabc8a6e8213df3eaef65eb3df501bbcdba2d0de501fdec310aba00c110a30814d548255401fa0b51ca7ee03d4 SHA512 4ace2feca976afdf113b92dd263918f88f7be32156ab6f3b6fe4b798d83bb7c66029bdd7e63fb1bb3bf6568e85b14ad227934114fa7e0da0961888cdfdca8943
+EBUILD pysimdjson-5.0.1.ebuild 1023 BLAKE2B 9650e4c0badaad29593dd959a6910e0d117468b664be910acca5f1346cbeb134c51eb1516280f2970d4292b57ee0fad9abff1d13d0ff86ef4e6d077f708d0d9a SHA512 512fb2427e871a8e6ed1d62dc8330d31355248b6a084b375415690f6b9b32688b1cd729a3c6a7ed06a924b85d36137a06b015a01f1e4517410d79b297968878e
 MISC metadata.xml 424 BLAKE2B 2ce7103dd2d65113aaac5d7acbb50e6fd92726f640c3917339bb1bcdf6124b6c3f1d926c73ce0beba130aa20ede87252a2fe9e0fe4d89bb7c4c9501b4931afd8 SHA512 ba65f9b7d1340d102a782321859be6b03aebd755eb4c8bb604a0e71ad25056f2029a77c92fcf623130f8accd6137f1722e99db3d0b91d9d00d2331cdea5a9bc7
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-5.0.1.ebuild
index 303773b7087e..16140f582754 100644
--- a/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild
+++ b/dev-python/pysimdjson/pysimdjson-5.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	dev-libs/simdjson:=
+	>=dev-libs/simdjson-2.0.1:=
 "
 RDEPEND="
 	${DEPEND}
@@ -36,7 +36,7 @@ distutils_enable_tests pytest
 
 src_prepare() {
 	# benchmarks aren't run
-	sed -i -e 's:pytest-benchmark::' setup.cfg || die
+	sed -i -e 's:pytest-benchmark:: ; /license_file/ d' setup.cfg || die
 	# force regen
 	rm simdjson/csimdjson.cpp || die
 	# unbundle