gentoo auto-resync : 22:02:2023 - 02:26:50

3 files changed, 2 insertions, 56 deletions

diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index ada25b44a688..4bb4cdf66847 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,9 +1,8 @@
 AUX rizin-0.4.0-never-rebuild-parser.patch 1568 BLAKE2B c77276adb8349188ebc937d84b011650b978ba5bed6c0596258963d395014c5e0733e44930b4c2db6dd88941d99b2aa37acf461d035fc31dcd321571ef0d6392 SHA512 a46311772dc42b90b8e3e49ddb66f6d64873773e254ac943934de0129d5f4a77ccb759d20b519b58418d45c076f136d582f2e70056693c75b2f6aae19eb07551
-AUX rizin-0.5.0-capstone-include-path.patch 1783 BLAKE2B 32d172b6dae3e4c7c740c2a5e3aaa9aa8a97d6ca9b3b96f21501cb1e3bd2381951733ccb08291944ecb37b19b14e9b54233bcf4b338e1e811117ff95fb897281 SHA512 9a1b7847ea0ef04318a8ae6568b9a4fb7d5ce9a28649dcbdb1e1bcb1f612e31b5e484738b77a2790a7f3b77a0b2ed965b0d58a65673cccf012d3d03e4f5958af
 DIST rizin-src-v0.4.1.tar.xz 11453808 BLAKE2B dcae21320e2533904d9a337d4fb9cc9a450439753106dc5c341e3ca7c788f0a44034340eb0dfe3fad4f1d8a7ebe873720d42d70ce343e8c7b953d4d148a38da2 SHA512 565358e11fd4db44ec7f8c25313a1cfc726c38a17afcb699c3fc2af520242fb343ea4a267f0a8e35bdc08e9a765a6a17ec7b8eaba9f9ad9ef5a7dcfe01c7354c
-DIST rizin-src-v0.5.0.tar.xz 11774892 BLAKE2B ae64f2b14829eaedeff2e4ef9986778e311edddff7aac7b9a05a84d09015e13e67725e170d79f1f6bc85933726631ad76df2986e5c8fa64f3387418099296c2f SHA512 690a3220b808d41bcf56752556233d0d0b68b458c767441ce74f35358b2b4fa5e46a483a220d635e53bd287a0e10d16e5c141ba5cb916b984683f42eef10fcff
+DIST rizin-src-v0.5.1.tar.xz 11770688 BLAKE2B 31369497d5aa425aa6030ce404baa5d4a10ef2453a93f9b2c9f7d47135b5ffbc61618ef7e743acef3939bca2838a94637b7a1794ff44998608aee3f988301483 SHA512 c856112651bec91bb6e9f5580f60e3168f02a9f194bf567186a66398c162f59953ca8c3bf43441315356ca6ef077b7c56e4150e2dd8a79d4d08c5f789c549596
 DIST rizin-testbins-0264ae4ee5bd606ec6c6a539255eeb57ce2c82c2.tar.gz 179281553 BLAKE2B b86278589da2f8e5859b0f4b16e2667a6e7477c9a889158da5a2c1a1b6e29af4798d56a22dd4c3e23aec1908e7b444ca999502e73f8d8ccf4e0bf2a969380564 SHA512 ae11b6da5cb995f8f1cc996a7b772234b3e7e7c2b0695d0b223657ba839c82dbbcb390600aeb0d16c7c61a5037ba9d0739df79efd730c1b96392cfc1e6f6613d
 DIST rizin-testbins-aef7f7b714a696f382f55b8cbbf94c5b69518de3.tar.gz 178497762 BLAKE2B 8c82a537a58e65d35bd8b309311c4377b5996ff4b650fc6cff4cf347e04fbe4b2ec0e88f03ff43572c8e99675186b05b393b7da070a60ab107c3cca829d2544b SHA512 2745b58646963c28a45b46e8e709845c355863e61cf796aeb3d2e617f1bf2f9916a4b106cd08f48b1ef6e36f7f38624b5977dcd62c921124b0a1122b7220baa8
 EBUILD rizin-0.4.1.ebuild 2441 BLAKE2B 6b93beab0b3f394b243039551c66a27cf498a7943cab90063d12d31e2349d478cbce12795ed724fd51393c1ce4e944f550e73279a52bcba7a3528370371b9d20 SHA512 ead851e780e6d3c0ce5e8c16789e182b62dab1631fabcebd96f17b0e0c449ae48b5c3caac1c0d1bfb7e7d2dadcaf0a6b16757b26991fe5f7647d7dd349bcb85b
