gentoo auto-resync : 05:01:2023 - 12:08:57

4 files changed, 46 insertions, 1 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 908f56b0574a..a71f16322316 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 119f8d030cf8..97a68271f161 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,6 +1,7 @@
+AUX openocd-0.12.0-capstone-includedir.patch 1124 BLAKE2B 08cce4c69a3a36dc836476158474fa75599e45e22b6275d39be48f4fbc8f90985611b64e94945042ee2a35929ff18a66fcf9e783fe4da86b8ae4bfaa7d9ee4fe SHA512 5a3b41d83f7bc3173a6b5431fd9619f3b3f8391641a3fb465d7e0e66d6f6e89637bf2d09288c9e4dd95ec8459f199e7d4d80c036f5bccfae1cb8db99f8b1a81a
 DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b
 DIST openocd-0.12.0-rc3.tar.gz 8444782 BLAKE2B 04daf4865ff6cb5102f037ae9e0436eac80eaa5a78aa3ee31c7bb7b51acc879d9076c816dc797f9d9b474502b6d216c064cffae46cf17663f7d6887ea6ccf958 SHA512 62a2a5316be6fa10ed424f57fa784c0774ae325bfa27a8e5a7ddc19841dbd55c7c1bb335aa9b8ffefebdf0ffcb3638dad20c191ade75b5b804d8be76b483fba4
 EBUILD openocd-0.11.0.ebuild 2291 BLAKE2B a7cfad0e610c216138a8acd75e5ce5cabfe1552622119f86ac4aa71d42107bc8c2fcee580c2c641318e180bec2645a2f3b77ac7b4d3e9f62de3c147b7cb609b1 SHA512 e26eb55c10595e42cfd5b886d40ad0449dbabfcf7538dfeb61dde7a3a4ebdd1dae7a7c8ae50b46a14d5ed0032fa6f7b4397cf8d24815f4a7ad3374a46e548eb3
-EBUILD openocd-0.12.0_rc3.ebuild 2334 BLAKE2B 4af7890a488ab7a0417a1df938392718593e246fde12ca7f5e5acf0502b145b48b1fbec867cb10256d71394a832c075e313e20e3f5294313594c14e86b587048 SHA512 731689c109e69f115fdcb86cb2c9db7619a02656020a6a0847fbdd15fe8b59db2250af6a076792e019574b861975da348f0e20b9594d60cfa08010443b5a6bcb
+EBUILD openocd-0.12.0_rc3.ebuild 2401 BLAKE2B db425b6e131f1279046739be187fbadb3e828fefa0a2c2be728b9d83f1f86bd90a9d043e8d9f0bec4e5d8a79387122cf47d4555dcdfe0c8822e5c920ee16fe52 SHA512 7df94cccf288391b887346574043cd97e54fb41890c41ac192bcfac4a6ea870860acf794b18ac157e5ac6ca32b36dfc29c859d49250043ae9f62f693c9a37e36
 EBUILD openocd-9999.ebuild 2333 BLAKE2B 34f481009248bdb97fa1e531ac61b4b37236105b3415f8d8add039808b3c894f1495558abca7a781f6981ecd1a6359a24a8cd926f9751f7d9f448e8b7abee2e1 SHA512 0b296fc9a4ca7cab9505e654473efe05a7154ee66d39ea9180bd63b134f27b1e026ddb82350f722a2e90a8f67bb950642330420a451cd7fde5f3c36467711243
 MISC metadata.xml 1086 BLAKE2B a44beaaa3151f1c84b11610cdae8e9319b8b6383f84fb4f4db3411b04455f9dd39af81a2804f2ca0113d395e618a2038530bfde97cf8e7546e41b62452c8c120 SHA512 747fca05ad33fc4d459726270f2418eca31e94c0841f57d69a6dc66de6b9dc8a80dcea0390f1e74a9f6262857080e2eebfebc08e79f75d5fd8fd7fc8f1f33c8d
diff --git a/dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch b/dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch
new file mode 100644
index 000000000000..f2dbff6520e5
--- /dev/null
+++ b/dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch
@@ -0,0 +1,40 @@
+Bug: https://bugs.gentoo.org/889762
+diff --git a/contrib/cross-build.sh b/contrib/cross-build.sh
+index b199bf715..919a22005 100755
+--- a/contrib/cross-build.sh
++++ b/contrib/cross-build.sh
+@@ -155,7 +155,7 @@ if [ -d $CAPSTONE_SRC ] ; then
+   sed -i '1s;^;prefix=/usr \
+ exec_prefix=${prefix} \
+ libdir=${exec_prefix}/lib \
+-includedir=${prefix}/include/capstone\n\n;' $CAPSTONE_PC_FILE
++includedir=${prefix}/include\n\n;' $CAPSTONE_PC_FILE
+ fi
+ 
+ 
+diff --git a/src/target/a64_disassembler.c b/src/target/a64_disassembler.c
+index ca3d3ea7a..9579860f0 100644
+--- a/src/target/a64_disassembler.c
++++ b/src/target/a64_disassembler.c
+@@ -15,7 +15,7 @@
+ 
+ #if HAVE_CAPSTONE
+ 
+-#include <capstone.h>
++#include <capstone/capstone.h>
+ 
+ static void print_opcode(struct command_invocation *cmd, const cs_insn *insn)
+ {
+diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c
+index 749274f36..e78d08853 100644
+--- a/src/target/arm_disassembler.c
++++ b/src/target/arm_disassembler.c
+@@ -16,7 +16,7 @@
+ #include <helper/log.h>
+ 
+ #if HAVE_CAPSTONE
+-#include <capstone.h>
++#include <capstone/capstone.h>
+ #endif
+ 
+ /*
diff --git a/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild b/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild
index 57562d0c8fc5..031ef6803e37 100644
--- a/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild
+++ b/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild
@@ -36,6 +36,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-capstone-includedir.patch"
+)
+
 src_prepare() {
 	default