gentoo resync : 28.04.2019

4 files changed, 0 insertions, 181 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 6838372ffc6b..b4be9d4737fa 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,11 +1,7 @@
-AUX libgcrypt-1.5.0-uscore.patch 981 BLAKE2B 0f7bae068fa1c04834a0295b902aa479304a8b9f066d984d28a49c59a5c041281d93a7bc73e053f4098461364e87b7a665cb890b4792cdf221f44593c23fbae4 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601
-AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44952e700966f1cbc361664015d075c1d8ef171ae68e9cabd87cab9ce0424243dfbe71271ce2a984d7ad1bdc8c52efd1349 SHA512 86d462340595420a70977d697237a8bb87583750e90c8368ce783ca0fbfed8816c646dd5e40b8e929fbce29917a2b05bb48a0a492d271605958fcb98faf4caa4
 AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
-DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
 DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
 DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
-EBUILD libgcrypt-1.5.6-r101.ebuild 1668 BLAKE2B 1b8591c2613fd7d281b69718e296724b297b218357d334d79a70e85a2c088ea1dbdc38b3206290dee728e43393c0f8ed9f53b86a2758c9cd07acf2ad8b7c8424 SHA512 1479228533afab05f4e90413b9c5134452c0a041d27cdb05bf2e5e878f883c9a488140dd84d07e772aa52316ed543e29a76a40e0be202a98022f05b541ecd58a
 EBUILD libgcrypt-1.8.3-r1.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99fce2f075d17f043b97640c73ef147184fa832576a5dd57c40b59d2b7f4c2559f7bbb03576eafd9d64dadb9ce17b68c SHA512 1ac41888cea18aa75e5cd3190c89999ce1ec4dcbf4376890c9a8cdabf414fe8022644976d7c75f6ef26a883f7a0863d5363f9979af45f68e5eb539db890a776a
 EBUILD libgcrypt-1.8.3.ebuild 2186 BLAKE2B d1c56ad5f0182fcac6ab2fa237e5205818a0f61a7edea666b1f0f1fc4fe1f95fc6ad4a410262b293fb6e47f3e570d71f552a717887a9efb921bf902bb4f12061 SHA512 8f902c37512a01fcbc83026281e8ce9f5a8dc18d975c180f4f4206c38538dad8192ff15fc3782bcb6475e37c4bfcb4b3a96ab5321e79268a91a623f890aebbae
 EBUILD libgcrypt-1.8.4.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99fce2f075d17f043b97640c73ef147184fa832576a5dd57c40b59d2b7f4c2559f7bbb03576eafd9d64dadb9ce17b68c SHA512 1ac41888cea18aa75e5cd3190c89999ce1ec4dcbf4376890c9a8cdabf414fe8022644976d7c75f6ef26a883f7a0863d5363f9979af45f68e5eb539db890a776a
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch
deleted file mode 100644
index 1d4f650b6c7a..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-The version taken from GnuPG 1.4 assumes any cross-compiled package have
-prefixed underscores, which is not the case; by using libtool's own macro,
-we can avoid the whole issue.
-
-diff --git a/configure.ac b/configure.ac
-index ab160c3..6df49bf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -886,7 +886,7 @@ fi
- #
- # Setup assembler stuff.
- #
--GNUPG_SYS_SYMBOL_UNDERSCORE()
-+LT_SYS_SYMBOL_USCORE
- AC_ARG_ENABLE(mpi-path,
-               AC_HELP_STRING([--enable-mpi-path=EXTRA_PATH],
- 	      [prepend EXTRA_PATH to list of CPU specific optimizations]),
-diff --git a/mpi/config.links b/mpi/config.links
-index 7e910ee..9696828 100644
---- a/mpi/config.links
-+++ b/mpi/config.links
-@@ -291,7 +291,7 @@ fi
- 
- # Make sysdep.h
- echo '/* created by config.links - do not edit */' >./mpi/sysdep.h
--if test x$ac_cv_sys_symbol_underscore = xyes; then
-+if test x$sys_symbol_underscore = xyes; then
-     cat <<EOF >>./mpi/sysdep.h
- #if __STDC__
- #define C_SYMBOL_NAME(name) _##name
--- 
-1.7.6.1
-
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
deleted file mode 100644
index ab5d844552af..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.5.4-clang-arm.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-fix from upstream
-
-From e67c67321ce240c93dd0fa2b21c649c0a8e233f7 Mon Sep 17 00:00:00 2001
-From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
-Date: Tue, 22 Oct 2013 17:07:53 +0300
-Subject: [PATCH] mpi: allow building with clang on ARM
-
-* mpi/longlong.h [__arm__] (add_ssaaaa, sub_ddmmss, umul_ppmm)
-(count_leading_zeros): Do not cast assembly output arguments.
-[__arm__] (umul_ppmm): Remove the extra '%' ahead of assembly comment.
-[_ARM_ARCH >= 4] (umul_ppmm): Use correct inputs and outputs instead of
-registers.
---
-
-Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
----
- mpi/longlong.h | 27 +++++++++++++--------------
- 1 file changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/mpi/longlong.h b/mpi/longlong.h
-index c2ab9c5..8c8260e 100644
---- a/mpi/longlong.h
-+++ b/mpi/longlong.h
-@@ -188,8 +188,8 @@ extern UDItype __udiv_qrnnd ();
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-   __asm__ ("adds %1, %4, %5\n"                                          \
- 	   "adc  %0, %2, %3"                                            \
--	   : "=r" ((USItype)(sh)),                                      \
--	     "=&r" ((USItype)(sl))                                      \
-+	   : "=r" ((sh)),                                               \
-+	     "=&r" ((sl))                                               \
- 	   : "%r" ((USItype)(ah)),                                      \
- 	     "rI" ((USItype)(bh)),                                      \
- 	     "%r" ((USItype)(al)),                                      \
-@@ -197,15 +197,15 @@ extern UDItype __udiv_qrnnd ();
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-   __asm__ ("subs %1, %4, %5\n"                                          \
- 	   "sbc  %0, %2, %3"                                            \
--	   : "=r" ((USItype)(sh)),                                      \
--	     "=&r" ((USItype)(sl))                                      \
-+	   : "=r" ((sh)),                                               \
-+	     "=&r" ((sl))                                               \
- 	   : "r" ((USItype)(ah)),                                       \
- 	     "rI" ((USItype)(bh)),                                      \
- 	     "r" ((USItype)(al)),                                       \
- 	     "rI" ((USItype)(bl)))
- #if defined __ARM_ARCH_2__ || defined __ARM_ARCH_3__
- #define umul_ppmm(xh, xl, a, b) \
--  __asm__ ("%@ Inlined umul_ppmm\n"                                     \
-+  __asm__ ("@ Inlined umul_ppmm\n"                                      \
- 	"mov	%|r0, %2, lsr #16		@ AAAA\n"               \
- 	"mov	%|r2, %3, lsr #16		@ BBBB\n"               \
- 	"bic	%|r1, %2, %|r0, lsl #16		@ aaaa\n"               \
-@@ -218,20 +218,19 @@ extern UDItype __udiv_qrnnd ();
- 	"addcs	%|r2, %|r2, #65536\n"                                   \
- 	"adds	%1, %|r1, %|r0, lsl #16\n"                              \
- 	"adc	%0, %|r2, %|r0, lsr #16"                                \
--	   : "=&r" ((USItype)(xh)),                                     \
--	     "=r" ((USItype)(xl))                                       \
-+	   : "=&r" ((xh)),                                              \
-+	     "=r" ((xl))                                                \
- 	   : "r" ((USItype)(a)),                                        \
- 	     "r" ((USItype)(b))                                         \
- 	   : "r0", "r1", "r2")
- #else
- #define umul_ppmm(xh, xl, a, b)                                         \
--  __asm__ ("%@ Inlined umul_ppmm\n"                                     \
--	   "umull %r1, %r0, %r2, %r3"                                   \
--		   : "=&r" ((USItype)(xh)),                             \
--		     "=r" ((USItype)(xl))                               \
-+  __asm__ ("@ Inlined umul_ppmm\n"                                      \
-+	   "umull %1, %0, %2, %3"                                       \
-+		   : "=&r" ((xh)),                                      \
-+		     "=r" ((xl))                                        \
- 		   : "r" ((USItype)(a)),                                \
--		     "r" ((USItype)(b))                                 \
--		   : "r0", "r1")
-+		     "r" ((USItype)(b)))
- #endif
- #define UMUL_TIME 20
- #define UDIV_TIME 100
--- 
-2.4.4
-
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
deleted file mode 100644
index fd156e85c490..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune multilib-minimal
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="11/11" # subslot = soname major version
-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"
-IUSE=""
-
-RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
-	!dev-libs/libgcrypt:0/11"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-	"${FILESDIR}"/${PN}-1.5.4-clang-arm.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-padlock-support # bug 201917
-		--disable-dependency-tracking
-		--enable-noexecstack
-		--disable-O-flag-munging
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -r "${ED%/}"/usr/{bin,include,lib*/*.so,share} || die
-}
-
-multilib_src_install_all() {
-	default
-	prune_libtool_files
-}