gentoo resync (3) : 24.07.2021

4 files changed, 2 insertions, 101 deletions

diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index e6466507392d..d5e809a9a7dc 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,7 +1,4 @@
-AUX pysimdjson-4.0.0-error-types.patch 1867 BLAKE2B 3c3383d29890363a3d16547bac57884b12ecae899b587ffaa78599f144a32f2cbc5978ee0b831e64933bca0a4caf2d670c03ca4827212c5ff5eb2d439ced79f6 SHA512 2b92745019144113f85171c8964056c0d56cd59f82da4af962cf3891b6056caa7be9601487414523854f03cc5e60c7b977a99ae23bdc83cd69e5fb1dcb53ee4d
 AUX pysimdjson-4.0.0-unbundle.patch 2582 BLAKE2B 2005c989186247775a8929b81fe5cf4ac2d7d7e83b6b4b3116f00456ad03cc2e9d6e554e624a129ef6e62e1e3310cdc57b97dbd5452d984865401ae88b057b07 SHA512 49a47e18b7da306bc347675fa1b1a822e9365ef3a5b9d4f3eccdef5b32d6bab9f5d110b93dd90c65075e6b21027d07e93ac6469388d6609b750ca9d72121de19
-DIST pysimdjson-4.0.0.tar.gz 3738787 BLAKE2B 744d6bc53511e03e8e716d6c65771432c7bf8f7876bbf8c78d09459a8b170d3d396f9cc8996894f67110f4b7389526d454dffd687b1fda22df7f76f027af44db SHA512 8b3040ce44bb5042b70a14d9f67c312a375d1a12ba7a66466935a48ad0f8def9c21e200c8c93aa755110a674e95920fa7d0567c4f584be5392b70719994a2213
 DIST pysimdjson-4.0.2.tar.gz 3740054 BLAKE2B 379c8637096074615f2045171e0950af0190e8485db6a1734f4fcd19d9eeeebd91cb79c18abd2fe6256287f15aa6a3c12c1283e4affa131db14f9948ab2f0d63 SHA512 537b7958dd3429831ee201b6a4fc5fa8fca50ad14def016b472d3f234f81175441152c1823eed0bcad06f59e274e2b6b036f26a3af8f6977ceea5807471de4a5
-EBUILD pysimdjson-4.0.0-r1.ebuild 925 BLAKE2B 9aef9bac15f86da401c3f2bbb2f53b7aa298bd8029ce8c91f5ceca7a5833b7ae0b9f3aca640cafefa746c408238fc53171742700fb668a3cff8648ed324e04ea SHA512 b22a40c50398deba7963732ea3360e967ff3bafd61b241cc12e1336f2c96da2fc91050f233689909c269247918213df2e0be932663a7f1e0f4d8dccc97da7ce4
-EBUILD pysimdjson-4.0.2.ebuild 876 BLAKE2B 3550d2f007405e291529f831ee7302cde9d81256ab19b6f9df45edb6f98547246888a3c899abea294e6332dd7d1df3bee8045d5793e746a0d229d8df593f6665 SHA512 f0b347a610eac7b6e21c1fd8b33798441694d69169df39c206d410c387c985b47d87552ca3dbd15c79baa2476aae34f2bc7194f5f53e46a77370557af913d152
+EBUILD pysimdjson-4.0.2.ebuild 875 BLAKE2B c3885af46c512f68eae0b2605368a09272dc2b61fe416e841101e6363191e574715fcca104c34f6c13f42dce61ba2b9e9e0230300eced63e3937555e36e6fd30 SHA512 92d93fdc48c43748f4e8359beb026b33899aa7cc71bae32196309fe5291ccf1d221af862112b376215ac275631c092ed4708633be4c25e2c5db11215a82cc680
 MISC metadata.xml 423 BLAKE2B 06f368507ce8309c6d7b2e2695fdfea636bb503444683450c76f8bc6f8ad7da8b7a0fdcf8ca478445dba7148bc2faad9a5c9f66026777be2c408c3765bf22267 SHA512 b24e60e618e2b4c74ec4a755e99faa0966156ceb188ae5c97feedbfc1d7c19fda73913632b977fe9a5f2ee4261c55b1c0df3488fe7303fe3b9e581cf57979f2b
diff --git a/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch b/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch
deleted file mode 100644
index 34b8f4aa9e29..000000000000
--- a/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 1145be6cac70ed065f2053977d470f3f771ac6a0
-Author: Tyler Kennedy <tk@tkte.ch>
-Date:   Sun May 23 15:55:28 2021 -0400
-
-    Empty buffers now raise identical error to empty bytes. Closes #81.
-
-diff --git a/simdjson/csimdjson.pyx b/simdjson/csimdjson.pyx
-index 095a183..c278e08 100644
---- a/simdjson/csimdjson.pyx
-+++ b/simdjson/csimdjson.pyx
-@@ -478,6 +478,13 @@ cdef class Parser:
-             # type-specific APIs, but gives much greater compatibility.
-             data = src
- 
-+            if data.size == 0:
-+                # If we were given a completely empty buffer, trying to access
-+                # a stride in the next step will cause a (potentially
-+                # confusing) IndexError. This isn't a very good error message,
-+                # but it's identical to the one simdjson would have raised.
-+                raise ValueError('Empty: no JSON found')
-+
-             return element_to_primitive(
-                 self,
-                 dereference(self.c_parser).parse(
-diff --git a/tests/test_parser.py b/tests/test_parser.py
-index 88e7207..d3a28c7 100644
---- a/tests/test_parser.py
-+++ b/tests/test_parser.py
-@@ -1,3 +1,4 @@
-+import io
- import pathlib
- 
- import pytest
-@@ -32,6 +33,19 @@ def test_parse_str(parser):
-     assert doc.as_dict() == {'hello': 'world'}
- 
- 
-+def test_parse_empty_buffer(parser):
-+    """Ensure trying to parse an empty buffer returns an error consistent
-+    with attempting to parse an empty bytestring."""
-+    # Issue #81
-+    with pytest.raises(ValueError) as bytes_exc:
-+        parser.parse(b'')
-+
-+    with pytest.raises(ValueError) as buffer_exc:
-+        parser.parse(io.BytesIO(b'').getbuffer())
-+
-+    assert str(bytes_exc.value) == str(buffer_exc.value)
-+
-+
- def test_unicode_decode_error(parser):
-     """Ensure the parser raises encoding issues."""
-     with pytest.raises(UnicodeDecodeError):
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
deleted file mode 100644
index e2b6c28fb206..000000000000
--- a/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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
-	"${FILESDIR}"/pysimdjson-4.0.0-error-types.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.2.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
index 936ee8de2d36..aea670752664 100644
--- a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
+++ b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/simdjson:=