gentoo auto-resync : 16:02:2023 - 02:03:12

3 files changed, 34 insertions, 19 deletions

diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index d64b768b82a3..e5910e3b517b 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -449,5 +449,5 @@ DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
 EBUILD maturin-0.14.12.ebuild 10426 BLAKE2B 1417362f707a9ed2f17dd8d29df766f50614ea74113bf71c45368b29447edbaf5463f8170acf633d38e8e1333620ff286d8533d4af5b9096d1c7c8bdc43888af SHA512 1dc3daf08dd45f7cedf4b8957b173bb746f17e8fda5cc1b0eda6d3ca484818fb2e9b695f3a7fdaad352d56841dd1050afa7a97f5946844e0fe082ccc015bdc8b
 EBUILD maturin-0.14.13.ebuild 10452 BLAKE2B a77751fec6a9c327c217d11de4f55df536ee225b4e790c18a8a56023333f05ad502d3a909207af0d8d8745c312e5026e36fe02ade71d601331fef487a8b1db04 SHA512 3175e5147b926a04d493bb796cac39c284acf25e29a7314e47d85e1be2c2ee785736f134bbe50b10e2005c3dac65e240d95b440860a326cf4cc840c845abcfa1
-EBUILD maturin-1.0.0_beta1-r1.ebuild 10218 BLAKE2B 32d64deb42d9e55ff3ab03e895719c7089dc4985ee5eaaceba54c66d4aeb1cba0a8a915ebca8586917221f598143a89bc53ae21ba71fc3f0decdbb73edc0d1bf SHA512 6bf0e4555d82bf9bab27961fe4da6f1c139bb363de32cd1f72abd86b05c8b815df06217b9048648a4171321a9afefcdcf9209b130cdef7a8e614e5fc9ab87db7
-MISC metadata.xml 581 BLAKE2B 9fd4c9b9ef68199ef36af2d3799e3c16f819e89a2858bbfefbedb35575f5018c44ccf6b851f1bd367adefec1e8e6dc4a817bd431037b2ee8d1c01e3638d81541 SHA512 93e477343b707475d8b5bd043575a047e7247998e62daaed232216a9a3bfaa9dcae0ac02ec8489e847018495b31f9ef1811d528498e0e129dde99b06712ef7f7
+EBUILD maturin-1.0.0_beta1-r2.ebuild 10827 BLAKE2B 19245936772d94fb6e8e3bd59634e5347a2945c515cf4d3a963d3bd3a141ec7054d47e87dc606f33edec1476964f562dbdd4c7710b8c30509451719cbe16110b SHA512 9ccd5ea7ad387c5a452ddb14ce7e00ca21d3d1f8d7cde3c911e6a3ee17ae0eeba6a28173a740a5661b7e89cc81777ff9f9e463580c4eab4c2885c1a6fb37988c
+MISC metadata.xml 644 BLAKE2B 68c4178fb0120813b880155cf6660aa7092335e3cd0daa9a112ad7f00fb081c8076cfb30c2b7299797fba0929dc2b223585da6f9c57d28e1b9d91e2d40843355 SHA512 9fa1da4be0fc70d10a6aaf6381a0d211a14807f0335660b501f86d2e750e93f76d31ae9b141aa0a170cb5ef36d52fd744c75dc4342226c2179e07f579d108ff7
diff --git a/dev-util/maturin/maturin-1.0.0_beta1-r1.ebuild b/dev-util/maturin/maturin-1.0.0_beta1-r2.ebuild
index c3aba92597fc..35e06bbbae10 100644
--- a/dev-util/maturin/maturin-1.0.0_beta1-r1.ebuild
+++ b/dev-util/maturin/maturin-1.0.0_beta1-r2.ebuild
@@ -399,7 +399,7 @@ CRATES_TEST="
 	windows_x86_64_msvc-0.42.0"
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
-inherit cargo distutils-r1 edo flag-o-matic
+inherit bash-completion-r1 cargo distutils-r1 edo flag-o-matic toolchain-funcs
 
 DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
 HOMEPAGE="https://www.maturin.rs/"
@@ -410,31 +410,28 @@ SRC_URI="
 	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
 S="${WORKDIR}/${P/_beta/-beta.}"
 
+# note: ring is unused, so SSLeay+openssl licenses can be skipped
 LICENSE="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD
-	CC0-1.0 ISC MIT MPL-2.0 SSLeay Unicode-DFS-2016 openssl
-	doc? ( CC-BY-4.0 OFL-1.1 )"
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC
+	MIT MPL-2.0 Unicode-DFS-2016 doc? ( CC-BY-4.0 OFL-1.1 )"
 SLOT="0"
 # unkeyworded beta for testing
 #KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc test"
+IUSE="doc +ssl test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10} pypy3)"
+RDEPEND="$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.{9,10})"
+DEPEND="ssl? ( dev-libs/openssl:= )"
 BDEPEND="
 	dev-python/setuptools-rust[${PYTHON_USEDEP}]
 	doc? ( app-text/mdbook )
 	test? (
 		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
+		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
 		dev-python/boltons[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)"
+RDEPEND+=" ${DEPEND}"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
@@ -455,18 +452,25 @@ src_configure() {
 	local cargoargs=(
 		$(usev debug '--profile dev')
 		--no-default-features
-		--features full,password-storage # see release.yml
+		# like release.yml + native-tls for better platform support than rustls
+		--features full,password-storage$(usev ssl ,native-tls)
 	)
 
-	# rustls needs ring crate that only works on specific arches (bug #859577)
-	use amd64 || use x86 || use arm64 || use arm &&
-		cargoargs+=(--features rustls)
-
 	export MATURIN_SETUP_ARGS=${cargoargs[*]} # --no-default-features if empty
+	export OPENSSL_NO_VENDOR=1
 }
 
 python_compile_all() {
 	use !doc || mdbook build -d html guide || die
+
+	if ! tc-is-cross-compiler; then
+		local maturin=target/$(usex debug{,} release)/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() {
@@ -490,4 +494,14 @@ python_test() {
 python_install_all() {
 	dodoc Changelog.md README.md
 	use doc && dodoc -r guide/html
+
+	if ! tc-is-cross-compiler; then
+		dobashcomp "${T}"/${PN}
+
+		insinto /usr/share/fish/vendor_completions.d
+		doins "${T}"/${PN}.fish
+
+		insinto /usr/share/zsh/site-functions
+		doins "${T}"/_${PN}
+	fi
 }
diff --git a/dev-util/maturin/metadata.xml b/dev-util/maturin/metadata.xml
index fdeb3d0577fa..da96d4399066 100644
--- a/dev-util/maturin/metadata.xml
+++ b/dev-util/maturin/metadata.xml
@@ -14,6 +14,7 @@
 		<name>Rust Project</name>
 	</maintainer>
 	<upstream>
+		<changelog>https://www.maturin.rs/changelog.html</changelog>
 		<remote-id type="github">PyO3/maturin</remote-id>
 		<remote-id type="pypi">maturin</remote-id>
 	</upstream>