gentoo auto-resync : 16:08:2022 - 02:29:20

4 files changed, 98 insertions, 12 deletions

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 9d3c17194066..f4fb4d0b3b9c 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -2,6 +2,7 @@ AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c
 AUX capstone-5.0_rc2-pkgconfig.patch 464 BLAKE2B 68727cd48eb79d43417df46312d8def40307e4120becd4e89edb88c367c02190e3174fc715a3bd593ea18a5f6b1592e958c7fa3643c164d69f3b9be882911d1d SHA512 cc6588b281257644679004baea4c722a4be88cd2510b632585036017fb8e6eddd5fab3a469c1583d0d6fee1fd1e6490d3773c7de84389f9ea3d72fddfd5add59
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
 DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c SHA512 fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a
-EBUILD capstone-4.0.2-r2.ebuild 1532 BLAKE2B 5a06905077ef4a45d3a9a92cb5e6d99eb24f85505f5b66b8c118b312cce25d8f763d8dc7706d8aa3059683f58bc3e0e4726ce7a390094ce88a0ef271d24cb16a SHA512 c0e10d2e4f3b6e87f42d6cb938e6d0c004879276844e7be3856d5688221d0602f7514f2496997a8799c05200599c3e276d8dbecc9d6aeb3b31d69cd411ab89e2
-EBUILD capstone-5.0_rc2-r1.ebuild 1457 BLAKE2B 37769d1d00ef8fc1bcfaae7017d26410f19ef0ef8df3a7393e085e074f34904b6b277d277b446ddc7051bd87489aee0778fa4a801f263c704474dd3f69acd531 SHA512 023dacbdc093592d18dbffd388e47b2c71f735108e0013cbd7bb216cf183d8dc4b220ede87f15ea293af7cfbe1b3c3c763d288a2bbb343406b39e9a89feb24b5
+EBUILD capstone-4.0.2-r2.ebuild 1535 BLAKE2B 15f3ca620f06cf18d35a0c18324dc0b61297e5479e408a7f38d42eb1b69ce7f97357057d18a9dcb970bf4b61a73c4564e4d90f5a07d22462ee1860d476b1139c SHA512 6a2cd3383a7f58183bb1fc621c756e4b78f4c3f70bb355e98339b4ffc7dd03c7ac7850be8db376fd00707403bfe4a27241d7c7d4a21eaca33be9e7f0df02de30
+EBUILD capstone-5.0_rc2-r1.ebuild 1471 BLAKE2B 2d3cc1c286bd5173493b197e687a2067210609d15a12099ce49850366c20fb78847b90326b21500303141c2d697ce56a75e652e84af5a420cfc49f11f14caa37 SHA512 301f874cdfedd391f425c066fceae7d607f38bcbd3a3be283fb706e4e0da9861095421275ba5585db7d9d3127f7b7f4e14f9809754e56935a3d903affec239b8
+EBUILD capstone-9999.ebuild 1568 BLAKE2B f5dde9abc087427f4462f82075651dedc26931d16864bec80830c70d7423663b9b9abbbc9f67980b1b08555fb61b877b05c9612d200112b32ace2857ba6f9066 SHA512 da214669d779c3500d7eccbef4cab3c23757ce6cc155d9e45dbc644474677c9cd5946adde6b03306be7872f9037d45489e0130e0c92b40db5ed14f86ec77612b
 MISC metadata.xml 484 BLAKE2B 32c39bf06443ce4ca18191a4c9626cf517d5bd4f837c179e6186a68a0053217bf41d61d2c4d46c9792b1974879d22b36e4a02fa461a1b085acf5c4406bde4891 SHA512 f06dcd3133982f72cf21c5bb3d9a34207d7083233b5e70856f6a1dab60ef361cf1432659af30ea6b90fcb38cfdaec49f0792623ef841e136bc33cb5e1c40d1cf
diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 9ce37b266b5f..b604ecec3a89 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/"
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4
diff --git a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
index 174d710dac2a..70a870cb34e7 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/"
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
@@ -31,8 +31,10 @@ PATCHES=(
 	"${FILESDIR}"/${P}-pkgconfig.patch
 )
 
-# Upstream doesn't flag release candidates (bug 858350)
-QA_PKGCONFIG_VERSION=""
+if [[ ${PV} == *_rc* ]]; then
+	# Upstream doesn't flag release candidates (bug 858350)
+	QA_PKGCONFIG_VERSION=""
+fi
 
 wrap_python() {
 	local phase=$1
@@ -40,10 +42,8 @@ wrap_python() {
 
 	if use python; then
 		pushd bindings/python >/dev/null || die
-		echo distutils-r1_${phase} "$@"
-		pwd
 		distutils-r1_${phase} "$@"
-		popd >/dev/null
+		popd >/dev/null || die
 	fi
 }
 
diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild
new file mode 100644
index 000000000000..762e910dbcef
--- /dev/null
+++ b/dev-libs/capstone/capstone-9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://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
+	SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/5" # libcapstone.so.5
+
+IUSE="python test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+distutils_enable_tests setup.py
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+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 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=(
+		-DCAPSTONE_BUILD_TESTS="$(usex test)"
+	)
+	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}
+}