gentoo auto-resync : 12:07:2024 - 12:25:38

3 files changed, 7 insertions, 159 deletions

diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index db0a0b9cacfd..8d69da6efc4e 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -7,9 +7,7 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616de
 DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST cryptography-42.0.7.tar.gz 671230 BLAKE2B d0c1e0c752e066a4bd7a01eb351463f4264603610981f738d629785a783bcdedbd5a9fefbdbf4eaac2cf56a3db12334991b284c5195bed2f8050f836a816308d SHA512 2f502fd78490ed2dc26884b05c9db32d6dcf8ed17ca3808299e528aa53ec13805e2be741d92d6a540b7dded011850cf033abe2e073f22f07e271c7c1c25c024b
 DIST cryptography-42.0.8.tar.gz 671250 BLAKE2B 77de79a8f6e78cc375c604e5d7045130c00bb3d2ac5293f5b16dc81e5d58210711943d3e217baea84d7f5348121f15a8326e6228e161cae87f1f7ecd1bfbe321 SHA512 db56db956649c05dea9f405341164126147e94e09ecef3535b63e2fecdb3d64a008c23aedc868406eea0dc1ea8a8efbc2fb29b74b7f04cc50454039e2d2e647f
-DIST cryptography_vectors-42.0.7.tar.gz 35277664 BLAKE2B e8d999f6c139d610f7539287de22b97febebd8abcbf5989aa47139705b076aa5657a3af4fd00668c5fadb4cd8e7b2253a53f3cc057d9b2636e982f7487ac5fa0 SHA512 5d64b3b7576ff1f39db1c12fbe5ed71e8430ca82cd936aedaf41c45812ec6f72456d6369dbbc58fed1d29909a845fac467a41e0acf74e681f3de8ccb1b8422fc
 DIST cryptography_vectors-42.0.8.tar.gz 35277813 BLAKE2B 89c3ce911ee65a634c2bb647c57ba99c27f846dcbdf70889f5c589412b50218641ee83e7426ffaa001ed059fab4439c15e9abdb30062f7c0a82bca18c66e6247 SHA512 c81fb4a3773e84504e2f4f935cbf572ed056531671a66c65e55a6377ac8ae9006e0d7d0cc24141c32cbded74bccce487e21290afbe8548318951d4c4de00a84f
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
@@ -51,6 +49,5 @@ DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1d
 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
-EBUILD cryptography-42.0.7.ebuild 3496 BLAKE2B 707b45374167c5c5dedf786db560e29962a4a4040cb944935272bb6a4b922f154d397607928349c480d9ae75aa47a0d2f212af97d48b32213e3e607b935a27cd SHA512 2c29c833f229cbde5f1f53066e94bba0db3e2376e6b78ebe25244cd801f2446ee331c91c9000a985d50480d6d581068bcaf4a1aa32079bef56e8a7423907e2c1
-EBUILD cryptography-42.0.8.ebuild 3399 BLAKE2B 73250668a8784cc9b78a58a90f53f348e4e79216cd60ef4c4d644d89e8eda05a519ceb15c91d402e8fac407bb8fefb3d3d4a9c600af3829616586b2341f7cd36 SHA512 b3bed12650f7bd70bf67e6d6d83cc9cf97f9dfebe99f7f48e023e7505477e04bfbcb01ac2fafd993f5dbb698c4983ddba7d70a4a3c38fce3894009b60f26d87d
+EBUILD cryptography-42.0.8.ebuild 3510 BLAKE2B 50a522cd6845cc1952d947c90583ff004f9fb3dcdad70f2bed5fa0474e1682d300f07fe794f5186121c5c051c241f2f57d8d83d6048f53450131c5627d063a91 SHA512 feb2a637d065dcfe8cff8374b26f7ec30099a9c333cd14250aac28e710804a2ae7a015624fe4dba41ed0b9f399fb206b13eefc3e5543c6f80901d55270da2fd8
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-42.0.7.ebuild b/dev-python/cryptography/cryptography-42.0.7.ebuild
deleted file mode 100644
index 2e899230dc03..000000000000
--- a/dev-python/cryptography/cryptography-42.0.7.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
-	asn1@0.15.5
-	asn1_derive@0.15.5
-	autocfg@1.1.0
-	base64@0.21.7
-	bitflags@1.3.2
-	bitflags@2.4.2
-	cc@1.0.83
-	cfg-if@1.0.0
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	heck@0.4.1
-	indoc@2.0.4
-	libc@0.2.152
-	lock_api@0.4.11
-	memoffset@0.9.0
-	once_cell@1.19.0
-	openssl-macros@0.1.1
-	openssl-sys@0.9.102
-	openssl@0.10.64
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	pem@3.0.3
-	pkg-config@0.3.29
-	portable-atomic@1.6.0
-	proc-macro2@1.0.78
-	pyo3-build-config@0.20.3
-	pyo3-ffi@0.20.3
-	pyo3-macros-backend@0.20.3
-	pyo3-macros@0.20.3
-	pyo3@0.20.3
-	quote@1.0.35
-	redox_syscall@0.4.1
-	scopeguard@1.2.0
-	self_cell@1.0.3
-	smallvec@1.13.1
-	syn@2.0.48
-	target-lexicon@0.12.13
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	vcpkg@0.2.15
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit cargo distutils-r1 flag-o-matic multiprocessing pypi
-
-VEC_P=cryptography_vectors-$(ver_cut 1-3)
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="
-	https://github.com/pyca/cryptography/
-	https://pypi.org/project/cryptography/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-	test? (
-		$(pypi_sdist_url cryptography_vectors "$(ver_cut 1-3)")
-	)
-"
-
-LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2o-r6:0=
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-DEPEND="
-	${RDEPEND}
-"
-# XXX: Drop explicit >=virtual/rust-1.56.0 dep once that's the minimum in cargo.eclass
-# and replace it with ${RUST_DEPEND}
-BDEPEND="
-	>=dev-python/setuptools-rust-1.7.0[${PYTHON_USEDEP}]
-	>=virtual/rust-1.56.0
-	test? (
-		dev-python/certifi[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/pyca/cryptography/pull/10366
-		"${FILESDIR}/${P}-32bit.patch"
-	)
-
-	default
-
-	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
-
-	# work around availability macros not supported in GCC (yet)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local darwinok=0
-		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
-			darwinok=1
-		fi
-		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
-			src/_cffi_src/openssl/src/osrandom_engine.c || die
-	fi
-}
-
-python_configure_all() {
-	filter-lto # bug #903908
-
-	export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
-}
-
-python_test() {
-	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
-	local EPYTEST_IGNORE=(
-		tests/bench
-	)
-	epytest -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/cryptography/cryptography-42.0.8.ebuild b/dev-python/cryptography/cryptography-42.0.8.ebuild
index 8e01e42b6211..993cd694564b 100644
--- a/dev-python/cryptography/cryptography-42.0.8.ebuild
+++ b/dev-python/cryptography/cryptography-42.0.8.ebuild
@@ -81,7 +81,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
@@ -119,6 +119,11 @@ src_unpack() {
 }
 
 src_prepare() {
+	local PATCHES=(
+		# https://github.com/pyca/cryptography/pull/10366
+		"${FILESDIR}/${PN}-42.0.7-32bit.patch"
+	)
+
 	default
 
 	sed -i -e 's:--benchmark-disable::' pyproject.toml || die