7 files changed, 58 insertions, 9 deletions
diff --git a/dev-util/diffoscope/diffoscope-266.ebuild b/dev-util/diffoscope/diffoscope-266.ebuild
index 8d420d7cf7c7..c635fcff0ab9 100644
--- a/dev-util/diffoscope/diffoscope-266.ebuild
+++ b/dev-util/diffoscope/diffoscope-266.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
+inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
 HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
@@ -122,3 +122,19 @@ EPYTEST_DESELECT=(
 )
 
 distutils_enable_tests pytest
+
+src_test() {
+	case $(tc-get-ptr-size) in
+		4)
+			EPYTEST_IGNORE+=(
+				# Needs fixing in Perl itself (bug #934443)
+				tests/comparators/test_epub.py
+				tests/comparators/test_zip.py
+			)
+			;;
+		*)
+			;;
+	esac
+
+	distutils-r1_src_test
+}
diff --git a/dev-util/diffoscope/diffoscope-268.ebuild b/dev-util/diffoscope/diffoscope-268.ebuild
index b8327171164a..2beffc83d622 100644
--- a/dev-util/diffoscope/diffoscope-268.ebuild
+++ b/dev-util/diffoscope/diffoscope-268.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
+inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
 HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
@@ -133,3 +133,19 @@ EPYTEST_DESELECT=(
 )
 
 distutils_enable_tests pytest
+
+src_test() {
+	case $(tc-get-ptr-size) in
+		4)
+			EPYTEST_IGNORE+=(
+				# Needs fixing in Perl itself (bug #934443)
+				tests/comparators/test_epub.py
+				tests/comparators/test_zip.py
+			)
+			;;
+		*)
+			;;
+	esac
+
+	distutils-r1_src_test
+}
diff --git a/dev-util/diffoscope/diffoscope-271.ebuild b/dev-util/diffoscope/diffoscope-271.ebuild
index f3680e18f668..42b9febe97fb 100644
--- a/dev-util/diffoscope/diffoscope-271.ebuild
+++ b/dev-util/diffoscope/diffoscope-271.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
+inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
 HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
@@ -129,3 +129,19 @@ EPYTEST_DESELECT=(
 )
 
 distutils_enable_tests pytest
+
+src_test() {
+	case $(tc-get-ptr-size) in
+		4)
+			EPYTEST_IGNORE+=(
+				# Needs fixing in Perl itself (bug #934443)
+				tests/comparators/test_epub.py
+				tests/comparators/test_zip.py
+			)
+			;;
+		*)
+			;;
+	esac
+
+	distutils-r1_src_test
+}
diff --git a/dev-util/perf/perf-6.9.ebuild b/dev-util/perf/perf-6.9.ebuild
index 293e2b40b09d..1d5d2705903c 100644
--- a/dev-util/perf/perf-6.9.ebuild
+++ b/dev-util/perf/perf-6.9.ebuild
@@ -287,6 +287,7 @@ perf_make() {
 		NO_ZLIB=
 		TCMALLOC=$(usex tcmalloc 1 "")
 		WERROR=0
+		DEBUG=$(usex debug 1 "")
 		LIBDIR="/usr/libexec/perf-core"
 		libdir="${EPREFIX}/usr/$(get_libdir)"
 		plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
diff --git a/dev-util/ruff/ruff-0.4.6.ebuild b/dev-util/ruff/ruff-0.4.6.ebuild
index cef1ac48c858..2bb565341a0f 100644
--- a/dev-util/ruff/ruff-0.4.6.ebuild
+++ b/dev-util/ruff/ruff-0.4.6.ebuild
@@ -419,7 +419,7 @@ src_compile() {
 	cargo_src_compile --bin ruff
 
 	local releasedir
-	releasedir=target/$(usex 'debug' 'debug' 'release')
+	releasedir=$(cargo_target_dir)
 
 	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
 	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
@@ -435,7 +435,7 @@ src_test() {
 }
 
 src_install() {
-	local releasedir=target/$(usex 'debug' 'debug' 'release')
+	local releasedir=$(cargo_target_dir)
 
 	dobin ${releasedir}/ruff
 
diff --git a/dev-util/ruff/ruff-0.4.7.ebuild b/dev-util/ruff/ruff-0.4.7.ebuild
index cef1ac48c858..2bb565341a0f 100644
--- a/dev-util/ruff/ruff-0.4.7.ebuild
+++ b/dev-util/ruff/ruff-0.4.7.ebuild
@@ -419,7 +419,7 @@ src_compile() {
 	cargo_src_compile --bin ruff
 
 	local releasedir
-	releasedir=target/$(usex 'debug' 'debug' 'release')
+	releasedir=$(cargo_target_dir)
 
 	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
 	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
@@ -435,7 +435,7 @@ src_test() {
 }
 
 src_install() {
-	local releasedir=target/$(usex 'debug' 'debug' 'release')
+	local releasedir=$(cargo_target_dir)
 
 	dobin ${releasedir}/ruff
 
diff --git a/dev-util/ruff/ruff-0.4.8.ebuild b/dev-util/ruff/ruff-0.4.8.ebuild
index c4d41afe50c1..36e64564b314 100644
--- a/dev-util/ruff/ruff-0.4.8.ebuild
+++ b/dev-util/ruff/ruff-0.4.8.ebuild
@@ -415,7 +415,7 @@ src_compile() {
 	cargo_src_compile --bin ruff
 
 	local releasedir
-	releasedir=target/$(usex 'debug' 'debug' 'release')
+	releasedir=$(cargo_target_dir)
 
 	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
 	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
@@ -431,7 +431,7 @@ src_test() {
 }
 
 src_install() {
-	local releasedir=target/$(usex 'debug' 'debug' 'release')
+	local releasedir=$(cargo_target_dir)
 
 	dobin ${releasedir}/ruff