[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/, dev-util/unicorn/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/, dev-util/unicorn/files/

[Sam James]

commit:     4afab5a4d1ee006254f6537c8bb090bd6d4b4a0e
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Wed Feb 19 05:56:49 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 11:04:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4afab5a4

dev-util/unicorn: provide version number for python build system

Closes: https://bugs.gentoo.org/949873
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/40646
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../unicorn/files/unicorn-2.1.2-versioningit.patch | 35 ++++++++++++++++++++++
 dev-util/unicorn/unicorn-2.1.2.ebuild              |  8 ++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch b/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch
new file mode 100644
index 000000000000..9be0f31e8478
--- /dev/null
+++ b/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch
@@ -0,0 +1,35 @@
+From 0f45f15e303b4a7b15eb4ca61860452f0a071a3e Mon Sep 17 00:00:00 2001
+From: "@Antelox" <anteloxrce@gmail.com>
+Date: Tue, 18 Feb 2025 09:28:06 +0100
+Subject: [PATCH] Python bindings: (#2112)
+Upstream: https://github.com/unicorn-engine/unicorn/pull/2112
+
+- Switch from versioningit to setuptools-scm
+- Disable building of tests via DUNICORN_BUILD_TESTS var
+--- a/bindings/python/pyproject.toml
++++ b/bindings/python/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["setuptools", "build", "wheel", "versioningit"]
++requires = ["setuptools>=64", "build", "wheel", "setuptools-scm>=8"]
+ build-backend = "setuptools.build_meta"
+ 
+ [project]
+@@ -40,4 +40,5 @@ test = [
+ [tool.setuptools.packages.find]
+ include = ["unicorn*"]
+ 
+-[tool.versioningit]
++[tool.setuptools_scm]
++root = '../../'
+--- a/bindings/python/setup.py
++++ b/bindings/python/setup.py
+@@ -102,7 +102,7 @@ def build_libraries():
+ 
+     has_msbuild = shutil.which('msbuild') is not None
+     conf = 'Debug' if int(os.getenv('DEBUG', 0)) else 'Release'
+-    cmake_args = ['cmake', '-B', BUILD_DIR, "-DCMAKE_BUILD_TYPE=" + conf]
++    cmake_args = ['cmake', '-B', BUILD_DIR, "-DCMAKE_BUILD_TYPE=" + conf, "-DUNICORN_BUILD_TESTS=off"]
+     if os.getenv("UNICORN_TRACER"):
+         cmake_args += ["-DUNICORN_TRACER=on"]
+     if conf == 'Debug':

diff --git a/dev-util/unicorn/unicorn-2.1.2.ebuild b/dev-util/unicorn/unicorn-2.1.2.ebuild
index b65c4530a0af..a66c7bbbd255 100644
--- a/dev-util/unicorn/unicorn-2.1.2.ebuild
+++ b/dev-util/unicorn/unicorn-2.1.2.ebuild
@@ -33,7 +33,10 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/glib:2"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 BDEPEND="virtual/pkgconfig
-	python? ( ${DISTUTILS_DEPS} )"
+	python? (
+		${DISTUTILS_DEPS}
+		>=dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
+	)"
 
 RESTRICT="!test? ( test )"
 
@@ -41,8 +44,11 @@ UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.1.2-return.patch"
+	"${FILESDIR}/${PN}-2.1.2-versioningit.patch"
 )
 
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
 wrap_python() {
 	if use python; then
 		# src_prepare