gentoo auto-resync : 31:08:2023 - 10:10:44

3 files changed, 38 insertions, 2 deletions

diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index f3276b4c4dd7..41d40f8c3243 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,8 +1,9 @@
 AUX rizin-0.4.0-never-rebuild-parser.patch 1568 BLAKE2B c77276adb8349188ebc937d84b011650b978ba5bed6c0596258963d395014c5e0733e44930b4c2db6dd88941d99b2aa37acf461d035fc31dcd321571ef0d6392 SHA512 a46311772dc42b90b8e3e49ddb66f6d64873773e254ac943934de0129d5f4a77ccb759d20b519b58418d45c076f136d582f2e70056693c75b2f6aae19eb07551
+AUX rizin-0.5.2-find-tree-sitter-parser.patch 1128 BLAKE2B c3a72fda5005d50f47b2a1c5350b017f8e6fd4d4d232c8502adcceef6542d509c70f68ef396ffff159c4f37a8575931e4a440c689c403a653ac9145489fa4405 SHA512 2977c1004b76740a2e35156a2f92e415530a401eeaddbf59f4efc8ee36bc0fdec7f0402b4aa1732fc0827a4a5c505cc2851db65fb7a25d254ddb631c6c8542c9
 DIST rizin-src-v0.5.1.tar.xz 11770688 BLAKE2B 31369497d5aa425aa6030ce404baa5d4a10ef2453a93f9b2c9f7d47135b5ffbc61618ef7e743acef3939bca2838a94637b7a1794ff44998608aee3f988301483 SHA512 c856112651bec91bb6e9f5580f60e3168f02a9f194bf567186a66398c162f59953ca8c3bf43441315356ca6ef077b7c56e4150e2dd8a79d4d08c5f789c549596
 DIST rizin-src-v0.5.2.tar.xz 11779644 BLAKE2B d74c02c1f58d099a0047a7a528b7e182980901bc1bf2722aef259e03ddf9af908c3ebcde4f1268fcbd07125a21f064259601a54c6b8413e19f6b85c95113cf3d SHA512 2fbd3873c7725d4fa1dee53d685c4a5d372013f300cd19dd92752b82987f049a4eba77b4d4ae33b576678714752147355ac486951949a35275cc3fdc5447a351
 DIST rizin-testbins-0264ae4ee5bd606ec6c6a539255eeb57ce2c82c2.tar.gz 179281553 BLAKE2B b86278589da2f8e5859b0f4b16e2667a6e7477c9a889158da5a2c1a1b6e29af4798d56a22dd4c3e23aec1908e7b444ca999502e73f8d8ccf4e0bf2a969380564 SHA512 ae11b6da5cb995f8f1cc996a7b772234b3e7e7c2b0695d0b223657ba839c82dbbcb390600aeb0d16c7c61a5037ba9d0739df79efd730c1b96392cfc1e6f6613d
 DIST rizin-testbins-d66f95359fe830514267f446975374752201c3f1.tar.gz 179428523 BLAKE2B 9d18c2f49460e26809bc526eab9d7bfed15d3fb3f94b22d327f9981547130f82107259f2942e098834cd8ad755e8eadb4b8459a10070105ec116b16fbac19fe3 SHA512 cdeefc6e4103e99c4581a45475c2326505f8003c80a158a78be32b27dfa65fe42a80bbf25ffc47c1f8abdd50faba0fb073a7236395ab67eafb0202695877c4ba
 EBUILD rizin-0.5.1.ebuild 2256 BLAKE2B 4a21a2ce71e77de80320b9175306d23e432223626f8ac8a47aa059fa64bbe59b430a2bb7d9c3c706e018f141080cf4d98feeb36f64b20259bf04005f7ec49f62 SHA512 e3d9e81d3154f13d5c5b605d874d36f55190b694f77d546179672a24ff1bd83f7d89ce92c0cc196f4ca54912ff2e5853697fe1e1a30aa217637b37930c430b3f
