| 1 |
commit: a14bd782f619cd1af7b3ba416ff40f27bcf4294f |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 14 07:16:25 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 14 07:16:25 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14bd782 |
| 7 |
|
| 8 |
dev-libs/libgcrypt: Remove last-rited slot |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-libs/libgcrypt/Manifest | 1 - |
| 13 |
.../libgcrypt/files/libgcrypt-1.5.0-uscore.patch | 33 --------- |
| 14 |
.../files/libgcrypt-1.5.4-clang-arm.patch | 84 ---------------------- |
| 15 |
dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild | 60 ---------------- |
| 16 |
profiles/package.mask | 7 -- |
| 17 |
5 files changed, 185 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest |
| 20 |
index d3bff7f2104..64f6382d94b 100644 |
| 21 |
--- a/dev-libs/libgcrypt/Manifest |
| 22 |
+++ b/dev-libs/libgcrypt/Manifest |
| 23 |
@@ -1,3 +1,2 @@ |
| 24 |
-DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a |
| 25 |
DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0 |
| 26 |
DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1 |
| 27 |
|
| 28 |
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 1d4f650b6c7..00000000000 |
| 31 |
--- a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,33 +0,0 @@ |
| 34 |
-The version taken from GnuPG 1.4 assumes any cross-compiled package have |
| 35 |
-prefixed underscores, which is not the case; by using libtool's own macro, |
| 36 |
-we can avoid the whole issue. |
| 37 |
- |
| 38 |
-diff --git a/configure.ac b/configure.ac |
| 39 |
-index ab160c3..6df49bf 100644 |
| 40 |
---- a/configure.ac |
| 41 |
-+++ b/configure.ac |
| 42 |
-@@ -886,7 +886,7 @@ fi |
| 43 |
- # |
| 44 |
- # Setup assembler stuff. |
| 45 |
- # |
| 46 |
--GNUPG_SYS_SYMBOL_UNDERSCORE() |
| 47 |
-+LT_SYS_SYMBOL_USCORE |
| 48 |
- AC_ARG_ENABLE(mpi-path, |
| 49 |
- AC_HELP_STRING([--enable-mpi-path=EXTRA_PATH], |
| 50 |
- [prepend EXTRA_PATH to list of CPU specific optimizations]), |
| 51 |
-diff --git a/mpi/config.links b/mpi/config.links |
| 52 |
-index 7e910ee..9696828 100644 |
| 53 |
---- a/mpi/config.links |
| 54 |
-+++ b/mpi/config.links |
| 55 |
-@@ -291,7 +291,7 @@ fi |
| 56 |
- |
| 57 |
- # Make sysdep.h |
| 58 |
- echo '/* created by config.links - do not edit */' >./mpi/sysdep.h |
| 59 |
--if test x$ac_cv_sys_symbol_underscore = xyes; then |
| 60 |
-+if test x$sys_symbol_underscore = xyes; then |
| 61 |
- cat <<EOF >>./mpi/sysdep.h |
| 62 |
- #if __STDC__ |
| 63 |
- #define C_SYMBOL_NAME(name) _##name |
| 64 |
--- |
| 65 |
-1.7.6.1 |
| 66 |
- |
| 67 |
|
| 68 |
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.4-clang-arm.patch b/dev-libs/libgcrypt/files/libgcrypt-1.5.4-clang-arm.patch |
| 69 |
deleted file mode 100644 |
| 70 |
index ab5d844552a..00000000000 |
| 71 |
--- a/dev-libs/libgcrypt/files/libgcrypt-1.5.4-clang-arm.patch |
| 72 |
+++ /dev/null |
| 73 |
@@ -1,84 +0,0 @@ |
| 74 |
-fix from upstream |
| 75 |
- |
| 76 |
-From e67c67321ce240c93dd0fa2b21c649c0a8e233f7 Mon Sep 17 00:00:00 2001 |
| 77 |
-From: Jussi Kivilinna <jussi.kivilinna@×××.fi> |
| 78 |
-Date: Tue, 22 Oct 2013 17:07:53 +0300 |
| 79 |
-Subject: [PATCH] mpi: allow building with clang on ARM |
| 80 |
- |
| 81 |
-* mpi/longlong.h [__arm__] (add_ssaaaa, sub_ddmmss, umul_ppmm) |
| 82 |
-(count_leading_zeros): Do not cast assembly output arguments. |
| 83 |
-[__arm__] (umul_ppmm): Remove the extra '%' ahead of assembly comment. |
| 84 |
-[_ARM_ARCH >= 4] (umul_ppmm): Use correct inputs and outputs instead of |
| 85 |
-registers. |
| 86 |
--- |
| 87 |
- |
| 88 |
-Signed-off-by: Jussi Kivilinna <jussi.kivilinna@×××.fi> |
| 89 |
---- |
| 90 |
- mpi/longlong.h | 27 +++++++++++++-------------- |
| 91 |
- 1 file changed, 13 insertions(+), 14 deletions(-) |
| 92 |
- |
| 93 |
-diff --git a/mpi/longlong.h b/mpi/longlong.h |
| 94 |
-index c2ab9c5..8c8260e 100644 |
| 95 |
---- a/mpi/longlong.h |
| 96 |
-+++ b/mpi/longlong.h |
| 97 |
-@@ -188,8 +188,8 @@ extern UDItype __udiv_qrnnd (); |
| 98 |
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ |
| 99 |
- __asm__ ("adds %1, %4, %5\n" \ |
| 100 |
- "adc %0, %2, %3" \ |
| 101 |
-- : "=r" ((USItype)(sh)), \ |
| 102 |
-- "=&r" ((USItype)(sl)) \ |
| 103 |
-+ : "=r" ((sh)), \ |
| 104 |
-+ "=&r" ((sl)) \ |
| 105 |
- : "%r" ((USItype)(ah)), \ |
| 106 |
- "rI" ((USItype)(bh)), \ |
| 107 |
- "%r" ((USItype)(al)), \ |
| 108 |
-@@ -197,15 +197,15 @@ extern UDItype __udiv_qrnnd (); |
| 109 |
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ |
| 110 |
- __asm__ ("subs %1, %4, %5\n" \ |
| 111 |
- "sbc %0, %2, %3" \ |
| 112 |
-- : "=r" ((USItype)(sh)), \ |
| 113 |
-- "=&r" ((USItype)(sl)) \ |
| 114 |
-+ : "=r" ((sh)), \ |
| 115 |
-+ "=&r" ((sl)) \ |
| 116 |
- : "r" ((USItype)(ah)), \ |
| 117 |
- "rI" ((USItype)(bh)), \ |
| 118 |
- "r" ((USItype)(al)), \ |
| 119 |
- "rI" ((USItype)(bl))) |
| 120 |
- #if defined __ARM_ARCH_2__ || defined __ARM_ARCH_3__ |
| 121 |
- #define umul_ppmm(xh, xl, a, b) \ |
| 122 |
-- __asm__ ("%@ Inlined umul_ppmm\n" \ |
| 123 |
-+ __asm__ ("@ Inlined umul_ppmm\n" \ |
| 124 |
- "mov %|r0, %2, lsr #16 @ AAAA\n" \ |
| 125 |
- "mov %|r2, %3, lsr #16 @ BBBB\n" \ |
| 126 |
- "bic %|r1, %2, %|r0, lsl #16 @ aaaa\n" \ |
| 127 |
-@@ -218,20 +218,19 @@ extern UDItype __udiv_qrnnd (); |
| 128 |
- "addcs %|r2, %|r2, #65536\n" \ |
| 129 |
- "adds %1, %|r1, %|r0, lsl #16\n" \ |
| 130 |
- "adc %0, %|r2, %|r0, lsr #16" \ |
| 131 |
-- : "=&r" ((USItype)(xh)), \ |
| 132 |
-- "=r" ((USItype)(xl)) \ |
| 133 |
-+ : "=&r" ((xh)), \ |
| 134 |
-+ "=r" ((xl)) \ |
| 135 |
- : "r" ((USItype)(a)), \ |
| 136 |
- "r" ((USItype)(b)) \ |
| 137 |
- : "r0", "r1", "r2") |
| 138 |
- #else |
| 139 |
- #define umul_ppmm(xh, xl, a, b) \ |
| 140 |
-- __asm__ ("%@ Inlined umul_ppmm\n" \ |
| 141 |
-- "umull %r1, %r0, %r2, %r3" \ |
| 142 |
-- : "=&r" ((USItype)(xh)), \ |
| 143 |
-- "=r" ((USItype)(xl)) \ |
| 144 |
-+ __asm__ ("@ Inlined umul_ppmm\n" \ |
| 145 |
-+ "umull %1, %0, %2, %3" \ |
| 146 |
-+ : "=&r" ((xh)), \ |
| 147 |
-+ "=r" ((xl)) \ |
| 148 |
- : "r" ((USItype)(a)), \ |
| 149 |
-- "r" ((USItype)(b)) \ |
| 150 |
-- : "r0", "r1") |
| 151 |
-+ "r" ((USItype)(b))) |
| 152 |
- #endif |
| 153 |
- #define UMUL_TIME 20 |
| 154 |
- #define UDIV_TIME 100 |
| 155 |
--- |
| 156 |
-2.4.4 |
| 157 |
- |
| 158 |
|
| 159 |
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild |
| 160 |
deleted file mode 100644 |
| 161 |
index fd156e85c49..00000000000 |
| 162 |
--- a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild |
| 163 |
+++ /dev/null |
| 164 |
@@ -1,60 +0,0 @@ |
| 165 |
-# Copyright 1999-2018 Gentoo Foundation |
| 166 |
-# Distributed under the terms of the GNU General Public License v2 |
| 167 |
- |
| 168 |
-EAPI=6 |
| 169 |
- |
| 170 |
-inherit autotools ltprune multilib-minimal |
| 171 |
- |
| 172 |
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG" |
| 173 |
-HOMEPAGE="http://www.gnupg.org/" |
| 174 |
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
| 175 |
- |
| 176 |
-LICENSE="LGPL-2.1 MIT" |
| 177 |
-SLOT="11/11" # subslot = soname major version |
| 178 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 179 |
-IUSE="" |
| 180 |
- |
| 181 |
-RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] |
| 182 |
- !dev-libs/libgcrypt:0/11" |
| 183 |
-DEPEND="${RDEPEND}" |
| 184 |
- |
| 185 |
-PATCHES=( |
| 186 |
- "${FILESDIR}"/${PN}-1.5.0-uscore.patch |
| 187 |
- "${FILESDIR}"/${PN}-multilib-syspath.patch |
| 188 |
- "${FILESDIR}"/${PN}-1.5.4-clang-arm.patch |
| 189 |
-) |
| 190 |
- |
| 191 |
-src_prepare() { |
| 192 |
- default |
| 193 |
- eautoreconf |
| 194 |
-} |
| 195 |
- |
| 196 |
-multilib_src_configure() { |
| 197 |
- local myeconfargs=( |
| 198 |
- --disable-padlock-support # bug 201917 |
| 199 |
- --disable-dependency-tracking |
| 200 |
- --enable-noexecstack |
| 201 |
- --disable-O-flag-munging |
| 202 |
- |
| 203 |
- # disabled due to various applications requiring privileges |
| 204 |
- # after libgcrypt drops them (bug #468616) |
| 205 |
- --without-capabilities |
| 206 |
- |
| 207 |
- # http://trac.videolan.org/vlc/ticket/620 |
| 208 |
- # causes bus-errors on sparc64-solaris |
| 209 |
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") |
| 210 |
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") |
| 211 |
- ) |
| 212 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 213 |
-} |
| 214 |
- |
| 215 |
-multilib_src_install() { |
| 216 |
- emake DESTDIR="${D}" install |
| 217 |
- |
| 218 |
- rm -r "${ED%/}"/usr/{bin,include,lib*/*.so,share} || die |
| 219 |
-} |
| 220 |
- |
| 221 |
-multilib_src_install_all() { |
| 222 |
- default |
| 223 |
- prune_libtool_files |
| 224 |
-} |
| 225 |
|
| 226 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 227 |
index c9792dc3e31..51992c77c42 100644 |
| 228 |
--- a/profiles/package.mask |
| 229 |
+++ b/profiles/package.mask |
| 230 |
@@ -753,13 +753,6 @@ app-admin/fleet |
| 231 |
# Removal in 30 days. Bug #678520. |
| 232 |
net-analyzer/dietsniff |
| 233 |
|
| 234 |
-# Michał Górny <mgorny@g.o> (15 Mar 2019) |
| 235 |
-# Last reverse dependency of dev-libs/libgcrypt-1.5* (#656378). Current |
| 236 |
-# version is outdated, maintainer is MIA and the new versions are |
| 237 |
-# in distro-unfriendly AppImage format (#661740). |
| 238 |
-# Removal in 30 days. Bug #677486. |
| 239 |
-=dev-libs/libgcrypt-1.5* |
| 240 |
- |
| 241 |
# Eray Aslan <eras@g.o> (01 Mar 2019) |
| 242 |
# Mask experimental software |
| 243 |
=mail-mta/postfix-3.5* |
Archives