From 9a1d1c6b10a4640cea10e7040ed173cf593f4cab Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 23 Jan 2023 06:54:34 +0000
Subject: gentoo auto-resync : 23:01:2023 - 06:54:34

---
 .../radare2/files/radare2-5.7.0-vector35.patch     | 22 --------------------
 .../files/radare2-5.8.2-bundled-capstone.patch     | 21 +++++++++++++++++++
 .../radare2/files/radare2-5.8.2-vector35.patch     | 24 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 22 deletions(-)
 delete mode 100644 dev-util/radare2/files/radare2-5.7.0-vector35.patch
 create mode 100644 dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
 create mode 100644 dev-util/radare2/files/radare2-5.8.2-vector35.patch

(limited to 'dev-util/radare2/files')

diff --git a/dev-util/radare2/files/radare2-5.7.0-vector35.patch b/dev-util/radare2/files/radare2-5.7.0-vector35.patch
deleted file mode 100644
index c358d94ff427..000000000000
--- a/dev-util/radare2/files/radare2-5.7.0-vector35.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libr/asm/arch/arm/v35arm64/Makefile b/libr/asm/arch/arm/v35arm64/Makefile
-index afc4322b83..fe77126a08 100644
---- a/libr/asm/arch/arm/v35arm64/Makefile
-+++ b/libr/asm/arch/arm/v35arm64/Makefile
-@@ -31,7 +31,7 @@ $(ALIBS): arch-arm64 arch-armv7
- ## ARM64
- arch-arm64:
- 	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
--	cd arch-arm64 && git checkout -q radare2-wip > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
-+	cd arch-arm64
- 
- $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- 	rm -f arm64dis.$(EXT_AR)
-@@ -41,7 +41,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- ## ARMV7
- arch-armv7:
- 	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
--	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
-+	cd arch-armv7	
- 
- $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
- 	rm -f armv7dis.$(EXT_AR)
diff --git a/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
new file mode 100644
index 000000000000..31de9b72bb37
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
@@ -0,0 +1,21 @@
+Need to unbundle capstone due to broken capstone-5 compatibility:
+
+https://github.com/radareorg/radare2/issues/21204
+https://bugs.gentoo.org/891805
+
+diff --git a/shlr/Makefile b/shlr/Makefile
+index 5626a061ff..5e8af3b99b 100644
+--- a/shlr/Makefile
++++ b/shlr/Makefile
+@@ -225,10 +225,7 @@ capstone-sync: capstone
+ capstone-clean:
+ 	-$(MAKE) -C capstone clean
+ 
+-capstone: capstone-$(CS_VER).tar.gz
+-	tar xzvf capstone-$(CS_VER).tar.gz
+-	rm -rf capstone
+-	mv capstone-$(CS_VER) capstone
++capstone:
+ 	$(MAKE) patch-capstone
+ 
+ # already implemented in capstone.sh
diff --git a/dev-util/radare2/files/radare2-5.8.2-vector35.patch b/dev-util/radare2/files/radare2-5.8.2-vector35.patch
new file mode 100644
index 000000000000..6b67f39b40c4
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.8.2-vector35.patch
@@ -0,0 +1,24 @@
+diff --git a/libr/arch/p/arm/v35/Makefile b/libr/arch/p/arm/v35/Makefile
+index a7a40ddb97..1ef40746ac 100644
+--- a/libr/arch/p/arm/v35/Makefile
++++ b/libr/arch/p/arm/v35/Makefile
+@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7
+ 
+ ## ARM64
+ arch-arm64:
+-	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
+-	cd arch-arm64 && git checkout -q radare2-wip > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
++	cd arch-arm64
+ 
+ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 	rm -f arm64dis.$(EXT_AR)
+@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 
+ ## ARMV7
+ arch-armv7:
+-	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
+-	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
++	cd arch-armv7
+ 
+ $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
+ 	rm -f armv7dis.$(EXT_AR)
-- 
cgit v1.2.3