gentoo resync : 13.06.2020

3 files changed, 0 insertions, 87 deletions

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index de72e03c882d..c6b72319c248 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -3,8 +3,6 @@ AUX memcached-1.4.0-fix-as-needed-linking.patch 1557 BLAKE2B 1d0d66a9ec44855215a
 AUX memcached-1.4.17-EWOULDBLOCK.patch 506 BLAKE2B e6e7c597dc227f42c0af0cb45d99a802b2bbcf5af3f7bcc1de26305951e0396c879ceb2b651f21b199df0ffabdfcb739626111d0e086d12736603500860453bd SHA512 6ddd823154a384e7502e138528b8d391b9fe203366c56f14ae38ddb6d8b6394fd0297e5fad90cf94f7bc1e7d90e04e0aab17b545fe3f1d2a55f0e2158e9a98dc
 AUX memcached-1.4.4-as-needed.patch 1135 BLAKE2B b290f928cb0c280742eb95b69e1fdec1ffe6f9d47a5a1e3b676f70d25a675d4b4762a4d69915a81cc0e30036e74254ce08f93b625bc842ae0e4a6d7520798f85 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e
 AUX memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch 1470 BLAKE2B 987f8ff094ae43e8fe94458b70f413b994f0125b16987b7aca56bb0847f3c6ff10372cff4a4f12fa651cad72601fef6b4a45cfe0c05036e264f9c53f5846e686 SHA512 c0c139d82762c397cfb86307ab989b3c0a31547e3bccb8b13b4537e78b7f62a4b92aafc60e5cb092098a95038a9f93e8ee6be8702b130fafa11c81112a1fce69
-AUX memcached-1.6.0-gcc10.patch 1345 BLAKE2B 11c090522e694b640880606615f97303e07b35e1fe399bde38ff5fb22355287b3cee2690fc3f00ac05b2c834e5bf94bec48b8ee64b47c226e2517ea0694dba72 SHA512 59c7cc5060dc3e09d991223f5eca8b951c114e2b6e61a56089ad559d376e1e002b653a1ac8ae5556dafeb6d3fda911a4ab07f41b89e1a4474aba00921a393a10
-AUX memcached-1.6.5-ia64.patch 1862 BLAKE2B a93ff1412d52a1c541a1c4a5dc5cf50e29a4f58e60dd2263a711d6a048510654e8a0a35b73eb7e65f33758fd9c2de458725988b0ae023c392840a714e17b0ba4 SHA512 06454cf3f39a0d5de6f0a8caaa822a7559dd7aeccc7eb366eacd54a5ef9eb7b8662c46f482b6518eb0a26e2c18a8f9971632b6182c4ede925f344cd73e57f211
 AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63
 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
diff --git a/net-misc/memcached/files/memcached-1.6.0-gcc10.patch b/net-misc/memcached/files/memcached-1.6.0-gcc10.patch
deleted file mode 100644
index d250b31e9129..000000000000
--- a/net-misc/memcached/files/memcached-1.6.0-gcc10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Subject: [PATCH] crc32c: fix multiple definitions
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-By: Toralf Förster <toralf@gentoo.org>
-Bug: https://bugs.gentoo.org/711982
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' --exclude config.log --exclude autom4te.cache memcached-1.6.0.orig/crc32c.c memcached-1.6.0/crc32c.c
---- memcached-1.6.0.orig/crc32c.c	2019-10-21 01:48:04.000000000 -0700
-+++ memcached-1.6.0/crc32c.c	2020-03-10 22:19:07.610247164 -0700
-@@ -390,6 +390,7 @@
- #endif
- /* Compute a CRC-32C.  If the crc32 instruction is available, use the hardware
-    version.  Otherwise, use the software version. */
-+crc_func crc32c;
- void crc32c_init(void) {
-     #if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-     int sse42;
-diff -Nuar --exclude '*~' --exclude config.log --exclude autom4te.cache memcached-1.6.0.orig/crc32c.h memcached-1.6.0/crc32c.h
---- memcached-1.6.0.orig/crc32c.h	2019-10-21 01:48:04.000000000 -0700
-+++ memcached-1.6.0/crc32c.h	2020-03-10 22:17:12.086974212 -0700
-@@ -2,7 +2,7 @@
- #define    CRC32C_H
- 
- typedef uint32_t (*crc_func)(uint32_t crc, const void *buf, size_t len);
--crc_func crc32c;
-+extern crc_func crc32c;
- 
- void crc32c_init(void);
- 
diff --git a/net-misc/memcached/files/memcached-1.6.5-ia64.patch b/net-misc/memcached/files/memcached-1.6.5-ia64.patch
deleted file mode 100644
index 5a73913b92e6..000000000000
--- a/net-misc/memcached/files/memcached-1.6.5-ia64.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://github.com/memcached/memcached/commit/73633d31b22068dfda5ef969c08139c083d96d71.patch
-
-From 73633d31b22068dfda5ef969c08139c083d96d71 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 19 Apr 2020 10:08:19 +0100
-Subject: [PATCH] crc32c.c: don't attempt to enable hardware crc32 on ia64
-
-Itanium has no hardware crc32 implementation and build fails as:
-
-```
-ia64-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I.  -DNDEBUG   -g -O2 -pthread \
-    ... -c -o memcached-crc32c.o `test -f 'crc32c.c' || echo './'`crc32c.c
-crc32c.c: In function 'crc32c_init':
-crc32c.c:385:9: error: unknown register name '%edx' in 'asm'
-  385 |         __asm__("cpuid" \
-      |         ^~~~~~~
-```
-
-The change removes ia64 from crc32 paths.
-
-Bug: https://bugs.gentoo.org/718136
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- crc32c.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/crc32c.c
-+++ b/crc32c.c
-@@ -167,7 +167,7 @@ static uint32_t crc32c_hw_aarch64(uint32_t crc, const void* buf, size_t len)
- #endif
- 
- /* Apply if the platform is intel */
--#if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-+#if defined(__X86_64__)||defined(__x86_64__)
- 
- /* Multiply a matrix times a vector over the Galois field of two elements,
-    GF(2).  Each element is a bit in an unsigned integer.  mat must have at
-@@ -388,12 +388,11 @@ static uint32_t crc32c_hw(uint32_t crc, const void *buf, size_t len)
-                 : "%ebx", "%edx"); \
-         (have) = (ecx >> 20) & 1; \
-     } while (0)
--
- #endif
- /* Compute a CRC-32C.  If the crc32 instruction is available, use the hardware
-    version.  Otherwise, use the software version. */
- void crc32c_init(void) {
--    #if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-+    #if defined(__X86_64__)||defined(__x86_64__)
-     int sse42;
-     SSE42(sse42);
-