commit: 203e79d928d23676a00e8253d18058a7afd954a1 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Jan 29 10:17:28 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Jan 29 10:24:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203e79d9
dev-python/pycryptodome: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pycryptodome/Manifest | 1 - .../pycryptodome-3.19.1-gcc14-configure.patch | 73 ---------------------- .../pycryptodome/pycryptodome-3.19.1-r2.ebuild | 61 ------------------ 3 files changed, 135 deletions(-) diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest index adb8f8df01c8..49c39d87d206 100644 --- a/dev-python/pycryptodome/Manifest +++ b/dev-python/pycryptodome/Manifest @@ -1,2 +1 @@ -DIST pycryptodome-3.19.1.gh.tar.gz 17158420 BLAKE2B 2180bb37e2295f0499c6d00237207513ad6c186ff8fd8fac466cc43efa9b068cf8a272b5ae30da08d37db88d354d41c0b426643743251ea8460abb6ff627e3be SHA512 103910b385578732e356145247d3c1a4a3b0fe8acf22ce91f1c1155500cce2342e5caa0dff0a30825b11d7a614853c2dcb8657628f4d65682f6e543adb4db240 DIST pycryptodome-3.20.0.gh.tar.gz 17173888 BLAKE2B 7706a7f512579b4edf080b5074a9f226b2f0ef18a8f1faf74e890cfccff85d0599b4883cd5011a5cc0296b5a10cccce94cb2b948de29d785f6add04e54215a5a SHA512 0d65ccd93f9f78548c04aa3af01cb65b6a39e81bb3dfa4bb08acc5a5a731b17f9c5b07a1d1780739b3f358402a3596b04e446fc7b39345a4c6f03fd5a2de7ff9 diff --git a/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch b/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch deleted file mode 100644 index f2d24f9cf696..000000000000 --- a/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch +++ /dev/null @@ -1,73 +0,0 @@ -https://github.com/Legrandin/pycryptodome/issues/787 -https://github.com/Legrandin/pycryptodome/commit/b4083688fde0580de6c2a4d36d84da31a2549a2c -https://github.com/Legrandin/pycryptodome/commit/3f6a86e072ef0e650f04eebf086940e6d8b33c03 - -From b4083688fde0580de6c2a4d36d84da31a2549a2c Mon Sep 17 00:00:00 2001 -From: Helder Eijs <helder...@gmail.com> -Date: Fri, 29 Dec 2023 14:36:19 +0100 -Subject: [PATCH] Better autodetect of AES support, in case of aggressive - optimization - ---- a/compiler_opt.py -+++ b/compiler_opt.py -@@ -140,7 +140,7 @@ def compiler_has_intrin_h(): - { - int a, b[4]; - __cpuid(b, a); -- return 0; -+ return a; - } - """ - return test_compilation(source, msg="intrin.h header") -@@ -154,7 +154,7 @@ def compiler_has_cpuid_h(): - { - unsigned int eax, ebx, ecx, edx; - __get_cpuid(1, &eax, &ebx, &ecx, &edx); -- return 0; -+ return eax; - } - """ - return test_compilation(source, msg="cpuid.h header") -@@ -163,11 +163,16 @@ def compiler_has_cpuid_h(): - def compiler_supports_aesni(): - source = """ - #include <wmmintrin.h> -+ #include <string.h> - __m128i f(__m128i x, __m128i y) { - return _mm_aesenc_si128(x, y); - } - int main(void) { -- return 0; -+ int ret; -+ __m128i x = _mm_setzero_si128(); -+ x = f(x, x); -+ memcpy(&ret, &x, sizeof(ret)); -+ return ret; - } - """ - -From 3f6a86e072ef0e650f04eebf086940e6d8b33c03 Mon Sep 17 00:00:00 2001 -From: Helder Eijs <helder...@gmail.com> -Date: Fri, 29 Dec 2023 14:52:15 +0100 -Subject: [PATCH] Use memset, to avoid emmintrin.h - ---- - compiler_opt.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/compiler_opt.py b/compiler_opt.py -index 57db0a6f..a2711c09 100644 ---- a/compiler_opt.py -+++ b/compiler_opt.py -@@ -169,7 +169,8 @@ def compiler_supports_aesni(): - } - int main(void) { - int ret; -- __m128i x = _mm_setzero_si128(); -+ __m128i x; -+ memset(&x, 0, sizeof(x)); - x = f(x, x); - memcpy(&ret, &x, sizeof(ret)); - return ret; - - diff --git a/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild b/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild deleted file mode 100644 index 5e5ee8256d02..000000000000 --- a/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 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..12} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="A self-contained cryptographic library for Python" -HOMEPAGE=" - https://www.pycryptodome.org/ - https://github.com/Legrandin/pycryptodome/ - https://pypi.org/project/pycryptodome/ -" -SRC_URI=" - https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD-2 Unlicense" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -DEPEND=" - dev-libs/gmp:= - >=dev-libs/libtomcrypt-1.18.2-r1:= -" -BDEPEND=" - $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*') -" -RDEPEND=" - ${DEPEND} - ${BDEPEND} -" - -PATCHES=( - "${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch" - "${FILESDIR}/pycryptodome-3.19.1-gcc14-configure.patch" -) - -python_prepare_all() { - # make sure we're unbundling it correctly - rm -r src/libtom || die - - distutils-r1_python_prepare_all -} - -python_test() { - local -x PYTHONPATH=${S}/test_vectors:${PYTHONPATH} - "${EPYTHON}" - <<-EOF || die - import sys - from Crypto import SelfTest - SelfTest.run(verbosity=2, stream=sys.stdout) - EOF - - # TODO: run cmake tests from src/test? -}
