Gentoo Archives: gentoo-commits

From: Horea Christian <horea.christ@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-python/pycryptodomex/, dev-python/pycryptodomex/files/
Date: Thu, 31 Mar 2022 17:57:57
Message-Id: 1648749409.bbadf5f8a6418119e1179ac1beb457b9272fd20b.chymera@gentoo
1 commit: bbadf5f8a6418119e1179ac1beb457b9272fd20b
2 Author: Horea Christian <chr <AT> chymera <DOT> eu>
3 AuthorDate: Thu Mar 31 17:54:51 2022 +0000
4 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
5 CommitDate: Thu Mar 31 17:56:49 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bbadf5f8
7
8 dev-python/pycryptodomex: dropped in favour of pycryptodome::gentoo
9
10 Patch example can be seen in the dev-python/keyrings_alt package.
11
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13 Signed-off-by: Horea Christian <chr <AT> chymera.eu>
14
15 .../pycryptodome-3.10.1-system-libtomcrypt.patch | 50 ----------------------
16 dev-python/pycryptodomex/metadata.xml | 21 ---------
17 .../pycryptodomex/pycryptodomex-3.10.4.ebuild | 43 -------------------
18 .../pycryptodomex/pycryptodomex-3.14.1.ebuild | 43 -------------------
19 4 files changed, 157 deletions(-)
20
21 diff --git a/dev-python/pycryptodomex/files/pycryptodome-3.10.1-system-libtomcrypt.patch b/dev-python/pycryptodomex/files/pycryptodome-3.10.1-system-libtomcrypt.patch
22 deleted file mode 100644
23 index 51a5766c1..000000000
24 --- a/dev-python/pycryptodomex/files/pycryptodome-3.10.1-system-libtomcrypt.patch
25 +++ /dev/null
26 @@ -1,50 +0,0 @@
27 -diff -dupr a/setup.py b/setup.py
28 ---- a/setup.py 2021-02-09 13:49:46.356455141 +0100
29 -+++ b/setup.py 2021-02-09 13:50:49.351076275 +0100
30 -@@ -367,13 +367,15 @@ ext_modules = [
31 - sources=["src/CAST.c"],
32 - py_limited_api=True),
33 - Extension("Crypto.Cipher._raw_des",
34 -- include_dirs=['src/', 'src/libtom/'],
35 -+ include_dirs=['src/'],
36 - sources=["src/DES.c"],
37 -- py_limited_api=True),
38 -+ py_limited_api=True,
39 -+ extra_link_args=["-ltomcrypt"]),
40 - Extension("Crypto.Cipher._raw_des3",
41 -- include_dirs=['src/', 'src/libtom/'],
42 -+ include_dirs=['src/'],
43 - sources=["src/DES3.c"],
44 -- py_limited_api=True),
45 -+ py_limited_api=True,
46 -+ extra_link_args=["-ltomcrypt"]),
47 - Extension("Crypto.Util._cpuid_c",
48 - include_dirs=['src/'],
49 - sources=['src/cpuid.c'],
50 -@@ -410,9 +412,10 @@ ext_modules = [
51 - sources=["src/ARC4.c"],
52 - py_limited_api=True),
53 - Extension("Crypto.Cipher._Salsa20",
54 -- include_dirs=['src/', 'src/libtom/'],
55 -+ include_dirs=['src/'],
56 - sources=["src/Salsa20.c"],
57 -- py_limited_api=True),
58 -+ py_limited_api=True,
59 -+ extra_link_args=["-ltomcrypt"]),
60 - Extension("Crypto.Cipher._chacha20",
61 - include_dirs=['src/'],
62 - sources=["src/chacha20.c"],
63 -Only in b: setup.py.orig
64 -Only in b: setup.py.rej
65 -diff -dupr a/src/DES.c b/src/DES.c
66 ---- a/src/DES.c 2021-02-09 13:49:46.336454729 +0100
67 -+++ b/src/DES.c 2021-02-09 13:50:02.640123617 +0100
68 -@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3)
69 -
70 - /* Include the actial DES implementation */
71 - #define LTC_NO_PROTOTYPES
72 --#include "libtom/tomcrypt_des.c"
73 -+#include <tomcrypt.h>
74 -
75 - struct block_state {
76 - symmetric_key sk;
77
78 diff --git a/dev-python/pycryptodomex/metadata.xml b/dev-python/pycryptodomex/metadata.xml
79 deleted file mode 100644
80 index f9c82e80b..000000000
81 --- a/dev-python/pycryptodomex/metadata.xml
82 +++ /dev/null
83 @@ -1,21 +0,0 @@
84 -<?xml version='1.0' encoding='UTF-8'?>
85 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
86 -<pkgmetadata>
87 - <maintainer type="person">
88 - <email>gentoo@×××××××.eu</email>
89 - <name>Horea Christian</name>
90 - </maintainer>
91 - <maintainer type="project">
92 - <email>sci@g.o</email>
93 - <name>Gentoo Science Project</name>
94 - </maintainer>
95 - <longdescription lang="en">
96 - Equivalent package to dev-python/cryptodome which installs
97 - modules under the Cryptodome package, so that PyCrypto and
98 - PyCryptodome can coexist.
99 - </longdescription>
100 - <upstream>
101 - <remote-id type="github">Legrandin/pycryptodome</remote-id>
102 - <remote-id type="pypi">pycryptodomex</remote-id>
103 - </upstream>
104 -</pkgmetadata>
105
106 diff --git a/dev-python/pycryptodomex/pycryptodomex-3.10.4.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.10.4.ebuild
107 deleted file mode 100644
108 index 0f5ad73c2..000000000
109 --- a/dev-python/pycryptodomex/pycryptodomex-3.10.4.ebuild
110 +++ /dev/null
111 @@ -1,43 +0,0 @@
112 -# Copyright 1999-2022 Gentoo Authors
113 -# Distributed under the terms of the GNU General Public License v2
114 -
115 -EAPI=8
116 -
117 -DISTUTILS_USE_PEP517=setuptools
118 -PYTHON_COMPAT=( python3_{8..10} pypy3)
119 -PYTHON_REQ_USE="threads(+)"
120 -
121 -inherit distutils-r1
122 -
123 -DESCRIPTION="Cryptographic library for Python"
124 -HOMEPAGE="https://www.pycryptodome.org https://pypi.org/project/pycryptodomex/"
125 -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
126 -
127 -LICENSE="BSD-2 Unlicense"
128 -SLOT="0"
129 -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
130 -IUSE="test"
131 -RESTRICT="!test? ( test )"
132 -
133 -DEPEND="
134 - dev-libs/gmp:0=
135 - >=dev-libs/libtomcrypt-1.18.2-r1:=
136 -"
137 -BDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
138 -RDEPEND="
139 - ${DEPEND}
140 - ${BDEPEND}
141 -"
142 -
143 -PATCHES=(
144 - "${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
145 -)
146 -
147 -distutils_enable_tests setup.py
148 -
149 -python_prepare_all() {
150 - # make sure we're unbundling it correctly
151 - rm -r src/libtom || die
152 -
153 - distutils-r1_python_prepare_all
154 -}
155
156 diff --git a/dev-python/pycryptodomex/pycryptodomex-3.14.1.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.14.1.ebuild
157 deleted file mode 100644
158 index 0f5ad73c2..000000000
159 --- a/dev-python/pycryptodomex/pycryptodomex-3.14.1.ebuild
160 +++ /dev/null
161 @@ -1,43 +0,0 @@
162 -# Copyright 1999-2022 Gentoo Authors
163 -# Distributed under the terms of the GNU General Public License v2
164 -
165 -EAPI=8
166 -
167 -DISTUTILS_USE_PEP517=setuptools
168 -PYTHON_COMPAT=( python3_{8..10} pypy3)
169 -PYTHON_REQ_USE="threads(+)"
170 -
171 -inherit distutils-r1
172 -
173 -DESCRIPTION="Cryptographic library for Python"
174 -HOMEPAGE="https://www.pycryptodome.org https://pypi.org/project/pycryptodomex/"
175 -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
176 -
177 -LICENSE="BSD-2 Unlicense"
178 -SLOT="0"
179 -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
180 -IUSE="test"
181 -RESTRICT="!test? ( test )"
182 -
183 -DEPEND="
184 - dev-libs/gmp:0=
185 - >=dev-libs/libtomcrypt-1.18.2-r1:=
186 -"
187 -BDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
188 -RDEPEND="
189 - ${DEPEND}
190 - ${BDEPEND}
191 -"
192 -
193 -PATCHES=(
194 - "${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
195 -)
196 -
197 -distutils_enable_tests setup.py
198 -
199 -python_prepare_all() {
200 - # make sure we're unbundling it correctly
201 - rm -r src/libtom || die
202 -
203 - distutils-r1_python_prepare_all
204 -}