gentoo resync : 16.04.2022

3 files changed, 2 insertions, 79 deletions

diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 31ff54d328fd..37f87604f7f3 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -50,7 +50,6 @@ DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cryptography-3.4.7-r2.ebuild 2172 BLAKE2B 98630de3f319af4e148989cedfc8c53ada6b81f188af90ebe1f117f55addd61017359d248ae354b868d4b2592acb21c752306d34e4d97d3e470454c9c91918da SHA512 6f90e044e4f79617a522bd8c4e299b4a920e60c2f97bdd059a38ce0dffb88182915483982716abfe8d39ae5910fbc9fec622a7247a3bf5f3330c5780ff6e0a0c
-EBUILD cryptography-3.4.7-r3.ebuild 2196 BLAKE2B 0a9c55bda7092913baa8fd982f1c62cd0deb40ae3167faf3f8ec86097b5e88236c95417bc93a7f86929ae04adc36e30c96580228b66ece8dd106e627d4f180c1 SHA512 7218eff44b397e12a9598794202d8c330fdbd9534e4cae5be9d8849beeb33941813c49a72dd1826e1a05269bd4c9a712db5358ae71bdc7a92fc5e9302f991338
+EBUILD cryptography-3.4.7-r3.ebuild 2195 BLAKE2B c5b7cac31b4d2b90e956477d4238e1c8e29dd6d19be744baf0ab4e2559c5787da6c5495f06b08ad035c45eed5e2d2a842ecbaa855098feae53c51239973e313b SHA512 636652819fd52bd2c91533bebd039b651bee8d2837a1123c9e2ec380834b9311f11b1f9fa216d6c56c3976e095c268af006752117c38ba484cb3d5e70412766a
 EBUILD cryptography-36.0.0.ebuild 2947 BLAKE2B bbf4b90b241f004645bec64847de4b30663c6e8e493500132f173ccf04d18908eda35f365c547a70ae524be81cbdab460830979c1a29c5c4a7b18faef84a1003 SHA512 677f0f736ba3b1cde9fe630431ae8ba2f590bc642467f424eb7b387df7d3017c834ed6249dfd5c6d12d84af38d0159efa4997df2792cd201761fd13de971120d
 MISC metadata.xml 385 BLAKE2B 28c12f0c0303afca4d0fb015a1ed123efb559686e71477b3120291164a01f219c0dce373d7f4f7380ced372343945a8ee1ce875c27851d3864a468ba48eb2cc1 SHA512 f80a4794ae57fc9e434679ccdd0ff4cc5e2c4fb48274cca32316f827dd6d4cd3b903cb45f52abdd4893866987d4d1026f7ddb1efaa76cb99e0f55d01e8433b83
diff --git a/dev-python/cryptography/cryptography-3.4.7-r2.ebuild b/dev-python/cryptography/cryptography-3.4.7-r2.ebuild
deleted file mode 100644
index 6f1e87cf55b4..000000000000
--- a/dev-python/cryptography/cryptography-3.4.7-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 multiprocessing
-
-VEC_P=cryptography_vectors-${PV}
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-	"
-BDEPEND="
-	test? (
-		>=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/pytz[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2o-r6:0=
-	"
-RDEPEND+=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-src_prepare() {
-	default
-
-	# avoid automagic dependency on dev-libs/openssl[sslv3]
-	# https://bugs.gentoo.org/789450
-	export CPPFLAGS="${CPPFLAGS} -DOPENSSL_NO_SSL3_METHOD=1"
-
-	# 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
-
-	# this version does not really use Rust, it just creates a dummy
-	# extension to break stuff
-	export CRYPTOGRAPHY_DONT_BUILD_RUST=1
-	sed -e 's:from setuptools_rust import RustExtension:pass:' \
-		-e '/setup_requires/d' \
-		-i setup.py || die
-}
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/cryptography/cryptography-3.4.7-r3.ebuild b/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
index b2833f722b2d..806ca75de6ed 100644
--- a/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '