1 |
commit: 5ea4b6b615f78ace81eba3a21e3d2bfb624e3d97 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 18 17:39:37 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 18 17:39:37 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ea4b6b6 |
7 |
|
8 |
dev-libs/libgcrypt: drop 1.8.6, 1.9.1-r1, 1.9.2, 1.9.3 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
dev-libs/libgcrypt/Manifest | 4 - |
13 |
.../libgcrypt-1.9.1-fix-no-asm-on-amd64-x86.patch | 141 --------------------- |
14 |
dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild | 77 ----------- |
15 |
dev-libs/libgcrypt/libgcrypt-1.9.1-r1.ebuild | 88 ------------- |
16 |
dev-libs/libgcrypt/libgcrypt-1.9.2.ebuild | 86 ------------- |
17 |
dev-libs/libgcrypt/libgcrypt-1.9.3.ebuild | 86 ------------- |
18 |
6 files changed, 482 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest |
21 |
index 1d1e4d9d62a..5a23e33ec52 100644 |
22 |
--- a/dev-libs/libgcrypt/Manifest |
23 |
+++ b/dev-libs/libgcrypt/Manifest |
24 |
@@ -1,7 +1,3 @@ |
25 |
-DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b |
26 |
DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060 |
27 |
DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e9c83acc5547a4d43ef9ada9b0b7c78654cdc24f6cd0db012d50628ae4ec9320dcb63a901ec2dadde6a7ed56dbed7e SHA512 9861f3b5da3cb013eb79efbf2859864f8c2c11b41484b051c981c45cc0bf1569202838226da10ebddeb7a7b7f39ebd3a95f107b9bf6f908074ccc9a51ea94db8 |
28 |
-DIST libgcrypt-1.9.1.tar.bz2 3202683 BLAKE2B 102a61c855fb4a9e5c9433f52988ea87db7672de6586ed47f888526369d0ef8ad640752ca1ef144c2db73ce90464d6624cc3b12dbdeaf568d706222af3955672 SHA512 e8a028724cf5476fff0ca82c5c279a64b3bc5d1fd1472b784df4084b185266825baffc49e27b90db7453c8faef68cd0b8264f379abacee629bbdf6b11f2a28d6 |
29 |
-DIST libgcrypt-1.9.2.tar.bz2 3206187 BLAKE2B e0ceb02b0c26a7246c4146640a9dcea01429a365bd484532b9d85fdb0c8f4ac1308862e70899a1593f4665e4b2d16ceaa10029702f67720897975258a25d8ab0 SHA512 d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016 |
30 |
-DIST libgcrypt-1.9.3.tar.bz2 3219061 BLAKE2B 51a6273ba28829c016d9a93fffa181aec24170d0e4d3a363c788f336219e1531274344adeea289f3cc09161fdb2e56846551367a8ac880b14e03a52ab0dd551a SHA512 977e766887c14f19aa1b9fcc0214303036a649e41cd4278de76da7d734cf36888e2e1b6275590dac523dcb4ba8ab07993e6ee8209fd5f1a3383d738b09a060d6 |
31 |
DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60 |
32 |
|
33 |
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.9.1-fix-no-asm-on-amd64-x86.patch b/dev-libs/libgcrypt/files/libgcrypt-1.9.1-fix-no-asm-on-amd64-x86.patch |
34 |
deleted file mode 100644 |
35 |
index 875c2237008..00000000000 |
36 |
--- a/dev-libs/libgcrypt/files/libgcrypt-1.9.1-fix-no-asm-on-amd64-x86.patch |
37 |
+++ /dev/null |
38 |
@@ -1,141 +0,0 @@ |
39 |
-Broken in https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=8d404a629167d67ed56e45de3e65d1e0b7cdeb24;hp=3b34bd6e178614d6021ee7d1140646f7c8ed7519 |
40 |
-https://dev.gnupg.org/T5277 |
41 |
-https://bugs.gentoo.org/767859 |
42 |
- |
43 |
-This is a revert of that commit, as suggested by upstream in the linked bug. |
44 |
-diff --git a/random/rand-internal.h b/random/rand-internal.h |
45 |
-index 34221569..d99c6671 100644 |
46 |
---- a/random/rand-internal.h |
47 |
-+++ b/random/rand-internal.h |
48 |
-@@ -141,7 +141,7 @@ void _gcry_rndhw_poll_fast (void (*add)(const void*, size_t, |
49 |
- enum random_origins origin); |
50 |
- size_t _gcry_rndhw_poll_slow (void (*add)(const void*, size_t, |
51 |
- enum random_origins), |
52 |
-- enum random_origins origin, size_t req_length); |
53 |
-+ enum random_origins origin); |
54 |
- |
55 |
- |
56 |
- |
57 |
-diff --git a/random/rndhw.c b/random/rndhw.c |
58 |
-index 3cf9acc3..2829382c 100644 |
59 |
---- a/random/rndhw.c |
60 |
-+++ b/random/rndhw.c |
61 |
-@@ -198,33 +198,24 @@ _gcry_rndhw_poll_fast (void (*add)(const void*, size_t, enum random_origins), |
62 |
- |
63 |
- |
64 |
- /* Read 64 bytes from a hardware RNG and return the number of bytes |
65 |
-- actually read. However hardware source is let account only |
66 |
-- for up to 50% (or 25% for RDRAND) of the requested bytes. */ |
67 |
-+ actually read. */ |
68 |
- size_t |
69 |
- _gcry_rndhw_poll_slow (void (*add)(const void*, size_t, enum random_origins), |
70 |
-- enum random_origins origin, size_t req_length) |
71 |
-+ enum random_origins origin) |
72 |
- { |
73 |
- size_t nbytes = 0; |
74 |
- |
75 |
- (void)add; |
76 |
- (void)origin; |
77 |
- |
78 |
-- req_length /= 2; /* Up to 50%. */ |
79 |
-- |
80 |
- #ifdef USE_DRNG |
81 |
- if ((_gcry_get_hw_features () & HWF_INTEL_RDRAND)) |
82 |
-- { |
83 |
-- req_length /= 2; /* Up to 25%. */ |
84 |
-- nbytes += poll_drng (add, origin, 0); |
85 |
-- } |
86 |
-+ nbytes += poll_drng (add, origin, 0); |
87 |
- #endif |
88 |
- #ifdef USE_PADLOCK |
89 |
- if ((_gcry_get_hw_features () & HWF_PADLOCK_RNG)) |
90 |
- nbytes += poll_padlock (add, origin, 0); |
91 |
- #endif |
92 |
- |
93 |
-- if (nbytes > req_length) |
94 |
-- nbytes = req_length; |
95 |
-- |
96 |
- return nbytes; |
97 |
- } |
98 |
-diff --git a/random/rndlinux.c b/random/rndlinux.c |
99 |
-index a22db177..f378a549 100644 |
100 |
---- a/random/rndlinux.c |
101 |
-+++ b/random/rndlinux.c |
102 |
-@@ -190,10 +190,19 @@ _gcry_rndlinux_gather_random (void (*add)(const void*, size_t, |
103 |
- } |
104 |
- |
105 |
- |
106 |
-- /* First read from a hardware source. Note that _gcry_rndhw_poll_slow lets |
107 |
-- it account only for up to 50% (or 25% for RDRAND) of the requested |
108 |
-- bytes. */ |
109 |
-- n_hw = _gcry_rndhw_poll_slow (add, origin, length); |
110 |
-+ /* First read from a hardware source. However let it account only |
111 |
-+ for up to 50% (or 25% for RDRAND) of the requested bytes. */ |
112 |
-+ n_hw = _gcry_rndhw_poll_slow (add, origin); |
113 |
-+ if ((_gcry_get_hw_features () & HWF_INTEL_RDRAND)) |
114 |
-+ { |
115 |
-+ if (n_hw > length/4) |
116 |
-+ n_hw = length/4; |
117 |
-+ } |
118 |
-+ else |
119 |
-+ { |
120 |
-+ if (n_hw > length/2) |
121 |
-+ n_hw = length/2; |
122 |
-+ } |
123 |
- if (length > 1) |
124 |
- length -= n_hw; |
125 |
- |
126 |
-diff --git a/src/g10lib.h b/src/g10lib.h |
127 |
-index 243997eb..cba2e237 100644 |
128 |
---- a/src/g10lib.h |
129 |
-+++ b/src/g10lib.h |
130 |
-@@ -217,8 +217,6 @@ char **_gcry_strtokenize (const char *string, const char *delim); |
131 |
- |
132 |
- |
133 |
- /*-- src/hwfeatures.c --*/ |
134 |
--#if defined(HAVE_CPU_ARCH_X86) |
135 |
-- |
136 |
- #define HWF_PADLOCK_RNG (1 << 0) |
137 |
- #define HWF_PADLOCK_AES (1 << 1) |
138 |
- #define HWF_PADLOCK_SHA (1 << 2) |
139 |
-@@ -238,28 +236,20 @@ char **_gcry_strtokenize (const char *string, const char *delim); |
140 |
- #define HWF_INTEL_RDTSC (1 << 15) |
141 |
- #define HWF_INTEL_SHAEXT (1 << 16) |
142 |
- |
143 |
--#elif defined(HAVE_CPU_ARCH_ARM) |
144 |
-- |
145 |
--#define HWF_ARM_NEON (1 << 0) |
146 |
--#define HWF_ARM_AES (1 << 1) |
147 |
--#define HWF_ARM_SHA1 (1 << 2) |
148 |
--#define HWF_ARM_SHA2 (1 << 3) |
149 |
--#define HWF_ARM_PMULL (1 << 4) |
150 |
-- |
151 |
--#elif defined(HAVE_CPU_ARCH_PPC) |
152 |
-+#define HWF_ARM_NEON (1 << 17) |
153 |
-+#define HWF_ARM_AES (1 << 18) |
154 |
-+#define HWF_ARM_SHA1 (1 << 19) |
155 |
-+#define HWF_ARM_SHA2 (1 << 20) |
156 |
-+#define HWF_ARM_PMULL (1 << 21) |
157 |
- |
158 |
--#define HWF_PPC_VCRYPTO (1 << 0) |
159 |
--#define HWF_PPC_ARCH_3_00 (1 << 1) |
160 |
--#define HWF_PPC_ARCH_2_07 (1 << 2) |
161 |
-+#define HWF_PPC_VCRYPTO (1 << 22) |
162 |
-+#define HWF_PPC_ARCH_3_00 (1 << 23) |
163 |
-+#define HWF_PPC_ARCH_2_07 (1 << 24) |
164 |
- |
165 |
--#elif defined(HAVE_CPU_ARCH_S390X) |
166 |
-- |
167 |
--#define HWF_S390X_MSA (1 << 0) |
168 |
--#define HWF_S390X_MSA_4 (1 << 1) |
169 |
--#define HWF_S390X_MSA_8 (1 << 2) |
170 |
--#define HWF_S390X_VX (1 << 3) |
171 |
-- |
172 |
--#endif |
173 |
-+#define HWF_S390X_MSA (1 << 25) |
174 |
-+#define HWF_S390X_MSA_4 (1 << 26) |
175 |
-+#define HWF_S390X_MSA_8 (1 << 27) |
176 |
-+#define HWF_S390X_VX (1 << 28) |
177 |
- |
178 |
- gpg_err_code_t _gcry_disable_hw_feature (const char *name); |
179 |
- void _gcry_detect_hw_features (void); |
180 |
|
181 |
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild |
182 |
deleted file mode 100644 |
183 |
index 104cd442afc..00000000000 |
184 |
--- a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild |
185 |
+++ /dev/null |
186 |
@@ -1,77 +0,0 @@ |
187 |
-# Copyright 1999-2021 Gentoo Authors |
188 |
-# Distributed under the terms of the GNU General Public License v2 |
189 |
- |
190 |
-EAPI=7 |
191 |
- |
192 |
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
193 |
- |
194 |
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG" |
195 |
-HOMEPAGE="https://www.gnupg.org/" |
196 |
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
197 |
- |
198 |
-LICENSE="LGPL-2.1 MIT" |
199 |
-SLOT="0/20" # subslot = soname major version |
200 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
201 |
-IUSE="doc o-flag-munging static-libs" |
202 |
- |
203 |
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" |
204 |
-DEPEND="${RDEPEND}" |
205 |
-BDEPEND="doc? ( virtual/texi2dvi )" |
206 |
- |
207 |
-PATCHES=( |
208 |
- "${FILESDIR}"/${PN}-1.6.1-uscore.patch |
209 |
- "${FILESDIR}"/${PN}-multilib-syspath.patch |
210 |
-) |
211 |
- |
212 |
-MULTILIB_CHOST_TOOLS=( |
213 |
- /usr/bin/libgcrypt-config |
214 |
-) |
215 |
- |
216 |
-src_prepare() { |
217 |
- default |
218 |
- eautoreconf |
219 |
-} |
220 |
- |
221 |
-multilib_src_configure() { |
222 |
- if [[ ${CHOST} == *86*-solaris* ]] ; then |
223 |
- # ASM code uses GNU ELF syntax, divide in particular, we need to |
224 |
- # allow this via ASFLAGS, since we don't have a flag-o-matic |
225 |
- # function for that, we'll have to abuse cflags for this |
226 |
- append-cflags -Wa,--divide |
227 |
- fi |
228 |
- local myeconfargs=( |
229 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" |
230 |
- --enable-noexecstack |
231 |
- # required for sys-power/suspend[crypt], bug 751568 |
232 |
- $(use_enable static-libs static) |
233 |
- $(use_enable o-flag-munging O-flag-munging) |
234 |
- |
235 |
- # disabled due to various applications requiring privileges |
236 |
- # after libgcrypt drops them (bug #468616) |
237 |
- --without-capabilities |
238 |
- |
239 |
- # http://trac.videolan.org/vlc/ticket/620 |
240 |
- # causes bus-errors on sparc64-solaris |
241 |
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") |
242 |
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") |
243 |
- |
244 |
- GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" |
245 |
- ) |
246 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ |
247 |
- $("${S}/configure" --help | grep -o -- '--without-.*-prefix') |
248 |
-} |
249 |
- |
250 |
-multilib_src_compile() { |
251 |
- default |
252 |
- multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf |
253 |
-} |
254 |
- |
255 |
-multilib_src_install() { |
256 |
- emake DESTDIR="${D}" install |
257 |
- multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf |
258 |
-} |
259 |
- |
260 |
-multilib_src_install_all() { |
261 |
- default |
262 |
- find "${D}" -type f -name '*.la' -delete || die |
263 |
-} |
264 |
|
265 |
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.1-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.1-r1.ebuild |
266 |
deleted file mode 100644 |
267 |
index 8ba8d90c7b2..00000000000 |
268 |
--- a/dev-libs/libgcrypt/libgcrypt-1.9.1-r1.ebuild |
269 |
+++ /dev/null |
270 |
@@ -1,88 +0,0 @@ |
271 |
-# Copyright 1999-2021 Gentoo Authors |
272 |
-# Distributed under the terms of the GNU General Public License v2 |
273 |
- |
274 |
-EAPI=7 |
275 |
- |
276 |
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
277 |
- |
278 |
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG" |
279 |
-HOMEPAGE="https://www.gnupg.org/" |
280 |
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
281 |
- |
282 |
-LICENSE="LGPL-2.1 MIT" |
283 |
-SLOT="0/20" # subslot = soname major version |
284 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
285 |
-IUSE="+asm cpu_flags_arm_neon cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc o-flag-munging static-libs" |
286 |
- |
287 |
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" |
288 |
-DEPEND="${RDEPEND}" |
289 |
-BDEPEND="doc? ( virtual/texi2dvi )" |
290 |
- |
291 |
-PATCHES=( |
292 |
- "${FILESDIR}"/${PN}-1.6.1-uscore.patch |
293 |
- "${FILESDIR}"/${PN}-multilib-syspath.patch |
294 |
- "${FILESDIR}"/${PN}-1.9.1-fix-no-asm-on-amd64-x86.patch |
295 |
-) |
296 |
- |
297 |
-MULTILIB_CHOST_TOOLS=( |
298 |
- /usr/bin/libgcrypt-config |
299 |
-) |
300 |
- |
301 |
-src_prepare() { |
302 |
- default |
303 |
- eautoreconf |
304 |
-} |
305 |
- |
306 |
-multilib_src_configure() { |
307 |
- if [[ ${CHOST} == *86*-solaris* ]] ; then |
308 |
- # ASM code uses GNU ELF syntax, divide in particular, we need to |
309 |
- # allow this via ASFLAGS, since we don't have a flag-o-matic |
310 |
- # function for that, we'll have to abuse cflags for this |
311 |
- append-cflags -Wa,--divide |
312 |
- fi |
313 |
- local myeconfargs=( |
314 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" |
315 |
- |
316 |
- --enable-noexecstack |
317 |
- $(use_enable cpu_flags_arm_neon neon-support) |
318 |
- $(use_enable cpu_flags_x86_aes aesni-support) |
319 |
- $(use_enable cpu_flags_x86_avx avx-support) |
320 |
- $(use_enable cpu_flags_x86_avx2 avx2-support) |
321 |
- $(use_enable cpu_flags_x86_padlock padlock-support) |
322 |
- $(use_enable cpu_flags_x86_sha shaext-support) |
323 |
- $(use_enable cpu_flags_x86_sse4_1 sse41-support) |
324 |
- # required for sys-power/suspend[crypt], bug 751568 |
325 |
- $(use_enable static-libs static) |
326 |
- $(use_enable o-flag-munging O-flag-munging) |
327 |
- |
328 |
- # disabled due to various applications requiring privileges |
329 |
- # after libgcrypt drops them (bug #468616) |
330 |
- --without-capabilities |
331 |
- |
332 |
- # http://trac.videolan.org/vlc/ticket/620 |
333 |
- # causes bus-errors on sparc64-solaris |
334 |
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") |
335 |
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") |
336 |
- |
337 |
- $(use asm || echo "--disable-asm") |
338 |
- |
339 |
- GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" |
340 |
- ) |
341 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ |
342 |
- $("${S}/configure" --help | grep -o -- '--without-.*-prefix') |
343 |
-} |
344 |
- |
345 |
-multilib_src_compile() { |
346 |
- default |
347 |
- multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf |
348 |
-} |
349 |
- |
350 |
-multilib_src_install() { |
351 |
- emake DESTDIR="${D}" install |
352 |
- multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf |
353 |
-} |
354 |
- |
355 |
-multilib_src_install_all() { |
356 |
- default |
357 |
- find "${ED}" -type f -name '*.la' -delete || die |
358 |
-} |
359 |
|
360 |
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.2.ebuild |
361 |
deleted file mode 100644 |
362 |
index 584154b6ff2..00000000000 |
363 |
--- a/dev-libs/libgcrypt/libgcrypt-1.9.2.ebuild |
364 |
+++ /dev/null |
365 |
@@ -1,86 +0,0 @@ |
366 |
-# Copyright 1999-2021 Gentoo Authors |
367 |
-# Distributed under the terms of the GNU General Public License v2 |
368 |
- |
369 |
-EAPI=7 |
370 |
- |
371 |
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
372 |
- |
373 |
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG" |
374 |
-HOMEPAGE="https://www.gnupg.org/" |
375 |
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
376 |
- |
377 |
-LICENSE="LGPL-2.1 MIT" |
378 |
-SLOT="0/20" # subslot = soname major version |
379 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
380 |
-IUSE="+asm cpu_flags_arm_neon cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc o-flag-munging static-libs" |
381 |
- |
382 |
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" |
383 |
-DEPEND="${RDEPEND}" |
384 |
-BDEPEND="doc? ( virtual/texi2dvi )" |
385 |
- |
386 |
-PATCHES=( |
387 |
- "${FILESDIR}"/${PN}-multilib-syspath.patch |
388 |
-) |
389 |
- |
390 |
-MULTILIB_CHOST_TOOLS=( |
391 |
- /usr/bin/libgcrypt-config |
392 |
-) |
393 |
- |
394 |
-src_prepare() { |
395 |
- default |
396 |
- eautoreconf |
397 |
-} |
398 |
- |
399 |
-multilib_src_configure() { |
400 |
- if [[ ${CHOST} == *86*-solaris* ]] ; then |
401 |
- # ASM code uses GNU ELF syntax, divide in particular, we need to |
402 |
- # allow this via ASFLAGS, since we don't have a flag-o-matic |
403 |
- # function for that, we'll have to abuse cflags for this |
404 |
- append-cflags -Wa,--divide |
405 |
- fi |
406 |
- local myeconfargs=( |
407 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" |
408 |
- |
409 |
- --enable-noexecstack |
410 |
- $(use_enable cpu_flags_arm_neon neon-support) |
411 |
- $(use_enable cpu_flags_x86_aes aesni-support) |
412 |
- $(use_enable cpu_flags_x86_avx avx-support) |
413 |
- $(use_enable cpu_flags_x86_avx2 avx2-support) |
414 |
- $(use_enable cpu_flags_x86_padlock padlock-support) |
415 |
- $(use_enable cpu_flags_x86_sha shaext-support) |
416 |
- $(use_enable cpu_flags_x86_sse4_1 sse41-support) |
417 |
- # required for sys-power/suspend[crypt], bug 751568 |
418 |
- $(use_enable static-libs static) |
419 |
- $(use_enable o-flag-munging O-flag-munging) |
420 |
- |
421 |
- # disabled due to various applications requiring privileges |
422 |
- # after libgcrypt drops them (bug #468616) |
423 |
- --without-capabilities |
424 |
- |
425 |
- # http://trac.videolan.org/vlc/ticket/620 |
426 |
- # causes bus-errors on sparc64-solaris |
427 |
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") |
428 |
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") |
429 |
- |
430 |
- $(use asm || echo "--disable-asm") |
431 |
- |
432 |
- GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" |
433 |
- ) |
434 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ |
435 |
- $("${S}/configure" --help | grep -o -- '--without-.*-prefix') |
436 |
-} |
437 |
- |
438 |
-multilib_src_compile() { |
439 |
- default |
440 |
- multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf |
441 |
-} |
442 |
- |
443 |
-multilib_src_install() { |
444 |
- emake DESTDIR="${D}" install |
445 |
- multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf |
446 |
-} |
447 |
- |
448 |
-multilib_src_install_all() { |
449 |
- default |
450 |
- find "${ED}" -type f -name '*.la' -delete || die |
451 |
-} |
452 |
|
453 |
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.3.ebuild |
454 |
deleted file mode 100644 |
455 |
index 584154b6ff2..00000000000 |
456 |
--- a/dev-libs/libgcrypt/libgcrypt-1.9.3.ebuild |
457 |
+++ /dev/null |
458 |
@@ -1,86 +0,0 @@ |
459 |
-# Copyright 1999-2021 Gentoo Authors |
460 |
-# Distributed under the terms of the GNU General Public License v2 |
461 |
- |
462 |
-EAPI=7 |
463 |
- |
464 |
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
465 |
- |
466 |
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG" |
467 |
-HOMEPAGE="https://www.gnupg.org/" |
468 |
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
469 |
- |
470 |
-LICENSE="LGPL-2.1 MIT" |
471 |
-SLOT="0/20" # subslot = soname major version |
472 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
473 |
-IUSE="+asm cpu_flags_arm_neon cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc o-flag-munging static-libs" |
474 |
- |
475 |
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" |
476 |
-DEPEND="${RDEPEND}" |
477 |
-BDEPEND="doc? ( virtual/texi2dvi )" |
478 |
- |
479 |
-PATCHES=( |
480 |
- "${FILESDIR}"/${PN}-multilib-syspath.patch |
481 |
-) |
482 |
- |
483 |
-MULTILIB_CHOST_TOOLS=( |
484 |
- /usr/bin/libgcrypt-config |
485 |
-) |
486 |
- |
487 |
-src_prepare() { |
488 |
- default |
489 |
- eautoreconf |
490 |
-} |
491 |
- |
492 |
-multilib_src_configure() { |
493 |
- if [[ ${CHOST} == *86*-solaris* ]] ; then |
494 |
- # ASM code uses GNU ELF syntax, divide in particular, we need to |
495 |
- # allow this via ASFLAGS, since we don't have a flag-o-matic |
496 |
- # function for that, we'll have to abuse cflags for this |
497 |
- append-cflags -Wa,--divide |
498 |
- fi |
499 |
- local myeconfargs=( |
500 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" |
501 |
- |
502 |
- --enable-noexecstack |
503 |
- $(use_enable cpu_flags_arm_neon neon-support) |
504 |
- $(use_enable cpu_flags_x86_aes aesni-support) |
505 |
- $(use_enable cpu_flags_x86_avx avx-support) |
506 |
- $(use_enable cpu_flags_x86_avx2 avx2-support) |
507 |
- $(use_enable cpu_flags_x86_padlock padlock-support) |
508 |
- $(use_enable cpu_flags_x86_sha shaext-support) |
509 |
- $(use_enable cpu_flags_x86_sse4_1 sse41-support) |
510 |
- # required for sys-power/suspend[crypt], bug 751568 |
511 |
- $(use_enable static-libs static) |
512 |
- $(use_enable o-flag-munging O-flag-munging) |
513 |
- |
514 |
- # disabled due to various applications requiring privileges |
515 |
- # after libgcrypt drops them (bug #468616) |
516 |
- --without-capabilities |
517 |
- |
518 |
- # http://trac.videolan.org/vlc/ticket/620 |
519 |
- # causes bus-errors on sparc64-solaris |
520 |
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") |
521 |
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") |
522 |
- |
523 |
- $(use asm || echo "--disable-asm") |
524 |
- |
525 |
- GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" |
526 |
- ) |
527 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ |
528 |
- $("${S}/configure" --help | grep -o -- '--without-.*-prefix') |
529 |
-} |
530 |
- |
531 |
-multilib_src_compile() { |
532 |
- default |
533 |
- multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf |
534 |
-} |
535 |
- |
536 |
-multilib_src_install() { |
537 |
- emake DESTDIR="${D}" install |
538 |
- multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf |
539 |
-} |
540 |
- |
541 |
-multilib_src_install_all() { |
542 |
- default |
543 |
- find "${ED}" -type f -name '*.la' -delete || die |
544 |
-} |