gentoo auto-resync : 17:07:2022 - 20:32:17

3 files changed, 0 insertions, 170 deletions

diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 28df4af7c4e0..489a961f6106 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,5 +1,3 @@
-AUX rizin-0.3.0-typedb-prefix.patch 5175 BLAKE2B 08fea1ba6297f17d42f518c1739875c0964f6f00c1bcd01cba51a56e6626fe50c6ad2c36bece4db326f7b128d6ea5786970eb454832e32f9d837458f92f2a596 SHA512 241a72a7f1c3ec8ba831ca696faf0cfc09a58207c6d3db7005b09b9016a71ed9238bcb9441a389116083557538a0ff1a6adf55e78e1aa35d67aa206f30774391
-AUX rizin-0.3.2-never-rebuild-parser.patch 1493 BLAKE2B fd5a4d306336ccba939e9d96e97d4b653b83407352f9babf9c39bbad28a18b4fc1a3e2f1eb57b25b7f8dad35b3400271cf6a6bf1cec55c74dc00f424da715c91 SHA512 7a105831cbdb99633c43411b7a407ff6970cb8e89cae561886ade96c75579c0484271641e957762189fc68762952a26ca0a2536bd1342802c408041066852b16
 AUX rizin-0.4.0-capstone.patch 681 BLAKE2B ad680ca6ee4782d0a164048e9884a3154fd817ffea42810dc3e11ebd9b5254da7fa1c1379180ba43eec9d3b1966329ffbc7a807df1beee6bcc9879e7e7b5cb65 SHA512 dca9648697d9b419002d27de4ac562ec519c4ffd2161960c489c90e5c0950beaac7a7e9b86cfa32a34efdf60f11fd953547b9a37fe457fe294b5516e5d07d412
 AUX rizin-0.4.0-never-rebuild-parser.patch 1568 BLAKE2B c77276adb8349188ebc937d84b011650b978ba5bed6c0596258963d395014c5e0733e44930b4c2db6dd88941d99b2aa37acf461d035fc31dcd321571ef0d6392 SHA512 a46311772dc42b90b8e3e49ddb66f6d64873773e254ac943934de0129d5f4a77ccb759d20b519b58418d45c076f136d582f2e70056693c75b2f6aae19eb07551
 DIST rizin-src-v0.4.0.tar.xz 11432232 BLAKE2B 095ca9d317296afca9514a70f208e9aa87fc426e6b7e41163f64d5a1192a4d9ccd8ece9c4f13a24fc973668dece625fa13ad75542695a66c542fe2f0d9e66733 SHA512 9d576bee48e5ceae46b4e309c53e01b82edf89a95046f576e1c38fefa73353d6d1f04e6d444332324387d4e115bc87659a358629f7277a41dfef44c82364547b
diff --git a/dev-util/rizin/files/rizin-0.3.0-typedb-prefix.patch b/dev-util/rizin/files/rizin-0.3.0-typedb-prefix.patch
deleted file mode 100644
index dfb86447df71..000000000000
--- a/dev-util/rizin/files/rizin-0.3.0-typedb-prefix.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-https://github.com/rizinorg/rizin/issues/1789
-
-Signed-off-by: Florian Märkl <info@florianmaerkl.de>
-
-diff --git a/test/unit/test_serialize_analysis.c b/test/unit/test_serialize_analysis.c
-index 51092c067..0d714ba90 100644
---- a/test/unit/test_serialize_analysis.c
-+++ b/test/unit/test_serialize_analysis.c
-@@ -546,7 +546,10 @@ Sdb *vars_ref_db() {
- }
- 
- bool test_analysis_var_save() {
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	RzAnalysis *analysis = rz_analysis_new();
- 	rz_analysis_use(analysis, "x86");
- 	rz_analysis_set_bits(analysis, 64);
-diff --git a/test/unit/test_type.c b/test/unit/test_type.c
-index d8a3d9c5f..3956a800b 100644
---- a/test/unit/test_type.c
-+++ b/test/unit/test_type.c
-@@ -379,7 +379,10 @@ static bool test_enum_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -417,7 +420,10 @@ static bool test_const_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -469,7 +475,10 @@ static bool test_type_as_string(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -516,7 +525,10 @@ static bool test_array_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -569,7 +581,10 @@ static bool test_struct_func_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -659,7 +674,10 @@ static bool test_struct_array_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -707,7 +725,10 @@ static bool test_struct_identifier_without_specifier(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -735,7 +756,10 @@ static bool test_union_identifier_without_specifier(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
-@@ -767,7 +791,10 @@ static bool test_edit_types(void) {
- 	RzTypeDB *typedb = rz_type_db_new();
- 	mu_assert_notnull(typedb, "Couldn't create new RzTypeDB");
- 	mu_assert_notnull(typedb->types, "Couldn't create new types hashtable");
--	const char *dir_prefix = rz_sys_prefix(NULL);
-+	const char *dir_prefix = getenv("RZ_PREFIX");
-+	if (!dir_prefix) {
-+		dir_prefix = rz_sys_prefix(NULL);
-+	}
- 	rz_type_db_init(typedb, dir_prefix, "x86", 64, "linux");
- 
- 	char *error_msg = NULL;
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
deleted file mode 100644
index 0f5586c0023d..000000000000
--- a/dev-util/rizin/files/rizin-0.3.2-never-rebuild-parser.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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')]