gentoo auto-resync : 08:03:2024 - 19:07:58

8 files changed, 25 insertions, 19 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5477c5a09880..fe3edebee33f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bbe/Manifest b/dev-util/bbe/Manifest
index e42b03d7d4b3..3ee7672c809d 100644
--- a/dev-util/bbe/Manifest
+++ b/dev-util/bbe/Manifest
@@ -1,4 +1,4 @@
 AUX bbe-0.2.2-inline.patch 2825 BLAKE2B f3e72d6e1565a5a3f2d99ed0bfb5e60c2f93ac6a858a78a6e843811e3d3687ee41b93701954e7aa7269e28c3931ef6b8c019ac9c181711993de9e088078a0dc0 SHA512 ced6d61c9e070f81b29176b9b98c56bec4077adfd2c99a9c73f4e4995af6ea0aa7d0243a4658e8c62ea9d9b0338a39428ff1fc0c38fa6a3c95c03242d13b3bda
 DIST bbe-0.2.2.tar.gz 211590 BLAKE2B 47eb57d07419342377b9e21f15db6619e2c94ed835c059d50992a8166fa4020c87586cd4085f5cefe044794494b359aa4db5b2a400d638a93e75d9192397133d SHA512 6ac31aa005f18cbfd3fbacfe86b3d81ee61a027764296f574c4180da6ccc23dbf716a835fb013730d30c09c045197a70e28584303f3521afab0e5c63d0cf693f
-EBUILD bbe-0.2.2-r1.ebuild 504 BLAKE2B 1be7fa94e73c902549a6f6c49491965f864df8c8556630fd885771e57ad9077c6506d5598d4a553bfd29597244097dade774c95852fd4f58edcf5ba2a99f0f5b SHA512 94d77a0b07412a7030f7cef64a051bda640ab220bad1ae4da5ba6bc7d4a90b735be6dd6dc7a2be11b71cd00cfb1f50611ff4e908afb8e66f883fe27101f47849
+EBUILD bbe-0.2.2-r1.ebuild 512 BLAKE2B 35ca209ad842b1cf66f02974475a12d18f43b3f64ce195b150e172d607a042a8d16fb6fbb38809e873d5933b4bbb4801fa83803ccde1d0a893c989b93615a303 SHA512 e503666dc5415e55a191765da1a90b63ac65cb01ec53b2d03e5943b0b5b15df6f1acca4a416a45f27ef3bb82f8487433998e29994f097351468fcf40e5a5037f
 MISC metadata.xml 324 BLAKE2B afbcfb2597d970aefaaf670e5ab652473a0767439a4fd69e0cb13f15664e5592d514cc0a6ef4296b79ce491a42de8020167b690640731702bc7a455c96cd3298 SHA512 1976297fb1fe046a58fc16c6b6ce92917b13861ba6dffd8428849797c8ce6e525042f982c78da41166060089faf3aa280b7395b7f989296b0390324b4d8e5725
diff --git a/dev-util/bbe/bbe-0.2.2-r1.ebuild b/dev-util/bbe/bbe-0.2.2-r1.ebuild
index fe27af9582f8..23a866369275 100644
--- a/dev-util/bbe/bbe-0.2.2-r1.ebuild
+++ b/dev-util/bbe/bbe-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,12 +7,11 @@ inherit autotools
 
 DESCRIPTION="Sed-like editor for binary files"
 HOMEPAGE="https://sourceforge.net/projects/bbe-/"
