3 files changed, 3 insertions, 175 deletions
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 0b4351d9ec4f..89d8906eea20 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -1,8 +1,5 @@
 AUX maturin-1.8.2-pypy3_11-tests.patch 6491 BLAKE2B b497ff8f39ef5037a42955714f2afec9d9f510f0dea92d6bfb4efe84b0d2c1287692ea42fc793ee713ee9b48d72ffd8850d7a163a2430c5e6299c1cc000fb219 SHA512 9ea432ec03b50e6addd13fcf226df7c3687278b6a07c0767a3b0a14f8be2cc7d334812809425e4644f31384748326e19e9104dcc06467da84ce94f20543fbe77
-DIST maturin-1.8.2-vendor.tar.xz 17297348 BLAKE2B 400ae0e41d3c3a7e330482902fe73c1def631bbdb32734e6fa110eb6d2d954b464d9feeca5727d8f551d30cb6868c3000afcaed452c3f10a661e6f03d79edd02 SHA512 c5faa7ff3c49e5097a27f19821bf4a355dd17ed74efae503ec1639cb8a695873cdc5a89a94da77fe7cb7cb1e1685ab895c801bbf94828c22d7c0ba29105213fa
-DIST maturin-1.8.2.gh.tar.gz 544160 BLAKE2B d5784b76ee7dbbb48818e3ef0acebe32cee423e787f9c4bdcc50af90656a34d1dd1a89c414948b07e983edc1047382b82a1590d4c0de0e59279be81e06bbbdfc SHA512 83ca2dc64e1933f18b66d06bb985f6834a41ae289cf74d01689158febda783157cbecfb5c10c6da9544eda501acb9fdc52dd9cd7f351c2c4c5c0c0a1e6cffc4f
 DIST maturin-1.8.3-vendor.tar.xz 15014308 BLAKE2B 5dec263a5297108e5ac36ca6a05f7013f0bcc1704e8b5038418ac7c17d979dc449e1a06ec3a5b6439498b3473e68765fd2ae69ed671b9d4d9aef8e20f325a1a9 SHA512 106e7d0a013f715e1eb8008d31518317bb7e66c3d429c2972ddcfb457afc89de4359d4d85f19fce50861eff219063e666106e284916290e6cca08e7dd6c54889
 DIST maturin-1.8.3.gh.tar.gz 544455 BLAKE2B 0e0115331a8e23d03b8c96348b505d9573988c1f6fdbf9c179d6c94a0d3aa3d448727babb9d7f6e85ae2bc3f2a8201c7b32dbba894228f0035055662449b1556 SHA512 b4f79df7b099777d6068d2705fd6ca6a79c0a96c77530dcca26fef5d09b39a57feabab9d3871fc5b4760df234955329222dc29a86df5404d880140f1a3736431
-EBUILD maturin-1.8.2.ebuild 4649 BLAKE2B 9e60a1bae8e9f622c4b99fb1168cd41d40ac003d5f71b8bac11a8e18862ada9a0d19ec3c964a28bbe31698f28670d8e39b1bf73bdb1c8c92cf586c69ba7c54bc SHA512 fe72e3dcedfa95706cd7ee8eaffcf0623ed431237da6ea8eba7a455e8d9317f482d265346da5703e8b29c0c9dbc7db0f67398d7c44ceb31c1d891340038aaa5a
-EBUILD maturin-1.8.3.ebuild 4588 BLAKE2B aa019f28d359ffd7055a2b7280744ef51bdfb5cbe30250ef4a5c8f08e010f8f19fe478545cba9b6b633d4ef0cf104e0ca6162474dab330fa8ff050f50dde7fc9 SHA512 e3a791646ddef8d4c59a6c399e9befb4c4c448ef5b27b2b60c082bbaf9ad35d0183452682620c1fa653077501a169677fc36927a52f493868e18f281708ec8a9
+EBUILD maturin-1.8.3.ebuild 4464 BLAKE2B 3fbfb0d1822c5c55b635bd864be447f7885d2453c2e16695e7d0e93d4cfeb43146e980f28f08bc470ea21665f93d0f5002a29155f1d1188d80fd236d5fff833d SHA512 f2312a09dab5e9e39725036995564d9b4a84ed1e69d79f5f84fc7ccae13dd003f3eff736017eeb7deb398bb6a7cd6e7c40c17249a48e42393c5c38aae759d375
 MISC metadata.xml 431 BLAKE2B 15731479f56d8b819c60e8e5541d3c4720462c5a90b199b803097b208432b18cc0143f8cbee471ce81ffeb8b54846fdb61fad083e7507f4f6c3630ac628546ed SHA512 7431db948fd5ab520fb6cae76c7e7dbb2c7aef907d7cde21189d1bb17c686cca7f69a0b84470b1c5d90f672e80d30fbb56f37beec1da04ebfdf025015c099ae7
