gentoo auto-resync : 03:11:2024 - 03:04:03

4 files changed, 124 insertions, 13 deletions

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index e810be828e3c..f4160a9d5498 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,8 +1,10 @@
 AUX capstone-5.0.2-tests.patch 625 BLAKE2B 0e5b839d2beef6f9f971a5dbb08071e8398d3d406908a1570d193668637d349675ae80fd7d36e3fb26a802c5029896e2130fc553714159be1576d946d3ad02a3 SHA512 bdd42ff8764303b20acdd8a0d34e6f00d3f06aca6afa2aa3c48246934897aa5ab3a4bfee7a543c04594142075da00197ceec54de14bfdd22a45d9d672a8d5e27
-AUX capstone-9999-werror.patch 791 BLAKE2B f8456764a5af797eb0c5ad9460a44c7621e96d0a673450ed7c529b9ba73d90ebd3221aefaee95f210e65c900471aebdc82e6224f9b0ed24d4b855e28b4042ece SHA512 708908bd93f6fad559075414ccd6449fa285afe18d92c377fffaddf475755249fda9cd66e5504379976f350beaf934e5cdd37e8697ff00cc24532372caed15f9
+AUX capstone-werror.patch 791 BLAKE2B f8456764a5af797eb0c5ad9460a44c7621e96d0a673450ed7c529b9ba73d90ebd3221aefaee95f210e65c900471aebdc82e6224f9b0ed24d4b855e28b4042ece SHA512 708908bd93f6fad559075414ccd6449fa285afe18d92c377fffaddf475755249fda9cd66e5504379976f350beaf934e5cdd37e8697ff00cc24532372caed15f9
 DIST capstone-5.0.1.tar.gz 7654195 BLAKE2B 83f6681d4c9c748df00daf59f7b33637ab72eee661261c22acae40a6db2def70bb6b5339d731244fdbae6f1e1b0b5b22bb6f60c1390a1bebceb97b3f810aedb0 SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5
 DIST capstone-5.0.3.tar.gz 7650875 BLAKE2B 3750964a95cbaba685dfb5cf511f12d18f2c157fb622a15c4615734987b8a49ffacf021457f36302606ccf9055e45a7fc56af000b8f09df467922896b431537c SHA512 2fd3194dd37065e6091d208c7670b12c0ca6872931eef794bd6b2dd624601c843e8ee6c5714eae0372e394e91a9bc1e4de7dfea6b1087542dd461226569101de
+DIST capstone-6.0.0_alpha1.tar.gz 9929667 BLAKE2B 2a32026b943759e2c9d5dfa52c176112f6fcbfda0d1b64349bc2f4a587e41d929cd1a23e17ac94d8eb92e277878b1e1da671fd10dea2e7b43fc2361518f60504 SHA512 f95da568693b8bfe350c366ecd90b406754c3cfb9ac2ece772b67edf01aded5cb88d1b1190c6ec39c99506e50d89d93e33af8cb2892c03f6555d4eb39fc2d531
 EBUILD capstone-5.0.1.ebuild 1806 BLAKE2B 8a3acac99fc3ef1675a9ade8eba6c6500ad8170ee2ca33705cd7b7121a8570f9a431367d3a5f22074c7ea59849f009625ea83db88e359d0590445f69b544d449 SHA512 88b195ce9e437ac5b4941f8bfd4260dca875823adc6b9c17a4680272013d0a88611c49b5f3cb641bebda4091819aed5d8cf508987fc97fbfcda52ad4ebd1a528
 EBUILD capstone-5.0.3.ebuild 1859 BLAKE2B f71c37f24d9216d6b97a28b5d5f8a21957798b252d1d7cf0444bc84c8c69f40c18a8ae43542316f214f5a58fd16b042f8890d4a63377737d4ea20fd5ed48e081 SHA512 bd65681c3cad9da5c04c2920de1101c803bf77a4c6dacf29a5f9a440169aac9f9d2baef9b14a6fb13dcc1d7fc824e73e0fd3e0e909ee19464300c8feb8e64033
-EBUILD capstone-9999.ebuild 2050 BLAKE2B 33a900e65d33839aaf226499676938e39eb0976ac78f7d5e9d3ef7ebfdc9c9a51e69bb12b5ab11172d49cab61c7f4e0d2bf1885d499d224ad8b8f4bd56f15243 SHA512 70920575466f4aa4fca8b0df7a1630dc33a5f8fdeca9386ac25185ccfbe9b674e36ad15c8f7e03d8d61f959d38803264b3bd15a6c03474875edf647ab4e41ad9
+EBUILD capstone-6.0.0_alpha1.ebuild 2211 BLAKE2B 8a4b4c49d512ee6db080506999089c4af983efcb00734b1259d2be3965fceb03bbaebeaae83a908e648bc3750e926a2f4f54e99291511ec7e0feaa224b8ed128 SHA512 3273e0cd097341679e4a38f2c4225ddcb9330f28fdbc9dbc136346da6e19ee058df7f30920dde1fb42f0d7f8238441efc4cec53e5821592c6978a750873dd10a
+EBUILD capstone-9999.ebuild 2211 BLAKE2B 8a4b4c49d512ee6db080506999089c4af983efcb00734b1259d2be3965fceb03bbaebeaae83a908e648bc3750e926a2f4f54e99291511ec7e0feaa224b8ed128 SHA512 3273e0cd097341679e4a38f2c4225ddcb9330f28fdbc9dbc136346da6e19ee058df7f30920dde1fb42f0d7f8238441efc4cec53e5821592c6978a750873dd10a
 MISC metadata.xml 484 BLAKE2B 32c39bf06443ce4ca18191a4c9626cf517d5bd4f837c179e6186a68a0053217bf41d61d2c4d46c9792b1974879d22b36e4a02fa461a1b085acf5c4406bde4891 SHA512 f06dcd3133982f72cf21c5bb3d9a34207d7083233b5e70856f6a1dab60ef361cf1432659af30ea6b90fcb38cfdaec49f0792623ef841e136bc33cb5e1c40d1cf
