1 |
commit: 53a03105633eb89a469859355f23f034d15ea1e0 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 27 15:29:03 2021 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 27 15:30:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=53a03105 |
7 |
|
8 |
dev-libs/libgcrypt: migrate to gx86 |
9 |
|
10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
11 |
|
12 |
dev-libs/libgcrypt/Manifest | 3 - |
13 |
.../libgcrypt/files/libgcrypt-1.6.1-uscore.patch | 26 ------- |
14 |
.../files/libgcrypt-multilib-syspath.patch | 23 ------ |
15 |
dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild | 82 ---------------------- |
16 |
dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild | 82 ---------------------- |
17 |
dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild | 82 ---------------------- |
18 |
dev-libs/libgcrypt/metadata.xml | 15 ---- |
19 |
7 files changed, 313 deletions(-) |
20 |
|
21 |
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest |
22 |
deleted file mode 100644 |
23 |
index 5a23e33ec5..0000000000 |
24 |
--- a/dev-libs/libgcrypt/Manifest |
25 |
+++ /dev/null |
26 |
@@ -1,3 +0,0 @@ |
27 |
-DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060 |
28 |
-DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e9c83acc5547a4d43ef9ada9b0b7c78654cdc24f6cd0db012d50628ae4ec9320dcb63a901ec2dadde6a7ed56dbed7e SHA512 9861f3b5da3cb013eb79efbf2859864f8c2c11b41484b051c981c45cc0bf1569202838226da10ebddeb7a7b7f39ebd3a95f107b9bf6f908074ccc9a51ea94db8 |
29 |
-DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60 |
30 |
|
31 |
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch |
32 |
deleted file mode 100644 |
33 |
index 22bfac3104..0000000000 |
34 |
--- a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch |
35 |
+++ /dev/null |
36 |
@@ -1,26 +0,0 @@ |
37 |
-The version taken from GnuPG 1.4 assumes any cross-compiled package have |
38 |
-prefixed underscores, which is not the case; by using libtool's own macro, |
39 |
-we can avoid the whole issue. |
40 |
- |
41 |
---- libgcrypt-1.6.1/configure.ac |
42 |
-+++ libgcrypt-1.6.1/configure.ac |
43 |
-@@ -1022,7 +1022,7 @@ |
44 |
- # Check whether underscores in symbols are required. This needs to be |
45 |
- # done before setting up the assembler stuff. |
46 |
- # |
47 |
--GNUPG_SYS_SYMBOL_UNDERSCORE() |
48 |
-+LT_SYS_SYMBOL_USCORE |
49 |
- |
50 |
- |
51 |
- ################################# |
52 |
---- libgcrypt-1.6.1/mpi/config.links |
53 |
-+++ libgcrypt-1.6.1/mpi/config.links |
54 |
-@@ -362,7 +362,7 @@ |
55 |
- |
56 |
- # Make sysdep.h |
57 |
- echo '/* created by config.links - do not edit */' >./mpi/sysdep.h |
58 |
--if test x$ac_cv_sys_symbol_underscore = xyes; then |
59 |
-+if test x$sys_symbol_underscore = xyes; then |
60 |
- cat <<EOF >>./mpi/sysdep.h |
61 |
- #if __STDC__ |
62 |
- #define C_SYMBOL_NAME(name) _##name |
63 |
|
64 |
diff --git a/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch b/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch |
65 |
deleted file mode 100644 |
66 |
index 7859851ccc..0000000000 |
67 |
--- a/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch |
68 |
+++ /dev/null |
69 |
@@ -1,23 +0,0 @@ |
70 |
-diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in |
71 |
-index c052638..4c8ddc3 100644 |
72 |
---- a/src/libgcrypt-config.in |
73 |
-+++ b/src/libgcrypt-config.in |
74 |
-@@ -154,9 +154,12 @@ if test "$echo_libs" = "yes"; then |
75 |
- libs_final="$libs" |
76 |
- |
77 |
- # Set up `libdirs'. |
78 |
-- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then |
79 |
-- libdirs="-L$libdir" |
80 |
-- fi |
81 |
-+ case "$libdir" in |
82 |
-+ /usr/lib|/usr/lib64|/lib|/lib64) ;; |
83 |
-+ *) |
84 |
-+ libdirs="-L$libdir" |
85 |
-+ ;; |
86 |
-+ esac |
87 |
- |
88 |
- # Set up `libs_final'. |
89 |
- libs_final="$libs_final $gpg_error_libs" |
90 |
--- |
91 |
-1.7.6.1 |
92 |
- |
93 |
|
94 |
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild |
95 |
deleted file mode 100644 |
96 |
index 9236d04075..0000000000 |
97 |
--- a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild |
98 |
+++ /dev/null |
99 |
@@ -1,82 +0,0 @@ |
100 |
-# Copyright 1999-2021 Gentoo Authors |
101 |
-# Distributed under the terms of the GNU General Public License v2 |
102 |
- |
103 |
-EAPI=7 |
104 |
- |
105 |
-inherit autotools flag-o-matic multilib-minimal |
106 |
- |
107 |
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG" |
108 |
-HOMEPAGE="http://www.gnupg.org/" |
109 |
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
110 |
- |
111 |
-LICENSE="LGPL-2.1 MIT" |
112 |
-SLOT="0/20" # subslot = soname major version |
113 |
-KEYWORDS="~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
114 |
-IUSE="doc o-flag-munging static-libs" |
115 |
- |
116 |
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" |
117 |
-DEPEND="${RDEPEND}" |
118 |
-BDEPEND="doc? ( virtual/texi2dvi )" |
119 |
- |
120 |
-PATCHES=( |
121 |
- "${FILESDIR}"/${PN}-1.6.1-uscore.patch |
122 |
- "${FILESDIR}"/${PN}-multilib-syspath.patch |
123 |
-) |
124 |
- |
125 |
-MULTILIB_CHOST_TOOLS=( |
126 |
- /usr/bin/libgcrypt-config |
127 |
-) |
128 |
- |
129 |
-src_prepare() { |
130 |
- default |
131 |
- # missing attribute(sysv_abi) for Cygwin? |
132 |
- [[ ${CHOST} == *-cygwin* ]] && rm -f mpi/*/*.S |
133 |
- # always use -no-undefined even if upstream is not convinced yet |
134 |
- sed -i -e 's/^no_undefined\s*=\s*$/& -no-undefined/' src/Makefile.am || die |
135 |
- eautoreconf |
136 |
-} |
137 |
- |
138 |
-multilib_src_configure() { |
139 |
- if [[ ${CHOST} == *86*-solaris* ]] ; then |
140 |
- # ASM code uses GNU ELF syntax, divide in particular, we need to |
141 |
- # allow this via ASFLAGS, since we don't have a flag-o-matic |
142 |
- # function for that, we'll have to abuse cflags for this |
143 |
- append-cflags -Wa,--divide |
144 |
- fi |
145 |
- local myeconfargs=( |
146 |
- --enable-noexecstack |
147 |
- $(use_enable o-flag-munging O-flag-munging) |
148 |
- $(use_enable static-libs static) |
149 |
- |
150 |
- # disabled due to various applications requiring privileges |
151 |
- # after libgcrypt drops them (bug #468616) |
152 |
- --without-capabilities |
153 |
- |
154 |
- # http://trac.videolan.org/vlc/ticket/620 |
155 |
- # causes bus-errors on sparc64-solaris |
156 |
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") |
157 |
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") |
158 |
- # no cygwin patch yet |
159 |
- $([[ ${CHOST} == *-cygwin* ]] && \ |
160 |
- echo "gcry_cv_gcc_win64_platform_as_ok=no") |
161 |
- |
162 |
- GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" |
163 |
- ) |
164 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ |
165 |
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
166 |
-} |
167 |
- |
168 |
-multilib_src_compile() { |
169 |
- default |
170 |
- multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf |
171 |
-} |
172 |
- |
173 |
-multilib_src_install() { |
174 |
- emake DESTDIR="${D}" install |
175 |
- multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf |
176 |
-} |
177 |
- |
178 |
-multilib_src_install_all() { |
179 |
- default |
180 |
- find "${D}" -name '*.la' -delete || die |
181 |
-} |
182 |
|
183 |
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild |
184 |
deleted file mode 100644 |
185 |
index 9236d04075..0000000000 |
186 |
--- a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild |
187 |
+++ /dev/null |
188 |
@@ -1,82 +0,0 @@ |
189 |
-# Copyright 1999-2021 Gentoo Authors |
190 |
-# Distributed under the terms of the GNU General Public License v2 |
191 |
- |
192 |
-EAPI=7 |
193 |
- |
194 |
-inherit autotools flag-o-matic multilib-minimal |
195 |
- |
196 |
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG" |
197 |
-HOMEPAGE="http://www.gnupg.org/" |
198 |
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
199 |
- |
200 |
-LICENSE="LGPL-2.1 MIT" |
201 |
-SLOT="0/20" # subslot = soname major version |
202 |
-KEYWORDS="~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
203 |
-IUSE="doc o-flag-munging static-libs" |
204 |
- |
205 |
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" |
206 |
-DEPEND="${RDEPEND}" |
207 |
-BDEPEND="doc? ( virtual/texi2dvi )" |
208 |
- |
209 |
-PATCHES=( |
210 |
- "${FILESDIR}"/${PN}-1.6.1-uscore.patch |
211 |
- "${FILESDIR}"/${PN}-multilib-syspath.patch |
212 |
-) |
213 |
- |
214 |
-MULTILIB_CHOST_TOOLS=( |
215 |
- /usr/bin/libgcrypt-config |
216 |
-) |
217 |
- |
218 |
-src_prepare() { |
219 |
- default |
220 |
- # missing attribute(sysv_abi) for Cygwin? |
221 |
- [[ ${CHOST} == *-cygwin* ]] && rm -f mpi/*/*.S |
222 |
- # always use -no-undefined even if upstream is not convinced yet |
223 |
- sed -i -e 's/^no_undefined\s*=\s*$/& -no-undefined/' src/Makefile.am || die |
224 |
- eautoreconf |
225 |
-} |
226 |
- |
227 |
-multilib_src_configure() { |
228 |
- if [[ ${CHOST} == *86*-solaris* ]] ; then |
229 |
- # ASM code uses GNU ELF syntax, divide in particular, we need to |
230 |
- # allow this via ASFLAGS, since we don't have a flag-o-matic |
231 |
- # function for that, we'll have to abuse cflags for this |
232 |
- append-cflags -Wa,--divide |
233 |
- fi |
234 |
- local myeconfargs=( |
235 |
- --enable-noexecstack |
236 |
- $(use_enable o-flag-munging O-flag-munging) |
237 |
- $(use_enable static-libs static) |
238 |
- |
239 |
- # disabled due to various applications requiring privileges |
240 |
- # after libgcrypt drops them (bug #468616) |
241 |
- --without-capabilities |
242 |
- |
243 |
- # http://trac.videolan.org/vlc/ticket/620 |
244 |
- # causes bus-errors on sparc64-solaris |
245 |
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") |
246 |
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") |
247 |
- # no cygwin patch yet |
248 |
- $([[ ${CHOST} == *-cygwin* ]] && \ |
249 |
- echo "gcry_cv_gcc_win64_platform_as_ok=no") |
250 |
- |
251 |
- GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" |
252 |
- ) |
253 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ |
254 |
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
255 |
-} |
256 |
- |
257 |
-multilib_src_compile() { |
258 |
- default |
259 |
- multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf |
260 |
-} |
261 |
- |
262 |
-multilib_src_install() { |
263 |
- emake DESTDIR="${D}" install |
264 |
- multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf |
265 |
-} |
266 |
- |
267 |
-multilib_src_install_all() { |
268 |
- default |
269 |
- find "${D}" -name '*.la' -delete || die |
270 |
-} |
271 |
|
272 |
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild |
273 |
deleted file mode 100644 |
274 |
index 9236d04075..0000000000 |
275 |
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild |
276 |
+++ /dev/null |
277 |
@@ -1,82 +0,0 @@ |
278 |
-# Copyright 1999-2021 Gentoo Authors |
279 |
-# Distributed under the terms of the GNU General Public License v2 |
280 |
- |
281 |
-EAPI=7 |
282 |
- |
283 |
-inherit autotools flag-o-matic multilib-minimal |
284 |
- |
285 |
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG" |
286 |
-HOMEPAGE="http://www.gnupg.org/" |
287 |
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
288 |
- |
289 |
-LICENSE="LGPL-2.1 MIT" |
290 |
-SLOT="0/20" # subslot = soname major version |
291 |
-KEYWORDS="~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
292 |
-IUSE="doc o-flag-munging static-libs" |
293 |
- |
294 |
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" |
295 |
-DEPEND="${RDEPEND}" |
296 |
-BDEPEND="doc? ( virtual/texi2dvi )" |
297 |
- |
298 |
-PATCHES=( |
299 |
- "${FILESDIR}"/${PN}-1.6.1-uscore.patch |
300 |
- "${FILESDIR}"/${PN}-multilib-syspath.patch |
301 |
-) |
302 |
- |
303 |
-MULTILIB_CHOST_TOOLS=( |
304 |
- /usr/bin/libgcrypt-config |
305 |
-) |
306 |
- |
307 |
-src_prepare() { |
308 |
- default |
309 |
- # missing attribute(sysv_abi) for Cygwin? |
310 |
- [[ ${CHOST} == *-cygwin* ]] && rm -f mpi/*/*.S |
311 |
- # always use -no-undefined even if upstream is not convinced yet |
312 |
- sed -i -e 's/^no_undefined\s*=\s*$/& -no-undefined/' src/Makefile.am || die |
313 |
- eautoreconf |
314 |
-} |
315 |
- |
316 |
-multilib_src_configure() { |
317 |
- if [[ ${CHOST} == *86*-solaris* ]] ; then |
318 |
- # ASM code uses GNU ELF syntax, divide in particular, we need to |
319 |
- # allow this via ASFLAGS, since we don't have a flag-o-matic |
320 |
- # function for that, we'll have to abuse cflags for this |
321 |
- append-cflags -Wa,--divide |
322 |
- fi |
323 |
- local myeconfargs=( |
324 |
- --enable-noexecstack |
325 |
- $(use_enable o-flag-munging O-flag-munging) |
326 |
- $(use_enable static-libs static) |
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 |
- # no cygwin patch yet |
337 |
- $([[ ${CHOST} == *-cygwin* ]] && \ |
338 |
- echo "gcry_cv_gcc_win64_platform_as_ok=no") |
339 |
- |
340 |
- GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" |
341 |
- ) |
342 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ |
343 |
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
344 |
-} |
345 |
- |
346 |
-multilib_src_compile() { |
347 |
- default |
348 |
- multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf |
349 |
-} |
350 |
- |
351 |
-multilib_src_install() { |
352 |
- emake DESTDIR="${D}" install |
353 |
- multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf |
354 |
-} |
355 |
- |
356 |
-multilib_src_install_all() { |
357 |
- default |
358 |
- find "${D}" -name '*.la' -delete || die |
359 |
-} |
360 |
|
361 |
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml |
362 |
deleted file mode 100644 |
363 |
index 9b7e9f273f..0000000000 |
364 |
--- a/dev-libs/libgcrypt/metadata.xml |
365 |
+++ /dev/null |
366 |
@@ -1,15 +0,0 @@ |
367 |
-<?xml version="1.0" encoding="UTF-8"?> |
368 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
369 |
-<pkgmetadata> |
370 |
- <maintainer type="person"> |
371 |
- <email>k_f@g.o</email> |
372 |
- <name>Kristian Fiskerstrand</name> |
373 |
- </maintainer> |
374 |
- <maintainer type="project"> |
375 |
- <email>crypto@g.o</email> |
376 |
- <name>Crypto</name> |
377 |
- </maintainer> |
378 |
-<use> |
379 |
-<flag name="o-flag-munging">Enable O-flag mangling during build</flag> |
380 |
-</use> |
381 |
-</pkgmetadata> |