gentoo resync : 07.01.2022

3 files changed, 40 insertions, 2 deletions

diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 33a0570a4e1a..32ae4498cb4c 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,8 +1,9 @@
 AUX rizin-0.3.0-typedb-prefix.patch 5175 BLAKE2B 08fea1ba6297f17d42f518c1739875c0964f6f00c1bcd01cba51a56e6626fe50c6ad2c36bece4db326f7b128d6ea5786970eb454832e32f9d837458f92f2a596 SHA512 241a72a7f1c3ec8ba831ca696faf0cfc09a58207c6d3db7005b09b9016a71ed9238bcb9441a389116083557538a0ff1a6adf55e78e1aa35d67aa206f30774391
 AUX rizin-0.3.1-CVE-2021-43814.patch 3292 BLAKE2B 4d9e9f43296dc906839fee4b97794141157dea5e3af7b0f96f5c35369b44f2d04a1f4363366d0e495112d29b658927953b3c19a1375c7ad2377bb3504be3e9ef SHA512 0bcfe32bab666d99fa68e825f4d7406024d2d1f76abc7b3fdbd7803be3f3c27205bbe7d91a671e2679094bedc944a59980a798e07adf20e6bf6d2c46e884b297
+AUX rizin-0.3.2-never-rebuild-parser.patch 1493 BLAKE2B fd5a4d306336ccba939e9d96e97d4b653b83407352f9babf9c39bbad28a18b4fc1a3e2f1eb57b25b7f8dad35b3400271cf6a6bf1cec55c74dc00f424da715c91 SHA512 7a105831cbdb99633c43411b7a407ff6970cb8e89cae561886ade96c75579c0484271641e957762189fc68762952a26ca0a2536bd1342802c408041066852b16
 DIST rizin-src-v0.3.1.tar.xz 64089580 BLAKE2B 04f7e3cfa20a787f47af90c78405f295b346cc0c7d81164ff01bc6a69df526f3f9112ab4cb62092297ae2dda1fa738a2e7feff35e0f1b7f3e7467a8c6e4d1a1e SHA512 743f8f2c9ddb045f39147de9ad971d47f1a26bfcc233f41c12c64ade5e31c992104cf3f93c44c5035142b554779e895224b68f839cd87a59aaf344b4ec88d5fe
 DIST rizin-src-v0.3.2.tar.xz 64170200 BLAKE2B fe11317e4acc1a803323f42fd4c2c6435a2fe4032581ed509f37f7221ec53e0afac04ebe8cb9da693ac283b61c0a70e135007d635c4c5010519a5c7e7cfa19cf SHA512 c472770ee1b156d42a98d4641f365e2255f16489b2223b117c8b88dcac0d72065d1fd7eedad70046188231889e492bafb7b8462987c68311143f14808eaab1cc
 DIST rizin-testbins-d66fa0feaf3b1ecdad261ca17542f1d5d0b101cc.tar.gz 126773703 BLAKE2B f5eaeb7e99e9091b6ca043dd50d03143950adc06b75b5834886d96d6280207c0bea73101a5f9e06c38ba60c0d4cff82dbf1f00364f7d87fe183c0687b06d1904 SHA512 0a017954017c8d57133d51b441411a50aa9ed062c0cc61e1561951fdf0703f5244230cda377885199e9e35dca6780d8582a445ac92286b63ef2ac784777ec0c4
 EBUILD rizin-0.3.1-r2.ebuild 2910 BLAKE2B 3b1817a02c425f703168c5b5c78c7df0106f64df1d2420f59f2d4b66581b1439d18f9e22cb9db3ef08b4580f6e37ace6797113a0a461e5ef7c657b527193c5bb SHA512 4540a23f9a6ca9586a45fb8fbac22762886e54bba5d3863d098bf40a291c09fb5a49f24107352f7a9230749de0aafaec002c91ff3ba6d8b2cd38c281cbcd9b85
-EBUILD rizin-0.3.2.ebuild 2891 BLAKE2B 0ba40b7d0c85e43f0f89cfa84fa4a854f280016ce5420607c21bbb65edc911888732116757a85975e4007d7ba4a57abb21e724af5c1d8c5d51b197b934182d5b SHA512 9145be05965cb1b8daa6d31b11349bd2ffef97e40745ad01dd154e9b46e40fc273cfbc23bcd9d8df702af6b671ad2062f8ea54d0c66e9ead78a156e5aced5d52
+EBUILD rizin-0.3.2.ebuild 2945 BLAKE2B a8887f8f05d71b972076e46f8a41d7d7b2122e699d26dfaeaff720722ae80afcd8d4eb8c6b2b3a2b60232bfc17960f52028f91bf088b6fd3233feaadb8ebfe95 SHA512 a80e5d328a25a464f1ad6c96be3930422c663ab164d00bbb489305932b35619e1d35f6dc6bd8aa32ea2fcf8b7e9b875a3535b51023181cc09a81a744c402dcdd
 MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch b/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
new file mode 100644
index 000000000000..0f5586c0023d
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
@@ -0,0 +1,36 @@
+commit 9bcfa2a6d3eaa5df00ae728c44811faf08effbd3
+Author: John Helmert III <ajak@gentoo.org>
+Date:   Thu Jan 6 11:12:58 2022 -0600
+
+    shlr/rizin-shell-parser/src: Never rebuild parser.c
+    
+    This requires dev-libs/tree-sitter[ts-cli] and net-libs/nodejs, both
+    of which would be heavy new dependencies. However, these are only
+    needed to rebuild the already-existing tree-sitter parser, which
+    doesn't do much for us (if anything) since it already exists. In this
+    case, it's better to just reduce fragility by unconditionally
+    disabling this.
+    
+    Bug: https://bugs.gentoo.org/830068
+    Signed-off-by: John Helmert III <ajak@gentoo.org>
+
+diff --git a/shlr/rizin-shell-parser/src/meson.build b/shlr/rizin-shell-parser/src/meson.build
+index 0171183ae0..81dcc13b33 100644
+--- a/shlr/rizin-shell-parser/src/meson.build
++++ b/shlr/rizin-shell-parser/src/meson.build
+@@ -1,14 +1,4 @@
+-tree_sitter_bin = find_program('tree-sitter', required: false)
+-node_bin = find_program('node', required: false)
+-if tree_sitter_bin.found() and node_bin.found() and tree_sitter_dep.type_name() != 'internal'
+-  parser_c = custom_target('parser_src_c',
+-    command: [tree_sitter_wrap_py, tree_sitter_bin, '@OUTDIR@/..', '@INPUT@'],
+-    input: [grammar_js],
+-    output: 'parser.c',
+-  )
+-else
+-  parser_c = files('parser.c')
+-endif
++parser_c = files('parser.c')
+ 
+ shell_parser_files = [files('scanner.c'), parser_c]
+ shell_parser_inc = [platform_inc, include_directories('tree_sitter')]
diff --git a/dev-util/rizin/rizin-0.3.2.ebuild b/dev-util/rizin/rizin-0.3.2.ebuild
index be6e33690c5a..f0f118bdd3dc 100644
--- a/dev-util/rizin/rizin-0.3.2.ebuild
+++ b/dev-util/rizin/rizin-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,6 +40,7 @@ BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.0-typedb-prefix.patch"
+	"${FILESDIR}/${PN}-0.3.2-never-rebuild-parser.patch"
 )
 
 S="${WORKDIR}/${PN}-v${PV}"