-EBUILD rizin-0.5.2.ebuild 2383 BLAKE2B 634db2397af2777b462d16157007461bfc652082293d4e4408f63cb55370603ab48e0554f448bc94baebe29c51208c0d2bab9a8efd39c1148c718d9e7f3e8189 SHA512 230e0f7939af7d2c09a47b5bb7e61ae4d3394c446086d128663503110169e08370e5c2e4b037c0485e92a109fb57da161c02c0897b0430502c3dda101b568f4f
+EBUILD rizin-0.5.2.ebuild 2474 BLAKE2B c832721ecd6497f471657bbf8b181de1d651ef7c0ae491ac02de0c74460b9f6eba374f990825bce92008f4e23aa76b4224933c8a59daefd8b2845ec4c96025a9 SHA512 28acf70e6d56f5dd5e52d492789371d57daee3ac79d0eef5cb045f8ac3634c61bbae22a801ff8f83f514c2881d2405887815fde35a08e5f4447dc3742f4ba7ed
 MISC metadata.xml 427 BLAKE2B 2937970e78526f69e371b4451a3406b1fdc35a01707d366e8b54e23f9d13e8a713254902825ae111817ee00ea3aaf3bc968db8b6d944b15f869e2b89ba8e16b8 SHA512 65cc9c4cd5f2f64cd02e89b0f7f4972fefec51cb175650625da263b729022587c9487e9ab9faed8517200ed622a8ca5ec35b2b6f4c67966d78344c043197c981
diff --git a/dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch b/dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch
new file mode 100644
index 000000000000..27811e9930ee
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/913343
+
+>=tree-sitter-0.20.8-r1 doesn't install parser.h anymore because it may be
+mismatched with the version used to build the parser. Use one bundled with
+rizin-shell-parser instead.
+
+This should propagate into rizin-shell-parser when they regenerate
+with a newer tree-sitter release (once one is made).
+
+See also:
+* https://bugs.gentoo.org/912716
+* https://bugs.gentoo.org/913343
+* https://github.com/tree-sitter/tree-sitter/pull/2573
+* https://github.com/tree-sitter/tree-sitter/pull/2574
+--- a/subprojects/rizin-shell-parser/src/parser.c
++++ b/subprojects/rizin-shell-parser/src/parser.c
+@@ -1,4 +1,4 @@
+-#include <tree_sitter/parser.h>
++#include "tree_sitter/parser.h"
+ 
+ #if defined(__GNUC__) || defined(__clang__)
+ #pragma GCC diagnostic push
+--- a/subprojects/rizin-shell-parser/src/scanner.c
++++ b/subprojects/rizin-shell-parser/src/scanner.c
+@@ -1,7 +1,7 @@
+ // SPDX-FileCopyrightText: 2020 ret2libc <sirmy15@gmail.com>
+ // SPDX-License-Identifier: LGPL-3.0-only
+ 
+-#include <tree_sitter/parser.h>
++#include "tree_sitter/parser.h"
+ #include <ctype.h>
+ #include <wctype.h>
+ #include <stdio.h>
diff --git a/dev-util/rizin/rizin-0.5.2.ebuild b/dev-util/rizin/rizin-0.5.2.ebuild
index 9d91882992da..70326a2a22c7 100644
--- a/dev-util/rizin/rizin-0.5.2.ebuild
+++ b/dev-util/rizin/rizin-0.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 # This is the commit that the CI for the release commit used
 BINS_COMMIT="d66f95359fe830514267f446975374752201c3f1"
@@ -24,6 +24,7 @@ IUSE="test"
 # Need to audit licenses of the binaries used for testing
 RESTRICT="test? ( fetch ) !test? ( test )"
 
+# TODO: unbundle dev-libs/blake3
 RDEPEND="
 	app-arch/lz4:0=
 	app-arch/xz-utils
@@ -41,6 +42,7 @@ BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
+	"${FILESDIR}/${PN}-0.5.2-find-tree-sitter-parser.patch"
 )
 
 S="${WORKDIR}/${PN}-v${PV}"