gentoo auto-resync : 29:01:2024 - 12:57:49

4 files changed, 2 insertions, 139 deletions

diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 885881fa0c1f..9675ce9193be 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,7 +1,4 @@
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
-AUX pycryptodome-3.19.1-gcc14-configure.patch 2114 BLAKE2B 5a2b9f3b22ec39b805b632c50ab6a244a725088b5dd35bba7e5ab2814727870360825e7e5c794af36c57c85a0e1d7bd1c1a878fd2000edb5b294884e0712c254 SHA512 fbbfb4dee2d44460d1079dea8971c54f2d641394d26628a50fe1cb03f62cf9c6e99e7e4926a38bab30475c28411d16a5ec4d4bf30d3014d26933e3988e7590dc
-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
-EBUILD pycryptodome-3.19.1-r2.ebuild 1425 BLAKE2B bbc013ae51852c0971d97695f1814c9262c0b7621544f377db6dc7d442915874cc2dbcb45d51aaa0298dcc286ab1f0a242e64b8b5286af95646d4e0fe5f77cd2 SHA512 23d4a7532d420617339ccd968a3bb89a858e4c1454f9ee0f2fcbfc9f1f8ac5311e722e67e80143775a6ed5edcd7987bd5e680ea0985a1e27505716ebdb150c44
-EBUILD pycryptodome-3.20.0.ebuild 1375 BLAKE2B 697d7ec480b7f46e55591bb1c137cf27a96c5453cb741a50a86a5ebedad7abde198dda94809858ae90af88404145098f20339c1bf396f237e9ef8d1731b476b7 SHA512 2e78a831fa42a13f066e439244b57836b296693a7369564ce393d3186a0c7f263a8864adf60bedf3d5287034d980fee9fb9e5ba04b4c020bae838dc03a698935
+EBUILD pycryptodome-3.20.0.ebuild 1368 BLAKE2B 612be64108abd702d61275299d8dd8460cd8e7d5ae4bc8469fe3c0031138b2809aa157d53a9182ffd7c9e59324dd8fb0ad2790e5560e685818f928985f2b2b55 SHA512 da68ebc16975933339189c9b88705b205d12c31c294f454160e6c7947051aa5dd93813bf0897b6aec5dd8795ebdbd2fb527d90aa80c7945c249d9dc4003f181c
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
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 <helderijs@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 <helderijs@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?
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.20.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.20.0.ebuild
index 5e41c1331da5..f41da6beb327 100644
--- a/dev-python/pycryptodome/pycryptodome-3.20.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.20.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 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"
+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:=