commit: f78f958a1edfc419091c0e578ad8c2154f091b69
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 11:52:19 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 12:49:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f78f958a
dev-python/bcrypt: Enable pypy3.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/bcrypt/Manifest | 11 ++++++-----
dev-python/bcrypt/bcrypt-4.2.1.ebuild | 27 +++++++++++++++++----------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index e54b45b6a665..f8fdb713f76d 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -22,11 +22,12 @@ DIST once_cell-1.20.2.crate 33394 BLAKE2B
79dd394fcf1637adfef28b4159ec653c8b71d2
DIST pbkdf2-0.12.2.crate 13906 BLAKE2B
062731ec8623719543e497dbfc23b909c8cc62a521ba927f5cb628290c1b3898a0b6ca7677d733b2eb0c563d7af4018981f4ae533b5b3a23c312ce98119eae6c
SHA512
5360a661db8ef11586badfa2623dc409e34f3e2f79254cebcb5fb68bfb20c3be47def7bbb16f7779facb42a92bb789cf0e71947d1c4c6f5b1ecb8d358f6b41ef
DIST portable-atomic-1.9.0.crate 166365 BLAKE2B
9abc31364770923847dac16f532452bc8783a5068c0f757f79122bc5b68863b58c0acfa12d28836188413c2f0b61d494cb53fa07a57e199ecd4910a2534c5bb3
SHA512
1431a4c092f6a0cb50bcc78488d603c8ba8f4ee697f77fdcfcce7002fcb371f52a321089422c76564fbf3277c48e30f889565747951c60360d95a6917bb6adeb
DIST proc-macro2-1.0.89.crate 49446 BLAKE2B
844c021394e7a2551bc179592a6769d672360150abf92debcb9ac60a94a2e426c48c408f06aeb2128686f5f04d66dc12973714670c21a5063ee6b9f3bae4e671
SHA512
488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f
-DIST pyo3-0.23.1.crate 1072552 BLAKE2B
1d83f3d853eada9d10e7502c76ba665ccd75afe51ad8f09e6b72d076aba4eab5da535bcd9f0d636d9a5a120dd632d67bf89b65fc4372511b042a74bb697be56b
SHA512
6f0f457669c0d5d54196e4d7f10a78c8ef1f576ffaf01e11fd142634949e9b1e12c8e4dcf041f9bbe21f7e9b4779ff7ac1b625b3d0ecaf8e448b468aaef7b3f5
-DIST pyo3-build-config-0.23.1.crate 31755 BLAKE2B
7cac76855763159f61c26bf401545d12a95d8d0970ce4a0ae90e5b7ad1d67747af5414c02b8848042b4e2c2aa773d8cfe3b3db077895d12305097457dbd0ea60
SHA512
ec7b47db39e910760373adf3c035d7bef0cf48595562bf8c70d6ecf98ae3a676f19c94302bcf29dae60797b0dcd180498bf41faa65d6a6a268a0e2b14a309e42
-DIST pyo3-ffi-0.23.1.crate 73993 BLAKE2B
4b16d423f6aec1a4b99aad79976dd17a8039e9a37ec35badb50cbd12001f12b88b7223e2dc6bb67257e821ffc935a3f23876f93941f2495e63ac88e631be51d9
SHA512
7533fdd016afb71a482cec07a61b04b0eaee10eb131e11d9c6d650e090a575896fb5ea243880341a2500b0b8442c36ac7792cb6ed39a2f9bd29645556cdc807e
-DIST pyo3-macros-0.23.1.crate 8064 BLAKE2B
26f0c07d230c6a749848094e84e1cd86d151b1d7639aa17debef73a49c9d15210a6f5ddf20d832f1175ba9fca690edc2be3244aef286112d2d097677558348e2
SHA512
2897b64b1e6695526a74822adc2e6bd6fccd0185918ab5e87561341c5e37382e77094a9e102bd6c817cddc919ed45c1a133cdc1e947ecab2c851328fecf14508
-DIST pyo3-macros-backend-0.23.1.crate 70118 BLAKE2B
df6e7db9f88bc0fd039c2b0553c3371fcde654bad4528320e0e8cb8ee5ae98b541bf7fe800a872fb5ee43562e07a5b0cd9543f4b5c66b482818107a53e6e49ea
SHA512
bb6df78ad712ab6c85535c60d3d5d8aa1b012b175845c6e073ca7b174c558e4a546fed5e62453bc3ce7f46dfaf3b016c01b88e13c8516b18d5024565464c1bf8
+DIST pyo3-0.23.4.crate 1087676 BLAKE2B
2c7d3530460ff687e8f60dcff0fb01465b2a4642043ebdfc927fc3824b9fbce9c4b304250808a85405d21df12d17a1d1ada7bdf8f3563710692f22223e2732f1
SHA512
0015aa75163ad0ec026d185e15c26f59aaad0eb3cc3044b146e5d703bb375fcd838df2044febbd52e6e129dfba81c8249329fc3e4805695274dac7a69eee0651
+DIST pyo3-build-config-0.23.4.crate 33885 BLAKE2B
7f95a8a9e08d413899ff1fa64af5a52783bad4a7b4db92835464f12bd8565f152497aaeb45d25cc91eed73950abeea30ca4c7495e3b15423ae588b97038beb18
SHA512
b11442609f43d9baab79daf083caf0366987f6ae182239814ad6df6fe4ad31b95132d74f1162fa9428d229bd8c18ef9b696a4c3329b3960fd705d1705fc5e973
+DIST pyo3-ffi-0.23.4-pypy3_11.patch.xz 2140 BLAKE2B
29cf1a3b340241bb323192261b11a431a0b78748819dfe05683ce51c18fb53b5e9394fd4269197475d467f6be82df1fdc92e45450a1e2416ddd459bc00174b6e
SHA512
43da84518b24022b82314fc509e8125ad6a9e5c47f8e2eb20da2fa38631719759ce821253a62bdd9fc3fdbedf798e9a37168c39d913570a6cfc53aca3ec0eedb
+DIST pyo3-ffi-0.23.4.crate 74806 BLAKE2B
650784d46347c00f09c010c39e9762f778efc510ad0b99b5ddf30cab18edaba552207339ad44ed4ae6d87ddfcc56fa540a17e3a4cb331905a0988d5ba2dc682a
SHA512
c12097292b4620f4fd98d61fde4a0f0c7d423a94d518fa5b1cf759089b066fede6d83e20171acc2aa7bf268de5700c9b59da32131216734626b0fa5cd5651801
+DIST pyo3-macros-0.23.4.crate 8852 BLAKE2B
ba5722fd52e47aa4dc2e89bacd69326bd98943a1670ebeab08a2e9e8070a0975ebbe928a0bce8b53a700b65294fee2b00d2a1e6623a0c48ac15902cdbfcb7a97
SHA512
c36c9005db5a4b48b5fda881130f4e7da8eef46e2c363c395ccca3fe476e0204d98c2a832cd03c787fb37a2664fadd42bf8f47de71eb44d055754ab5766af934
+DIST pyo3-macros-backend-0.23.4.crate 70912 BLAKE2B
a428c732f0b17d9a8f620d0e8d58469f2cba339c8a8307393ce252a7860808e5d50e6bbf711cafd0635c844f4b1d48e57db4dd99ef7b5e3d97d6f760164278e9
SHA512
2fe670fbf35724f489cc82f38d3f7c1e6aa15b087a2674b7a68b562572f9bb00cbb7746cccfcb62d0861a18f6d24c5739273c8302d1662a161142f4a6b532b6f
DIST quote-1.0.37.crate 28558 BLAKE2B
a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4
SHA512
c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
DIST sha2-0.10.8.crate 26357 BLAKE2B
1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a
SHA512
3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
DIST subtle-2.6.1.crate 14562 BLAKE2B
3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd
SHA512
f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
diff --git a/dev-python/bcrypt/bcrypt-4.2.1.ebuild
b/dev-python/bcrypt/bcrypt-4.2.1.ebuild
index 0bb2d803386d..0c6890c10278 100644
--- a/dev-python/bcrypt/bcrypt-4.2.1.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_EXT=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
CRATES="
[email protected]
@@ -31,11 +31,11 @@ CRATES="
[email protected]
[email protected]
[email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
+ [email protected]
[email protected]
[email protected]
[email protected]
@@ -58,6 +58,7 @@ HOMEPAGE="
"
SRC_URI+="
${CARGO_CRATE_URIS}
+ https://dev.gentoo.org/~mgorny/dist/pyo3-ffi-0.23.4-pypy3_11.patch.xz
"
LICENSE="Apache-2.0"
@@ -75,13 +76,19 @@
QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/bcrypt/_bcrypt.*.so"
distutils_enable_tests pytest
-export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
-
src_prepare() {
distutils-r1_src_prepare
- cd "${ECARGO_VENDOR}"/pyo3-0*/ || die
+ # unpin pyo3
+ rm src/_bcrypt/Cargo.lock || die
+
+ pushd "${ECARGO_VENDOR}"/pyo3-ffi* >/dev/null || die
+ eapply -p2 "${WORKDIR}/pyo3-ffi-0.23.4-pypy3_11.patch"
+ popd >/dev/null || die
+
+ pushd "${ECARGO_VENDOR}"/pyo3-0*/ >/dev/null || die
eapply "${FILESDIR}/bcrypt-4.2.0-patch-pyo3-subinterp.patch"
+ popd >/dev/null || die
}
python_configure_all() {
