gentoo resync : 14.05.2020

5 files changed, 55 insertions, 205 deletions

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 0ed8a81d3eac..de72e03c882d 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -4,15 +4,12 @@ AUX memcached-1.4.17-EWOULDBLOCK.patch 506 BLAKE2B e6e7c597dc227f42c0af0cb45d99a
 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
 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
-DIST memcached-1.6.2.tar.gz 536527 BLAKE2B e350ee10ed74d68206baa009fa49e30e6563a21fd617fc30c1c2695642f6a5f85662acc40471d903a54c26153ca904d1ce9fb3bcbc7bae5d06431069872ca812 SHA512 e695c1292fc85280be3d337990c37f6fcf85e1a73870d541b993335b12f33b31516b477c30169a40c7b5d24fac8c842fdc5f1f48348c5cafa593040229349640
-DIST memcached-1.6.3.tar.gz 538890 BLAKE2B 06d18dcfa00bead3d0d5e46a2660568544b0e6bf27b4f2c1759d9bf8170c0b5b78028303a530d651b4002053ec747b4c6a2dabc231b57cbbfa276ff1cc59f9f1 SHA512 f51248906f59eca3025dd8b56adcd49dcacbf706f66b0fbdafeb054a213d5595a8e13dc38a365cf852d3b1058f90a981f464e24025a4f33dccd09aa579f7cbbd
-DIST memcached-1.6.5.tar.gz 539962 BLAKE2B 2abe351d09a29c98a6a7710f05d1934d9733366e32489137f281558abefa6183e66ac4b1acf44af5c1772123ffa032f460bf796acb6258a908d6ef1e38262f88 SHA512 e6cc2db70bbd05dd40131ca9e0cbbc72c41d747f64b6e6e6c2e3ac2630b67fefcd5e945b2e8d57db6d0b379ba9c34d89eb2c19f20391493e4e2390d7a1616d90
+DIST memcached-1.6.6.tar.gz 543661 BLAKE2B 04de48d6450961585ac3b1c8ae6f803c59e5bbf34e45aa27c9e53309350608dc3c899cf169095361c4ccdc44e0bcc2860662d7066477abd7fdc8e80e34d22d36 SHA512 dfd19bf42d35fff391bb479338706a83082e3cdd3ff6e225d3d4da9df01b0a1f659a012dc30766651ffd57f0c19128fc4c3df29b721e588c909656d02cfdaa0a
 EBUILD memcached-1.5.22.ebuild 2956 BLAKE2B 149c5f1c78050f0b36086811f632ead56840a56edec63b1da22a3642c223b6fbe9eb01b55dd5f032cfad3ce540d6eeb68e34787dfca382c921fa85cc324033f2 SHA512 e05ce60c58028f51ef572dde0319d669aa9aa21c227cf7490bee0a9678144b3f11fe0a525421a2ae1c016cf0027d74bd3ec861c7aa1d83119a2d16301f29b490
-EBUILD memcached-1.6.2.ebuild 2892 BLAKE2B a5d787736c17cd4e1ff38fa8c488f079a89f4667c653394439091bd20b145154b21507438077f30b059c0861a98e6b6ec49370d693ce8d548effb729ecd5a5cc SHA512 59d4c46e3e54741edac6e38492a9735bbbfaeb95efedb3fe4b2d0cc1cf2c9b0c588f46ca292a4b857e7e674c529bbda56d72d9115d8be3c55d05d3feb5e5ed7a
-EBUILD memcached-1.6.3.ebuild 2892 BLAKE2B a5d787736c17cd4e1ff38fa8c488f079a89f4667c653394439091bd20b145154b21507438077f30b059c0861a98e6b6ec49370d693ce8d548effb729ecd5a5cc SHA512 59d4c46e3e54741edac6e38492a9735bbbfaeb95efedb3fe4b2d0cc1cf2c9b0c588f46ca292a4b857e7e674c529bbda56d72d9115d8be3c55d05d3feb5e5ed7a
-EBUILD memcached-1.6.5.ebuild 2892 BLAKE2B a5d787736c17cd4e1ff38fa8c488f079a89f4667c653394439091bd20b145154b21507438077f30b059c0861a98e6b6ec49370d693ce8d548effb729ecd5a5cc SHA512 59d4c46e3e54741edac6e38492a9735bbbfaeb95efedb3fe4b2d0cc1cf2c9b0c588f46ca292a4b857e7e674c529bbda56d72d9115d8be3c55d05d3feb5e5ed7a
+EBUILD memcached-1.6.6.ebuild 2890 BLAKE2B c91614a11022713c534524fc053b9d669aaf716ac47b7197c0732077ed31cb7a8e27a0240fd785542cec44fe5fc7afa1b36e5f50cc96e17bb194e3fc80835ea4 SHA512 e22a7b8a8e7ff6733ba5380e2765f935b313f09eef93f5df292924078a8781f710f5e6085a5efef6a35358f50a7c174c0d2c425709d5372536de035a2f626b9b
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/files/memcached-1.6.5-ia64.patch b/net-misc/memcached/files/memcached-1.6.5-ia64.patch
new file mode 100644
index 000000000000..5a73913b92e6
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.6.5-ia64.patch
@@ -0,0 +1,51 @@
+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);
+ 
diff --git a/net-misc/memcached/memcached-1.6.3.ebuild b/net-misc/memcached/memcached-1.6.3.ebuild
deleted file mode 100644
index 75cbb9370f34..000000000000
--- a/net-misc/memcached/memcached-1.6.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils flag-o-matic systemd
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-	dev-lang/perl
-	sasl? ( dev-libs/cyrus-sasl )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-	acct-user/memcached
-	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-)
-
-src_prepare() {
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.6.5.ebuild b/net-misc/memcached/memcached-1.6.5.ebuild
deleted file mode 100644
index 75cbb9370f34..000000000000
--- a/net-misc/memcached/memcached-1.6.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils flag-o-matic systemd
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-	dev-lang/perl
-	sasl? ( dev-libs/cyrus-sasl )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-	acct-user/memcached
-	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-)
-
-src_prepare() {
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.6.2.ebuild b/net-misc/memcached/memcached-1.6.6.ebuild
index 75cbb9370f34..3ff5cfe1d936 100644
--- a/net-misc/memcached/memcached-1.6.2.ebuild
+++ b/net-misc/memcached/memcached-1.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=