From 8edd4a48a39640822abe6ddb7b2a1d5b2da4ea70 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 8 Mar 2024 19:07:58 +0000
Subject: gentoo auto-resync : 08:03:2024 - 19:07:58

---
 dev-util/maturin/maturin-1.5.0.ebuild | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'dev-util/maturin/maturin-1.5.0.ebuild')

diff --git a/dev-util/maturin/maturin-1.5.0.ebuild b/dev-util/maturin/maturin-1.5.0.ebuild
index 32c85e5db2ac..d18df31e0dcc 100644
--- a/dev-util/maturin/maturin-1.5.0.ebuild
+++ b/dev-util/maturin/maturin-1.5.0.ebuild
@@ -418,9 +418,10 @@ CRATES_TEST="
 	windows_x86_64_msvc@0.36.1
 	windows_x86_64_msvc@0.48.0
 "
+
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{10..12} )
-inherit cargo distutils-r1 edo shell-completion toolchain-funcs
+inherit cargo distutils-r1 shell-completion toolchain-funcs
 
 DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
 HOMEPAGE="https://www.maturin.rs/"
@@ -445,7 +446,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.10)"
 DEPEND="ssl? ( dev-libs/openssl:= )"
 BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? ( app-text/mdbook )
 	test? (
@@ -463,6 +463,9 @@ QA_FLAGS_IGNORED="usr/bin/${PN}"
 src_prepare() {
 	distutils-r1_src_prepare
 
+	# we build the Rust executable (just once) via cargo_src_compile
+	sed -i -e '/setuptools_rust/d' -e '/rust_extensions/d' setup.py || die
+
 	if use test; then
 		# used to prevent use of network during tests, and silence pip
 		# if it finds unrelated issues with system packages (bug #913613)
@@ -485,18 +488,19 @@ src_prepare() {
 }
 
 src_configure() {
-	local cargoargs=(
-		$(usev debug '--profile dev')
-		--no-default-features
+	export OPENSSL_NO_VENDOR=1
+
+	local myfeatures=(
 		# like release.yml + native-tls for better platform support than rustls
-		--features full,password-storage$(usev ssl ,native-tls)
+		full
+		password-storage
+		$(usev ssl native-tls)
 	)
-
-	export MATURIN_SETUP_ARGS=${cargoargs[*]}
-	export OPENSSL_NO_VENDOR=1
+	cargo_src_configure "${cargoargs[@]}"
 }
 
 python_compile_all() {
+	cargo_src_compile
 	use !doc || mdbook build -d html guide || die
 
 	if ! tc-is-cross-compiler; then
@@ -522,10 +526,12 @@ python_test() {
 		--skip pyo3_no_extension_module
 	)
 
-	edo cargo test $(usev !debug --release) ${MATURIN_SETUP_ARGS} -- "${skip[@]}"
+	cargo_src_test -- "${skip[@]}"
 }
 
 python_install_all() {
+	cargo_src_install
+
 	dodoc Changelog.md README.md
 	use doc && dodoc -r guide/html
 
-- 
cgit v1.2.3