-SRC_URI="mirror://sourceforge/${PN}-/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/bbe-/bbe/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}"/bbe-0.2.2-inline.patch
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 582bab94c752..b99787abe559 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -6,6 +6,6 @@ DIST libabigail-2.4-docs.tar.xz 50320 BLAKE2B 6e3cc1a8ffc42d0a1307ed57576ec31254
 DIST libabigail-2.4.tar.xz 357840964 BLAKE2B c3d1c23c598fc8754405df10fcd1cfded6fe80e6949ae9d15ee28e99aad571477b331ceac2aeaa5a93f47da77de7ca41a692902b741e3a4aea1d72a7043d4a91 SHA512 f9b51f8710c75b911da10c1e93e0b6b6fa575f99e8f37a5f51e93a8e6b79c9ad1541e531730b410385053d6565f807300f7910dca48cbd3e991d111198781d95
 EBUILD libabigail-2.2.ebuild 2897 BLAKE2B aa3bc9e0c5d720364fbed01bd767ea7a2d32b70d1f587fb43b263ee22053160b8e0d42cc3bb6cc9235ad84a3d3e7f752663ffc2e79b9857e0cf719d7a58b3f8d SHA512 58745ee34673feaf857ed7cb0ebfa9ca9b015f3e63b362d8d7d33f4348228dc72f01a16c6339169f8a62a5126ffe8625eebbd76a7543b6feb9cac0a823205019
 EBUILD libabigail-2.3-r2.ebuild 3109 BLAKE2B 9a0dedadc1812248d70b52c8e0ed20a107f454a4691b0585b523b815fda1a5e60c54401467b900e44ce203a144f7a65ce08752ba958522243e0de693c4b77a24 SHA512 fc5fd93507e4cc265b6b1cd45a54a0f72bf4e7d62027003a83219f9827e46c886f998f708385a5ab751200bd601f2dd3a72259a21f295d0196abd8cf75685da0
-EBUILD libabigail-2.4.ebuild 3113 BLAKE2B c7312c12db618724470ade7d6d07a912d062c0d6b2fcdc0cd9367acca1d3b0bf64b644692282753ffdd6fef4ea32b141ea95f8ff1b79f0db5bc0dc04bf7c779a SHA512 a5895638f2ab9bd88213e028a847020da27b85f7d9114417e94c47845e358e90b6e062ebba48c3c307d9b338e3bf7bd6d58cd2476a6f4b7c8666ef5df7584f45
+EBUILD libabigail-2.4.ebuild 3110 BLAKE2B d743179000f4f7a7285cdfb39f98b83c6e38bba67db8e78c3caccd0eb28f5482cb1d49400f00f983b0537e6feefd376b329d3345df86c7afd5ea2751eada6e06 SHA512 8f53f6f9ad4ae3f1869d033d122b3e04ce49597c169ab936b1eba54b1ce668c4aaefc23ac71bb60e0650c3ebb48e53504dabc2ca7c9a8685f2f12d88689be108
 EBUILD libabigail-9999.ebuild 3113 BLAKE2B c7312c12db618724470ade7d6d07a912d062c0d6b2fcdc0cd9367acca1d3b0bf64b644692282753ffdd6fef4ea32b141ea95f8ff1b79f0db5bc0dc04bf7c779a SHA512 a5895638f2ab9bd88213e028a847020da27b85f7d9114417e94c47845e358e90b6e062ebba48c3c307d9b338e3bf7bd6d58cd2476a6f4b7c8666ef5df7584f45
 MISC metadata.xml 365 BLAKE2B c69fe6073d2650badf4c3426e991b46ccea688837970ff80f3f8410769bebabf2629b780218c95c5dc766fbd839e5da2b28c7f63944d2a13ece1c4c97dfdb4a5 SHA512 6caec9ea9f290685e73efd1a273d27948bb6be5d71aebae5e1fba93781ddf2b34e08fc67c912b27b29705143288a3d5ec068c2bb20533c431823e53c1a5b6361
diff --git a/dev-util/libabigail/libabigail-2.4.ebuild b/dev-util/libabigail/libabigail-2.4.ebuild
index 5ca2dece0f9b..eb16b68487c9 100644
--- a/dev-util/libabigail/libabigail-2.4.ebuild
+++ b/dev-util/libabigail/libabigail-2.4.ebuild
@@ -31,7 +31,7 @@ else
 		LIBABIGAIL_DOCS_USEFLAG="doc"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="Apache-2.0-with-LLVM-exceptions"
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