diff options
Diffstat (limited to 'dev-python/cryptography')
| -rw-r--r-- | dev-python/cryptography/cryptography-46.0.6.ebuild | 13 | ||||
| -rw-r--r-- | dev-python/cryptography/files/cryptography-46.0.5-stray-files.patch | 48 |
2 files changed, 57 insertions, 4 deletions
diff --git a/dev-python/cryptography/cryptography-46.0.6.ebuild b/dev-python/cryptography/cryptography-46.0.6.ebuild index 30c5bbff45d3..fc142d5ff376 100644 --- a/dev-python/cryptography/cryptography-46.0.6.ebuild +++ b/dev-python/cryptography/cryptography-46.0.6.ebuild @@ -64,17 +64,17 @@ SRC_URI=" 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 + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-3.0 " SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86" +KEYWORDS="~amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="libressl" RDEPEND=" !libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= ) libressl? ( dev-libs/libressl:= ) $(python_gen_cond_dep ' - >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}] + >=dev-python/cffi-2.0.0:=[${PYTHON_USEDEP}] ' 'python*') " DEPEND=" @@ -100,6 +100,11 @@ EPYTEST_PLUGINS=( hypothesis pytest-subtests ) EPYTEST_XDIST=1 distutils_enable_tests pytest +PATCHES=( + # https://github.com/pyca/cryptography/pull/14319 + "${FILESDIR}/${PN}-46.0.5-stray-files.patch" +) + src_unpack() { cargo_src_unpack } @@ -125,7 +130,7 @@ python_configure_all() { } python_test() { - local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}" + local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/${VEC_P}" local EPYTEST_IGNORE=( tests/bench ) diff --git a/dev-python/cryptography/files/cryptography-46.0.5-stray-files.patch b/dev-python/cryptography/files/cryptography-46.0.5-stray-files.patch new file mode 100644 index 000000000000..e13bb4f560c4 --- /dev/null +++ b/dev-python/cryptography/files/cryptography-46.0.5-stray-files.patch @@ -0,0 +1,48 @@ +From b89a7737e3f135333125b0984e75ea553a485203 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sun, 15 Feb 2026 17:47:48 +0100 +Subject: [PATCH] Fix installing stray files into site-packages +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix the `include` pattern in `pyproject.toml` not to install stray files +such as `CHANGELOG.rst`, `CONTRIBUTING.rst`, `docs` and `tests` straight +into site-packages. Apparently Maturin did not install them before due +to a bug, but it was fixed in maturin 1.12.0, leading to the files being +suddenly installed. + +Originally reported as https://bugs.gentoo.org/970090. + +Signed-off-by: Michał Górny <mgorny@gentoo.org> +--- + pyproject.toml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index e26b38628..8640cb6e5 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -106,10 +106,10 @@ module-name = "cryptography.hazmat.bindings._rust" + locked = true + sdist-generator = "git" + include = [ +- "CHANGELOG.rst", +- "CONTRIBUTING.rst", ++ { path = "CHANGELOG.rst", format = "sdist" }, ++ { path = "CONTRIBUTING.rst", format = "sdist" }, + +- "docs/**/*", ++ { path = "docs/**/*", format = "sdist" }, + + { path = "src/_cffi_src/**/*.py", format = "sdist" }, + { path = "src/_cffi_src/**/*.c", format = "sdist" }, +@@ -121,7 +121,7 @@ include = [ + { path = "src/rust/**/Cargo.lock", format = "sdist" }, + { path = "src/rust/**/*.rs", format = "sdist" }, + +- "tests/**/*.py", ++ { path = "tests/**/*.py", format = "sdist" }, + ] + exclude = [ + "vectors/**/*", |