diff --git a/dev-libs/capstone/capstone-6.0.0_alpha1.ebuild b/dev-libs/capstone/capstone-6.0.0_alpha1.ebuild
new file mode 100644
index 000000000000..8d6006b4688e
--- /dev/null
+++ b/dev-libs/capstone/capstone-6.0.0_alpha1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="https://www.capstone-engine.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git"
+	EGIT_REPO_BRANCH="next"
+else
+	MY_PV="${PV}"
+	MY_PV="${MY_PV/_alpha/-Alpha}"
+	MY_PV="${MY_PV/_beta/-Beta}"
+	MY_PV="${MY_PV/_rc/-rc}"
+	SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	fi
+fi
+
+LICENSE="BSD"
+SLOT="0/6" # libcapstone.so.6
+
+IUSE="python static-libs test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+BDEPEND="${DISTUTILS_DEPS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Currently "-Werror" is only added in the `next`-development branch, but
+	# not merged into 5.* releases. Eventually this patch may be needed in the
+	# version 5 release line. See bug #911481.
+	"${FILESDIR}/${PN}-werror.patch"
+)
+
+if [[ ${PV} == *_rc* ]]; then
+	# Upstream doesn't flag release candidates (bug 858350)
+	QA_PKGCONFIG_VERSION=""
+fi
+
+wrap_python() {
+	local phase=$1
+	shift
+
+	if use python; then
+		pushd "${S}/bindings/python" >/dev/null || die
+		distutils-r1_${phase} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	tc-export RANLIB
+	cmake_src_prepare
+
+	wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=true
+		-DCAPSTONE_BUILD_STATIC_RUNTIME=false
+	)
+	cmake_src_configure
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake_src_compile
+
+	wrap_python ${FUNCNAME}
+}
+
+src_test() {
+	cmake_src_test
+
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake_src_install
+
+	wrap_python ${FUNCNAME}
+}
+
+python_test() {
+	./tests/test_all.py || die
+	./tests/test_iter.py || die
+}
diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild
index ce469dd82485..8d6006b4688e 100644
--- a/dev-libs/capstone/capstone-9999.ebuild
+++ b/dev-libs/capstone/capstone-9999.ebuild
@@ -18,14 +18,19 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git"
 	EGIT_REPO_BRANCH="next"
 else
-	MY_PV="${PV/_rc/-rc}"
+	MY_PV="${PV}"
+	MY_PV="${MY_PV/_alpha/-Alpha}"
+	MY_PV="${MY_PV/_beta/-Beta}"
+	MY_PV="${MY_PV/_rc/-rc}"
 	SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	fi
 fi
 
 LICENSE="BSD"
-SLOT="0/5" # libcapstone.so.5
+SLOT="0/6" # libcapstone.so.6
 
 IUSE="python static-libs test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
@@ -41,7 +46,7 @@ PATCHES=(
 	# Currently "-Werror" is only added in the `next`-development branch, but
 	# not merged into 5.* releases. Eventually this patch may be needed in the
 	# version 5 release line. See bug #911481.
-	"${FILESDIR}/${P}-werror.patch"
+	"${FILESDIR}/${PN}-werror.patch"
 )
 
 if [[ ${PV} == *_rc* ]]; then
@@ -54,7 +59,7 @@ wrap_python() {
 	shift
 
 	if use python; then
-		pushd bindings/python >/dev/null || die
+		pushd "${S}/bindings/python" >/dev/null || die
 		distutils-r1_${phase} "$@"
 		popd >/dev/null || die
 	fi
@@ -69,7 +74,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCAPSTONE_BUILD_TESTS="$(usex test)"
+		-DBUILD_SHARED_LIBS=true
+		-DCAPSTONE_BUILD_STATIC_RUNTIME=false
 	)
 	cmake_src_configure
 
@@ -92,12 +98,9 @@ src_install() {
 	cmake_src_install
 
 	wrap_python ${FUNCNAME}
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
 }
 
 python_test() {
-	emake check
+	./tests/test_all.py || die
+	./tests/test_iter.py || die
 }
diff --git a/dev-libs/capstone/files/capstone-9999-werror.patch b/dev-libs/capstone/files/capstone-werror.patch
index d5f09ca7d656..d5f09ca7d656 100644
--- a/dev-libs/capstone/files/capstone-9999-werror.patch
+++ b/dev-libs/capstone/files/capstone-werror.patch