diff --git a/dev-util/maturin/maturin-1.8.2.ebuild b/dev-util/maturin/maturin-1.8.2.ebuild
deleted file mode 100644
index 5577ff0febf6..000000000000
--- a/dev-util/maturin/maturin-1.8.2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
-RUST_MIN_VER=1.75.0
-inherit cargo distutils-r1 flag-o-matic shell-completion toolchain-funcs
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://www.maturin.rs/"
-SRC_URI="
-	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
-"
-# ^ tarball also includes test-crates' Cargo.lock(s) crates for tests
-
-# rustls+ring is unused, so openssl license can be skipped
-LICENSE="|| ( Apache-2.0 MIT ) doc? ( CC-BY-4.0 OFL-1.1 )"
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT
-	MPL-2.0 Unicode-3.0 Unicode-DFS-2016
-" # crates
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc +ssl test"
-RESTRICT="!test? ( test )"
-
-TOMLI_DEPEND="$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.10)"
-DEPEND="
-	app-arch/xz-utils
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	${TOMLI_DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/mdbook )
-	test? (
-		${TOMLI_DEPEND}
-		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
-		dev-python/boltons[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-vcs/git
-		elibc_musl? ( dev-util/patchelf )
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-pypy3_11-tests.patch
-)
-
-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)
-		cat > "${T}"/pip.conf <<-EOF || die
-			[global]
-			quiet = 2
-
-			[install]
-			no-index = yes
-			no-dependencies = yes
-		EOF
-
-		# uv does not work easily w/ network-sandbox, force virtualenv
-		sed -i 's/"uv"/"uv-not-found"/' tests/common/mod.rs || die
-
-		# increase timeouts for tests (bug #950332)
-		sed -i '/^#\[timeout/s/secs(60)/secs(300)/' tests/run.rs || die
-
-		# used by *git_sdist_generator tests
-		git init -q || die
-		git config --global user.email "larry@gentoo.org" || die
-		git config --global user.name "Larry the Cow" || die
-		git add . || die
-		git commit -qm init || die
-	fi
-}
-
-src_configure() {
-	export OPENSSL_NO_VENDOR=1
-
-	# https://github.com/rust-lang/stacker/issues/79
-	use s390 && ! is-flagq '-march=*' &&
-		append-cflags $(test-flags-CC -march=z10)
-
-	local myfeatures=(
-		# like release.yml + native-tls for better platform support than rustls
-		full
-		password-storage
-		$(usev ssl native-tls)
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-python_compile_all() {
-	cargo_src_compile
-
-	use !doc || mdbook build -d html guide || die
-
-	if ! tc-is-cross-compiler; then
-		local maturin=$(cargo_target_dir)/maturin
-		"${maturin}" completions bash > "${T}"/${PN} || die
-		"${maturin}" completions fish > "${T}"/${PN}.fish || die
-		"${maturin}" completions zsh > "${T}"/_${PN} || die
-	else
-		ewarn "shell completion files were skipped due to cross-compilation"
-	fi
-}
-
-python_test() {
-	local -x MATURIN_TEST_PYTHON=${EPYTHON}
-	local -x PIP_CONFIG_FILE=${T}/pip.conf
-	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
-
-	# need this for (new) python versions not yet recognized by pyo3
-	local -x PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
-
-	local skip=(
-		# picky cli output test that easily benignly fail (bug #937992)
-		--skip cli_tests
-		# avoid need for wasm over a single hello world test
-		--skip integration_wasm_hello_world
-		# fragile depending on rust version, also wants libpypy*-c.so for pypy
-		--skip pyo3_no_extension_module
-		# unimportant tests that require uv, and not obvious to get it
-		# to work with network-sandbox (not worth the trouble)
-		--skip develop_hello_world::case_2
-		--skip develop_pyo3_ffi_pure::case_2
-		# compliance test using zig requires an old libc to pass (bug #946967)
-		--skip integration_pyo3_mixed_py_subdir
-		# fails on sparc since rust-1.74 (bug #934573), skip for now given
-		# should not affect the pep517 backend which is all we need on sparc
-		$(usev sparc '--skip build_context::test::test_macosx_deployment_target')
-	)
-
-	cargo_src_test -- "${skip[@]}"
-}
-
-python_install_all() {
-	cargo_src_install
-
-	dodoc Changelog.md README.md
-	use doc && dodoc -r guide/html
-
-	if ! tc-is-cross-compiler; then
-		dobashcomp "${T}"/${PN}
-		dofishcomp "${T}"/${PN}.fish
-		dozshcomp "${T}"/_${PN}
-	fi
-}
diff --git a/dev-util/maturin/maturin-1.8.3.ebuild b/dev-util/maturin/maturin-1.8.3.ebuild
index 340429ab71e3..217958cd8917 100644
--- a/dev-util/maturin/maturin-1.8.3.ebuild
+++ b/dev-util/maturin/maturin-1.8.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
+PYTHON_COMPAT=( pypy3_11 python3_{11..13} )
 RUST_MIN_VER=1.75.0
 inherit cargo distutils-r1 flag-o-matic shell-completion toolchain-funcs
 
@@ -28,20 +28,15 @@ KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc +ssl test"
 RESTRICT="!test? ( test )"
 
-TOMLI_DEPEND="$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.10)"
 DEPEND="
 	app-arch/xz-utils
 	ssl? ( dev-libs/openssl:= )
 "
-RDEPEND="
-	${DEPEND}
-	${TOMLI_DEPEND}
-"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-text/mdbook )
 	test? (
-		${TOMLI_DEPEND}
 		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
 		dev-python/boltons[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]