gentoo auto-resync : 29:11:2023 - 16:55:57

4 files changed, 2 insertions, 89 deletions

diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 00b1906b37f1..e4b67d793076 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,8 +1,5 @@
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
-AUX pycryptodome-3.18.0-python3.12-unittest.patch 974 BLAKE2B ceffed2878cbaa96ffeb500ecf2a855ef0e1f22b5e2f762241b3fe920b3e9117f1e4c7b7179bccdbcfd65ea12ec17a21cd697f5842610e368fc2e7b5275a40a4 SHA512 9db569a809048007eb4ef6e34426f70535a23e64e7037871eef1a65af8809022155ca31efb2eefac83f4221f03d82328645ff87b313714711d53b661c160eebf
 AUX pycryptodome-3.19.0-fix-verbosity-in-tests.patch 4023 BLAKE2B a2e93417ef67b38e4b9b938ad1b233e1e7fa1935b5363b46e35d8977e9aef4471db578cf77c93d56e41f98b9644f4e1b7e3475352a7211073fc2ae74d8dc51a7 SHA512 ae32efc54c9c4342f123814f3c80800fee480dba7076ebd37205bb83caef5e4d1d4a45d0fddb4d8ddbf86f3e239c9ac7ab1924bd576317aa8551a0069388a9d1
-DIST pycryptodome-3.18.0.gh.tar.gz 16720227 BLAKE2B dfdc3a7cc0b1aea1e7b7d8f6e8bcf651ca92f0020e2c51849512d00e716283537feb884cacdc655d99a6b992305db9b899172d022bc9ff65d6349ee40b40c4d5 SHA512 a30a6b406bfd1d4288169924924636246c36999ca1e14c5cb70bd2f71ce25739dae04726ca97bdaebf7a8b36927cc6f617fbe2599fad48512a2c5e016a528247
 DIST pycryptodome-3.19.0.gh.tar.gz 17153954 BLAKE2B 5ecaacce490e5eec052d632b1427a4e36ba19a863c28934f53f247b945bb32a1367aeaf1b8669018978bd19d53c28a00f711158c6be014779c47c48f263b2e8c SHA512 1afa71336da38efb32f79d87b442a1d50537a6908ec153be7a087027a8540cebabab12922557c92e501f2d6da5c2f35466d3bbe6a3de44540de7278069691290
-EBUILD pycryptodome-3.18.0.ebuild 1451 BLAKE2B 325731accff1f84d62f7cac266f448dfc634d8c2f86d74a8e619b950d45c0a4fa412652dbe15eb8954bd414cd4218f2bb4c314927667f4e62672f924f22ea785 SHA512 eaff84a17c372dd8dfa67b933b37a55987073c7c31439effc095c0b187f6f1ca937fe2bfb7b2e03d4cb25c182d9e5893b4102c39183d6d7e86f6be1c6945171b
-EBUILD pycryptodome-3.19.0.ebuild 1439 BLAKE2B 8022463703b062d4f8da02d1b8c75b356b971a726ade530e91607003f103405d7014aa5972c687abb0eb6c6d18a214be474a5151cdb93eebbeaf3b76ea984567 SHA512 bd20990d91061c6db92e01162ab92663e8741a53f641a33fddff127221213853e1ca21e161ff124e61e4e5544c3c65b0d09725e272d6807f51995c1ea97e0bc4
+EBUILD pycryptodome-3.19.0.ebuild 1432 BLAKE2B 93b03dffd2e33944ba1a57688f32a1c5df80ffd12ae85130c8f5862fd43a2cdc3b85472cb7c4ca4f1f83d778d4d40c3357eca9418252497c515798c9da21244f SHA512 a582e9584889bcccd8222a47bc20251575309cc8fb71ed579c8762b18834efb87f706f2e101bd82e25838185a166ed18e30345da82570a58f3ffdb305628f676
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.18.0-python3.12-unittest.patch b/dev-python/pycryptodome/files/pycryptodome-3.18.0-python3.12-unittest.patch
deleted file mode 100644
index 6e49a784af16..000000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.18.0-python3.12-unittest.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/Legrandin/pycryptodome/pull/746
-
-From 9d70fbca927516b31ef61fd7cc3ed3e0ebc95fa6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 1 Jun 2023 08:03:18 +0100
-Subject: [PATCH] Replace deprecated unittest aliases for Python 3.12
-
-See https://docs.python.org/3.12/whatsnew/3.12.html#removed.
---- a/lib/Crypto/SelfTest/PublicKey/test_import_ECC.py
-+++ b/lib/Crypto/SelfTest/PublicKey/test_import_ECC.py
-@@ -2269,9 +2269,9 @@ def test_import_x509_pem(self):
-     def test_import_openssh_public(self):
-         key_file = load_file("ecc_ed25519_public_openssh.txt")
-         key = ECC._import_openssh_public(key_file)
--        self.failIf(key.has_private())
-+        self.assertFalse(key.has_private())
-         key = ECC.import_key(key_file)
--        self.failIf(key.has_private())
-+        self.assertFalse(key.has_private())
- 
-     def test_import_openssh_private_clear(self):
-         key_file = load_file("ecc_ed25519_private_openssh.pem")
diff --git a/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild
deleted file mode 100644
index c6091d5602fe..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 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}
-	!dev-python/pycrypto
-"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
-	"${FILESDIR}/pycryptodome-3.18.0-python3.12-unittest.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.19.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.19.0.ebuild
index f7c07f2ea6a3..3efc9c7635bc 100644
--- a/dev-python/pycryptodome/pycryptodome-3.19.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.19.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:=