gentoo resync : 14.07.2018

4 files changed, 0 insertions, 166 deletions

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/files/libgcrypt-1.6.1-uscore.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch
deleted file mode 100644
index 22bfac3104bc..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch
+++ /dev/null
@@ -1,26 +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.
-
---- libgcrypt-1.6.1/configure.ac
-+++ libgcrypt-1.6.1/configure.ac
-@@ -1022,7 +1022,7 @@
- # Check whether underscores in symbols are required.  This needs to be
- # done before setting up the assembler stuff.
- #
--GNUPG_SYS_SYMBOL_UNDERSCORE()
-+LT_SYS_SYMBOL_USCORE
- 
- 
- #################################
---- libgcrypt-1.6.1/mpi/config.links
-+++ libgcrypt-1.6.1/mpi/config.links
-@@ -362,7 +362,7 @@
- 
- # 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
diff --git a/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch b/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch
deleted file mode 100644
index 7859851ccc4a..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-multilib-syspath.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in
-index c052638..4c8ddc3 100644
---- a/src/libgcrypt-config.in
-+++ b/src/libgcrypt-config.in
-@@ -154,9 +154,12 @@ if test "$echo_libs" = "yes"; then
-     libs_final="$libs"
- 
-     # Set up `libdirs'.
--    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
--	libdirs="-L$libdir"
--    fi
-+    case "$libdir" in
-+        /usr/lib|/usr/lib64|/lib|/lib64) ;;
-+        *)
-+            libdirs="-L$libdir"
-+            ;;
-+    esac
- 
-     # Set up `libs_final'.
-     libs_final="$libs_final $gpg_error_libs"
--- 
-1.7.6.1
-