[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptodome/, dev-python/pycryptodome/files/

[Michał Górny]

commit:     ee886ca4b0ef0e3224d1c8bececb8522f6da1987
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 15:41:08 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 15:55:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee886ca4

dev-python/pycryptodome: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pycryptodome/Manifest                   |  1 -
 .../files/pycryptodome-3.9.4-parallel-make.patch   | 22 ---------
 .../pycryptodome-3.9.9-system-libtomcrypt.patch    | 43 -----------------
 .../pycryptodome/pycryptodome-3.9.9-r1.ebuild      | 54 ----------------------
 4 files changed, 120 deletions(-)

diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 4ac5d971007..024ebb61ebb 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
 DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf SHA512 4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
-DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d

diff --git a/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch b/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
deleted file mode 100644
index 331333533f1..00000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 1d70caad..c72f64ff 100644
---- a/setup.py
-+++ b/setup.py
-@@ -364,7 +364,7 @@ ext_modules = [
-     Extension("Crypto.Cipher._raw_eksblowfish",
-         include_dirs=['src/'],
-         define_macros=[('EKS',None),],
--        sources=["src/blowfish.c"]),
-+        sources=["src/blowfish_eks.c"]),
-     Extension("Crypto.Cipher._raw_cast",
-         include_dirs=['src/'],
-         sources=["src/CAST.c"]),
-@@ -427,7 +427,7 @@ ext_modules = [
-     # Math
-     Extension("Crypto.Math._modexp",
-         include_dirs=['src/'],
--        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont.c'],
-+        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont_math.c'],
-         ),
- ]
- 

diff --git a/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch b/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
deleted file mode 100644
index 927ad65e7c4..00000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/setup.py	2019-01-19 22:52:55.000000000 +0100
-+++ b/setup.py	2019-02-15 15:29:46.960976879 +0100
-@@ -367,11 +367,13 @@ ext_modules = [
-         include_dirs=['src/'],
-         sources=["src/CAST.c"]),
-     Extension("Crypto.Cipher._raw_des",
--        include_dirs=['src/', 'src/libtom/'],
--        sources=["src/DES.c"]),
-+        include_dirs=['src/'],
-+        sources=["src/DES.c"],
-+        extra_link_args=["-ltomcrypt"]),
-     Extension("Crypto.Cipher._raw_des3",
--        include_dirs=['src/', 'src/libtom/'],
--        sources=["src/DES3.c"]),
-+        include_dirs=['src/'],
-+        sources=["src/DES3.c"],
-+        extra_link_args=["-ltomcrypt"]),
-     Extension("Crypto.Util._cpuid_c",
-         include_dirs=['src/'],
-         sources=['src/cpuid.c']),
-@@ -400,8 +402,9 @@ ext_modules = [
-         include_dirs=['src/'],
-         sources=["src/ARC4.c"]),
-     Extension("Crypto.Cipher._Salsa20",
--        include_dirs=['src/', 'src/libtom/'],
--        sources=["src/Salsa20.c"]),
-+        include_dirs=['src/'],
-+        sources=["src/Salsa20.c"],
-+        extra_link_args=["-ltomcrypt"]),
-     Extension("Crypto.Cipher._chacha20",
-         include_dirs=['src/'],
-         sources=["src/chacha20.c"]),
---- a/src/DES.c	2019-01-19 22:52:55.000000000 +0100
-+++ b/src/DES.c	2019-02-15 15:30:27.014967034 +0100
-@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3)
- 
- /* Include the actial DES implementation */
- #define LTC_NO_PROTOTYPES
--#include "libtom/tomcrypt_des.c"
-+#include <tomcrypt.h>
- 
- struct block_state {
-     symmetric_key sk;

diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
deleted file mode 100644
index 50c3a515eb5..00000000000
--- a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} 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}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE=""
-
-DEPEND="
-	dev-libs/gmp:0=
-	>=dev-libs/libtomcrypt-1.18.2-r1:="
-BDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-	!dev-python/pycrypto"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-	"${FILESDIR}/pycryptodome-3.9.9-system-libtomcrypt.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# parallel make fixes
-	#  Multiple targets were compiling the same file, setuptools doesn't
-	#  understand this and you get race conditions where a file gets
-	#  overwritten while it's linking. This makes the files look like separate
-	#  files so this race won't happen
-	ln src/blowfish.c src/blowfish_eks.c || die
-	ln src/mont.c src/mont_math.c || die
-
-	# make sure we're unbundling it correctly
-	rm -r src/libtom || die
-
-	distutils-r1_python_prepare_all
-}