gentoo auto-resync : 28:08:2023 - 10:02:11

3 files changed, 22 insertions, 1 deletions

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index f8375885a6c1..df25a5721504 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,6 +1,7 @@
 AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c7aa12594148102498c7d0ed3216af95712f0daef5e9484d1faf368b93b2b014832ead5466d60d139e9ed7bb2bd1ed02 SHA512 81ffee2dc4a406e980025402dc3f8bee886cba9f305312e03c735d4b47e69887e90240274ae1949ff9900ba2a66413d33e7ef7a9ebb83a3dc9d2769f3d008395
 AUX capstone-5.0_rc2-oob-mem-access.patch 1353 BLAKE2B 67e19e22f466d2081b5f2b3122cc2ca8eed27c3b59c9b4d5ed3f07fba66c34d67305ced9de3e4c80ae6117935a90eb4b030ec7cdbf6da1ad0d4c1ff0b24a964e SHA512 048cf06c0408eddbe994dc7f59ab086575f8b14b83857d22ad48198c75261eea218f20a8615d26b7c974914f8b494b4a05c84c8b6b273464f90a40d14d0a9b8e
 AUX capstone-5.0_rc2-pkgconfig.patch 464 BLAKE2B 68727cd48eb79d43417df46312d8def40307e4120becd4e89edb88c367c02190e3174fc715a3bd593ea18a5f6b1592e958c7fa3643c164d69f3b9be882911d1d SHA512 cc6588b281257644679004baea4c722a4be88cd2510b632585036017fb8e6eddd5fab3a469c1583d0d6fee1fd1e6490d3773c7de84389f9ea3d72fddfd5add59
+AUX capstone-9999-werror.patch 533 BLAKE2B ec2589edaf25bcf551cc3b3321fd77109551270da3fbac1c0457031b14aa9bd85dff06440e219e0db22017898d7f2e779e11f63fdcc7e7112baee040393ca1f4 SHA512 c98e83e296147d4520b5323393347739b07e93ef00a339154de131a31c4eba420a6387c23a4f9382408fa9dc243b55a262f73a48412da6bc7d7d1b31cfb19f11
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
 DIST capstone-5.0.1.tar.gz 7654195 BLAKE2B 83f6681d4c9c748df00daf59f7b33637ab72eee661261c22acae40a6db2def70bb6b5339d731244fdbae6f1e1b0b5b22bb6f60c1390a1bebceb97b3f810aedb0 SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5
 DIST capstone-5.0.tar.gz 7636912 BLAKE2B 8980268415a1e66afb9420a4fd4d94dcb78a7022b62a27d7a95ab0eb21a23fc27e2a2e99c0250133f3ff42c589ea7a5dba59c03175ae8f85fe74a80b52790763 SHA512 bb345fe7abaaf4932db93702ce713403aa88d1a63ff931be43f0ef72c5b1a7d17b85df6157fc476e236e009a2bd75cabb2534588387d01b3851e756e6c3e444d
@@ -12,5 +13,5 @@ EBUILD capstone-5.0.ebuild 1781 BLAKE2B 5d44cd297deda6b0084ffe7c41d74d15632b35a5
 EBUILD capstone-5.0_rc2-r2.ebuild 1530 BLAKE2B 3cd7be6305deefb6c8c2b404119f9a139856c3156c255bac229bb0b2817a694f47e260a7e6e1385518f426e8ec10a2f64232039f00dfac40f7c0bfec88847ee9 SHA512 ff56bf0e531e1284963d79a5917fd3cc15c269f5986d5adba51fb3476abd629b85a390649dd011f44f3344028813a8349b0d27a4274c6d1ae86794a38eda05b0
 EBUILD capstone-5.0_rc2-r3.ebuild 1824 BLAKE2B 57736dfd1a9b27e17bbb50ec109055cfb4204d5f38663c5810dd050ab945da758a5a3c9e19f0e7570fb0684f3ac1949e04684dd91e122d11d244abaf240f7a5b SHA512 5ba56034e254ff783ea48cc3e26145a9360b0d8f0917d3699ecbfe2c3c93c3c1dd9c2f543303d00939616e84edfdcd72d28f76e3d6c73c0ee6674dd0b473d6b3
 EBUILD capstone-5.0_rc4.ebuild 1752 BLAKE2B 824b3ca5c3136cf505b04a833369fe87fef39f0d0de4ea45570b8fbf7c98a45b588f613570fbc002b2fb5024dcbbad40e02724fafc533cc8a0c0bbdc51331f62 SHA512 291d508f410aa39fc10e3a8f27638dc013be0c826deaf319ec064a192fc44aa9120e4202be77a4f5d7bf7dc7b2aca70f8b23332e5c3ebdacdb7885f1fbb1cbe7
-EBUILD capstone-9999.ebuild 1775 BLAKE2B 3a2956892b9e8ae508ce55bde59036e53e60d3629f377866018ccbe4ed06f9978c8b3bc213eb473754fd9aadd57028ec48a4c7e60042f557b05961b4dc978413 SHA512 71a20f2eaec9729196f01e5eeab7a7a34928f83216bd2b5b70c1eaed2ac95654f151193576d8bf30f894b9845afb02cdc4ada803d111870a6e2859ebe4af12a8
+EBUILD capstone-9999.ebuild 2011 BLAKE2B ba99ea124dc4bde09972d93f5f13878eb79efba8faec9fe0be830a4b925257bdcba3776d5eedf7675c5788438935993e05e987c4c4e22cf74a43e793cbd809ca SHA512 0f43f3a9a17bf0b20aedaa6373c774ec15b551e6641b311857c3d7fba83cc2f0a7c2e04c3f7eb48ff85a95343fa53ef6ce22e8f850a86db484f93d637a9130cc
 MISC metadata.xml 484 BLAKE2B 32c39bf06443ce4ca18191a4c9626cf517d5bd4f837c179e6186a68a0053217bf41d61d2c4d46c9792b1974879d22b36e4a02fa461a1b085acf5c4406bde4891 SHA512 f06dcd3133982f72cf21c5bb3d9a34207d7083233b5e70856f6a1dab60ef361cf1432659af30ea6b90fcb38cfdaec49f0792623ef841e136bc33cb5e1c40d1cf
diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild
index fd6e6133cc4f..6d46a0133be7 100644
--- a/dev-libs/capstone/capstone-9999.ebuild
+++ b/dev-libs/capstone/capstone-9999.ebuild
@@ -35,6 +35,13 @@ DEPEND="${RDEPEND}
 BDEPEND="${DISTUTILS_DEPS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	# Currently "-Werror" is only added in the `next`-development branch, but
+	# not merged into 5.* releases. Eventually this patch may be needed in
+	# version 5 releas line. See bug #911481.
+	"${FILESDIR}/${P}-werror.patch"
+)
+
 distutils_enable_tests setup.py
 
 if [[ ${PV} == *_rc* ]]; then
diff --git a/dev-libs/capstone/files/capstone-9999-werror.patch b/dev-libs/capstone/files/capstone-9999-werror.patch
new file mode 100644
index 000000000000..1ec58fa056a3
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-9999-werror.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/911481
+Upstream: https://github.com/capstone-engine/capstone/pull/2114
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,7 @@ project(capstone
+ if (MSVC)
+     add_compile_options(/W1 /w14189)
+ else()
+-    add_compile_options(-Werror -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context)
++    add_compile_options(-Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context)
+ endif()
+ 
+