From 8edd4a48a39640822abe6ddb7b2a1d5b2da4ea70 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Mar 2024 19:07:58 +0000 Subject: gentoo auto-resync : 08:03:2024 - 19:07:58 --- dev-util/maturin/Manifest | 4 ++-- dev-util/maturin/maturin-1.4.0.ebuild | 3 ++- dev-util/maturin/maturin-1.5.0.ebuild | 26 ++++++++++++++++---------- 3 files changed, 20 insertions(+), 13 deletions(-) (limited to 'dev-util/maturin') diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest index 4cd4f7b5950f..c80d6a50b0aa 100644 --- a/dev-util/maturin/Manifest +++ b/dev-util/maturin/Manifest @@ -555,6 +555,6 @@ DIST zerocopy-derive-0.7.28.crate 533073 BLAKE2B 588e4eda234d39c702402f71aab6824 DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756 DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef -EBUILD maturin-1.4.0.ebuild 11581 BLAKE2B 248ddfd453aeb0263d8232b73640190644130d663d33e294758647bb0b2fd24aba4e640cbeb7105f5e73c9e613968a723e205c6e460916b398f4bf07aae444ce SHA512 02cf20bb3668ddfab42c3e1e80482d82bca106c2aa756253e02e9550796ad9757b0555d2f40426afe81fec5f5d23240a8014cb33798c21313c8270883f918e4b -EBUILD maturin-1.5.0.ebuild 11162 BLAKE2B edd043bf2e7b29581970acbab657a74e1b336bd4a2ab823f85d12555a668c2ee2374413dd8d12c6c34f319c023daa314ca45c6085bcc8860b70135bcb35c1b71 SHA512 209388706cea2c974e492f76de0c3f5ebb4d87eed37f15928ab4f2a83dd84c412e22d162994522afead29a6cd13a7aaf453a5fa31bfe1d929fb4eaccc71af47f +EBUILD maturin-1.4.0.ebuild 11605 BLAKE2B 555a0f6926ed589a92c7e363eb50a58329b59bc948e9eebe6afb7b671fd2d3c1f7fb96866f060b69cc14a9ed696834f4a4ee69fb38142d215fa8ef66fc2c94f3 SHA512 c62100a408d4dd398b4a7ae9ae0bee7f9baac01df8dcca1266b8549b6a868ac18e3650e0b2078ccde250fdf690534bf35e77fc2855c1946c17e44eeb66104504 +EBUILD maturin-1.5.0.ebuild 11178 BLAKE2B 701a08da80d775334e80373db6ca6d5f44a9e70d5f215ec078e842818d0ef7a7908f8d0e98c76a74f724f98771a62694dd560cbfc47cf7e2fd1585c0362d4f79 SHA512 4be5bd30b8b99dddda400226abdefd131a454213922332fc0d80d8163ba19fdbb9ab7255f9a4d08a18fff6c4d652cb3b1b77332b641e5a24fa5b26c8d7a77ea4 MISC metadata.xml 431 BLAKE2B 15731479f56d8b819c60e8e5541d3c4720462c5a90b199b803097b208432b18cc0143f8cbee471ce81ffeb8b54846fdb61fad083e7507f4f6c3630ac628546ed SHA512 7431db948fd5ab520fb6cae76c7e7dbb2c7aef907d7cde21189d1bb17c686cca7f69a0b84470b1c5d90f672e80d30fbb56f37beec1da04ebfdf025015c099ae7 diff --git a/dev-util/maturin/maturin-1.4.0.ebuild b/dev-util/maturin/maturin-1.4.0.ebuild index 5acdc27779e6..3cf5c02fedec 100644 --- a/dev-util/maturin/maturin-1.4.0.ebuild +++ b/dev-util/maturin/maturin-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -427,6 +427,7 @@ CRATES_TEST=" windows_x86_64_msvc@0.36.1 windows_x86_64_msvc@0.48.0 " +DISTUTILS_EXT=1 #926507 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit cargo distutils-r1 edo shell-completion toolchain-funcs 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