-EBUILD rizin-0.5.0-r1.ebuild 2312 BLAKE2B db3d8a1070f9582988397c46a1cad1cf48db3a839695e5e5f2cb582782532c1ebe55f14d1238ca9d7139f37c1097169db24b926c1605c1f7b71d32cf2ac37c37 SHA512 ede920acd54d86b1cd8e8e48b526646b5d7ac4950f08f7c1618a26d95ff66f470f1a66ddfbd18a060bea58c2f919634ce781cfc768ac9d8a3ae8b9be0e2b343d
+EBUILD rizin-0.5.1.ebuild 2257 BLAKE2B 89f5228616e446b6bc3025df6fefec518418eae68364b9194f4b9132048f185505ee7ea378d0e120544fd07506a017eb73f028331780bd2d0742a9f9340edd77 SHA512 a47a95b794adb555ab901b044ea78f2b27819a4b8618b457d26f6017435caaad3b68b6b5f621b770e9ed7a9d02307d7d0ae969663c7215949d310d16cb778250
 MISC metadata.xml 427 BLAKE2B 2937970e78526f69e371b4451a3406b1fdc35a01707d366e8b54e23f9d13e8a713254902825ae111817ee00ea3aaf3bc968db8b6d944b15f869e2b89ba8e16b8 SHA512 65cc9c4cd5f2f64cd02e89b0f7f4972fefec51cb175650625da263b729022587c9487e9ab9faed8517200ed622a8ca5ec35b2b6f4c67966d78344c043197c981
diff --git a/dev-util/rizin/files/rizin-0.5.0-capstone-include-path.patch b/dev-util/rizin/files/rizin-0.5.0-capstone-include-path.patch
deleted file mode 100644
index 485a131cf483..000000000000
--- a/dev-util/rizin/files/rizin-0.5.0-capstone-include-path.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Upstreamed at: https://github.com/rizinorg/rizin/pull/3380
-
-commit e1a65044139443c43a14c8304d095d9d6cddae56
-Author: John Helmert III <ajak@gentoo.org>
-Date:   Sat Feb 18 18:22:42 2023 -0600
-
-    fix capstone include paths
-    
-    capstone include paths were adjusted in
-    2b8104bc5e763ed841d6dbffacbeaf02e86b8421, and this wasn't picked up in
-    the "PPC uplifting" commit, leading to a build failure with system
-    capstone.
-    
-    Also fix the path of the ppc.h include, which seems to mistakenly use
-    capstone's ppc.h when building with bundled capstone.
-    
-    Fixes: b46e7bd4f2 ("PPC uplifting to RzIL (#2823)")
-    Signed-off-by: John Helmert III <ajak@gentoo.org>
-
-diff --git a/librz/analysis/arch/ppc/ppc_il.h b/librz/analysis/arch/ppc/ppc_il.h
-index ee91eb050b..7871414cef 100644
---- a/librz/analysis/arch/ppc/ppc_il.h
-+++ b/librz/analysis/arch/ppc/ppc_il.h
-@@ -9,7 +9,7 @@
- #include <rz_analysis.h>
- #include <rz_il.h>
- #include <rz_types.h>
--#include <capstone.h>
-+#include <capstone/capstone.h>
- 
- #define PPC_BYTE  8
- #define PPC_HWORD 16
-diff --git a/librz/analysis/arch/ppc/ppc_il_ops.c b/librz/analysis/arch/ppc/ppc_il_ops.c
-index f7a2261093..31a730c009 100644
---- a/librz/analysis/arch/ppc/ppc_il_ops.c
-+++ b/librz/analysis/arch/ppc/ppc_il_ops.c
-@@ -1,13 +1,13 @@
- // SPDX-FileCopyrightText: 2022 Rot127 <unisono@quyllur.org>
- // SPDX-License-Identifier: LGPL-3.0-only
- 
--#include "ppc.h"
-+#include "opcode/ppc.h"
- #include "ppc_il.h"
- #include "ppc_analysis.h"
- #include "rz_types_base.h"
- #include <rz_il/rz_il_opcodes.h>
- #include <rz_util/rz_assert.h>
--#include <capstone.h>
-+#include <capstone/capstone.h>
- #include <rz_il/rz_il_opbuilder_begin.h>
- 
- static RzILOpEffect *load_op(RZ_BORROW csh handle, RZ_BORROW cs_insn *insn, const cs_mode mode) {
diff --git a/dev-util/rizin/rizin-0.5.0-r1.ebuild b/dev-util/rizin/rizin-0.5.1.ebuild
index 7144a4dcffb4..122296d19b05 100644
--- a/dev-util/rizin/rizin-0.5.0-r1.ebuild
+++ b/dev-util/rizin/rizin-0.5.1.ebuild
@@ -41,7 +41,6 @@ BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
-	"${FILESDIR}/${PN}-0.5.0-capstone-include-path.patch"
 )
 
 S="${WORKDIR}/${PN}-v${PV}"