gentoo resync : 07.08.2021

6 files changed, 147 insertions, 20 deletions

diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index 581764a6e456..ad2ef5a6c4e0 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -1,6 +1,9 @@
-AUX continuum-1.0.18.patch 3086 BLAKE2B 4f5b004d0910be5a8f8bb9c568a2555c2b3f4ab71b52964622d66ef43a0ca2c7ee8e6e0e9128b7863a465bb887ac300a8cfc1f6efcdb740fdd88ed36cd465b75 SHA512 905c5f1dc22b665ef8910b6319b25e1d1e9dd80892c03c6c71de597599d8ce2972b35d92e6976ad8798d2f10927e3e884570246d5d8162e84dc3e1f963959012
-AUX debug-disable-enable-1.0.18.patch 1458 BLAKE2B ce806c34ab5525f8d493030ad870d9a7fb1b27d18159c6626d37c1540f0cb7aec6a9d45d17423dabebfde8fb68fdb6796cc88ff8fa109c9622958a2eef322ede SHA512 f4d731ce227e91324b88d155daaf35f2228a48e61d8e448c93f9d102c9939fa4c3b2a07b96741d442382cc5498358e9ae0471f766373654b21d849a96a42d813
+AUX continuum-1.0.18.patch 2634 BLAKE2B 68b2cb41800b6797537e270a2f58064200d2c87f7fb8da77fc7ee615c69d34b33a2661025ad186bdf2557368da28cc9e8af7ad1aa927bd8c1036bf55ced5ca8e SHA512 ef1b8b8f375b58b73493d1cae0e7ce3f4bd50925fc2e9cad9d8034fb77bd6565c6aac2c3a4d9374f463c569bc47b6ef5d78a88fae544c05700254d4fa10f7f5d
+AUX debug-disable-enable-1.0.18.patch 1345 BLAKE2B 35c2abf1885639593ed2515883ab27cf7aa6a6a78e03133ba5b98a70fb094343f1147714a9b865c659905aec4f3e85cfd83a5ad5fc3190a1d9c5b1f505ba72ec SHA512 b0dd6fc931bd5c1ab58ec8c1b6a40a0c72f2f033ac08e22ca148754ca80312da5e0611a3edb05d378b1d4f771acbf1a9b9b8206f9c8d385d2b513aa47112fd28
+AUX libmemcached-1.0.18-autotools.patch 2362 BLAKE2B 647aa5e79a37471c16ef03b0b9bdc7fb78aca9ef7c4c5be9137f76bc0d547b4ae40e355d3afd040e165e7f25a51b73c2108a64990e723d1c38ac5714a9d51f0c SHA512 c34e6225e644de08c1fd102b3ad206484ce9854aead456fccefd7a9f42ad02cc863380e18c1b6a31b2e8fc89989f1a43cef24f8fa922e40711c7c0a59248bb12
+AUX libmemcached-1.0.18-disable-sphinx.patch 264 BLAKE2B 6b26230f2c79d4f9f0cffcdfc7e8d8a50dbac7061b75e214ae3cf9634be6d3bccf4c849791c153ac285a80a285deab443e919a770c1455f79d8b4bac9bce6ebe SHA512 45de379be62a10d934eabbd7488fcc34c4cde865083cbb06af222fa19aca8aef510564385017e6e9b7d981a17238da0e3a5b2b84fa6f3573adbe16baa975f174
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
 EBUILD libmemcached-1.0.18-r3.ebuild 1608 BLAKE2B 9f2407ed8d539dcda7af004f743f4e99cccbc20d29d6ef1670a5288c51a9137da8ddffb5ea93d4aacee8acdf64ecbdd1e310cd971fd04dab2645bcfbf3efee79 SHA512 1dce280cc7a5d9b3aa3ec5a6880747f513faf5d6390078c1caef1cd3b7617eb997a5fa205bb4866bd8d803dfc57511a230c948a3e1eb23496519f41dba576f1f
+EBUILD libmemcached-1.0.18-r4.ebuild 1381 BLAKE2B aba5b758b7db8baddbb128e9448d2292346e6cd6b8015976d388f15faeb5c4f93187f4900569d4458fac6b732d5ec041ec8070c1dae1ecf78fbe829ad06b2229 SHA512 523afd3c135bd99f4d9e4dbade920920c9566676e89386ef87e244ba9e04ac7c2dc8ab97efad6ec3a63608398b40a61350cfa5d4671b843f5a8e908fca9f2fe7
 MISC metadata.xml 826 BLAKE2B a77184515934e8eb06a2f7b42a4e4354c998192d617a1a4a3e0e6fdad88a189cdf809779106e3157f4b9f46675a6ae6961ef5280bdefaa1794b7c146b89fdeef SHA512 5bc0caef489fb8a9c6c038aa2a5620cd43d700104ab77407391eb0961f12392ac8535efd5fbe86c1e6be17cb89d766049fe1394461fa652bcdc1abd64afb9962
diff --git a/dev-libs/libmemcached/files/continuum-1.0.18.patch b/dev-libs/libmemcached/files/continuum-1.0.18.patch
index 296978044311..17a8afd7ff98 100644
--- a/dev-libs/libmemcached/files/continuum-1.0.18.patch
+++ b/dev-libs/libmemcached/files/continuum-1.0.18.patch
@@ -1,7 +1,5 @@
-diff --git libmemcached/memcached.cc libmemcached/memcached.cc
-index 337f918..6e88c25 100644
---- libmemcached/memcached.cc
-+++ libmemcached/memcached.cc
+--- a/libmemcached/memcached.cc
++++ b/libmemcached/memcached.cc
 @@ -285,6 +285,8 @@ void memcached_servers_reset(memcached_st *shell)
    {
      libmemcached_free(self, self->ketama.continuum);
@@ -11,10 +9,8 @@ index 337f918..6e88c25 100644
  
      memcached_instance_list_free(memcached_instance_list(self), self->number_of_hosts);
      memcached_instance_set(self, NULL, 0);
-diff --git tests/libmemcached-1.0/all_tests.h tests/libmemcached-1.0/all_tests.h
-index b4abe9d..f89f007 100644
---- tests/libmemcached-1.0/all_tests.h
-+++ tests/libmemcached-1.0/all_tests.h
+--- a/tests/libmemcached-1.0/all_tests.h
++++ b/tests/libmemcached-1.0/all_tests.h
 @@ -452,6 +452,7 @@ collection_st collection[] ={
    {"hsieh_availability", 0, 0, hsieh_availability},
    {"murmur_availability", 0, 0, murmur_availability},
@@ -23,10 +19,8 @@ index b4abe9d..f89f007 100644
    {"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP, 0, memcached_server_add_TESTS},
    {"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP, 0, memcached_server_add_TESTS},
    {"block", 0, 0, tests},
-diff --git tests/libmemcached-1.0/setup_and_teardowns.cc tests/libmemcached-1.0/setup_and_teardowns.cc
-index 4191c38..eb29128 100644
---- tests/libmemcached-1.0/setup_and_teardowns.cc
-+++ tests/libmemcached-1.0/setup_and_teardowns.cc
+--- a/tests/libmemcached-1.0/setup_and_teardowns.cc
++++ b/tests/libmemcached-1.0/setup_and_teardowns.cc
 @@ -177,6 +177,16 @@ test_return_t memcached_servers_reset_SETUP(memcached_st *memc)
    return TEST_SUCCESS;
  }
@@ -44,10 +38,8 @@ index 4191c38..eb29128 100644
  test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc)
  {
    test_compare(TEST_SUCCESS, memcached_servers_reset_SETUP(memc));
-diff --git tests/libmemcached-1.0/setup_and_teardowns.h tests/libmemcached-1.0/setup_and_teardowns.h
-index 7610c5a..59b56f6 100644
---- tests/libmemcached-1.0/setup_and_teardowns.h
-+++ tests/libmemcached-1.0/setup_and_teardowns.h
+--- a/tests/libmemcached-1.0/setup_and_teardowns.h
++++ b/tests/libmemcached-1.0/setup_and_teardowns.h
 @@ -64,3 +64,4 @@ test_return_t pre_buffer(memcached_st*);
  test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc);
  test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP(memcached_st *memc);
diff --git a/dev-libs/libmemcached/files/debug-disable-enable-1.0.18.patch b/dev-libs/libmemcached/files/debug-disable-enable-1.0.18.patch
index ed87cbd7a1c1..fa483b52dcfb 100644
--- a/dev-libs/libmemcached/files/debug-disable-enable-1.0.18.patch
+++ b/dev-libs/libmemcached/files/debug-disable-enable-1.0.18.patch
@@ -1,7 +1,7 @@
 Fixed a bug that caused configure to disobey the enable/disable debug flag.  The debug flag will default to disabled if not specified.
 diff -ru libmemcached-1.0.18-orig/m4/ax_debug.m4 libmemcached-1.0.18/m4/ax_debug.m4
---- libmemcached-1.0.18-orig/m4/ax_debug.m4	2014-11-05 14:43:53.720284916 -0600
-+++ libmemcached-1.0.18/m4/ax_debug.m4	2014-11-19 14:23:19.512482198 -0600
+--- a/m4/ax_debug.m4
++++ b/m4/ax_debug.m4
 @@ -49,16 +49,18 @@
      [AC_PREREQ([2.63])dnl
      AC_ARG_ENABLE([debug],
diff --git a/dev-libs/libmemcached/files/libmemcached-1.0.18-autotools.patch b/dev-libs/libmemcached/files/libmemcached-1.0.18-autotools.patch
new file mode 100644
index 000000000000..9194539aeb53
--- /dev/null
+++ b/dev-libs/libmemcached/files/libmemcached-1.0.18-autotools.patch
@@ -0,0 +1,61 @@
+* Automake 1.14+ fix for AC_PROG_* instantiation
+* Disable old GCC flags
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,10 +13,6 @@ m4_include([version.m4])
+ AC_PREREQ([2.61])
+ AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
+ 
+-# Setup the compilers early on
+-AC_PROG_CC([cc gcc clang])
+-AC_PROG_CXX([c++ g++ clang++])
+-
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+@@ -61,6 +57,10 @@ LT_LIB_M
+ 
+ AC_SUBST([lt_cv_dlopen_libs])
+ 
++# Setup the compilers early on
++AC_PROG_CC([cc gcc clang])
++AC_PROG_CXX([c++ g++ clang++])
++
+ 
+ AC_PROG_CC_C99
+ AS_IF([test "x${ac_cv_prog_cc_c99}" == "xno"],[AC_MSG_ERROR([No c99 compatible compiler found])])
+--- a/m4/ax_harden_compiler_flags.m4
++++ b/m4/ax_harden_compiler_flags.m4
+@@ -138,7 +138,6 @@
+            _APPEND_COMPILE_FLAGS_ERROR([-H])
+            _APPEND_COMPILE_FLAGS_ERROR([-g])
+            _APPEND_COMPILE_FLAGS_ERROR([-g3])
+-           _APPEND_COMPILE_FLAGS_ERROR([-fmudflapth])
+            _APPEND_COMPILE_FLAGS_ERROR([-fno-eliminate-unused-debug-types])
+            _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
+            ],[
+@@ -213,7 +212,6 @@
+           _APPEND_COMPILE_FLAGS_ERROR([-Wunused-local-typedefs])
+           _APPEND_COMPILE_FLAGS_ERROR([-Wwrite-strings])
+           _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
+-          _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
+           _APPEND_COMPILE_FLAGS_ERROR([-pipe])
+           _APPEND_COMPILE_FLAGS_ERROR([-fPIE -pie])
+           _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
+@@ -247,7 +245,6 @@
+            _APPEND_COMPILE_FLAGS_ERROR([-H])
+            _APPEND_COMPILE_FLAGS_ERROR([-g])
+            _APPEND_COMPILE_FLAGS_ERROR([-g3])
+-           _APPEND_COMPILE_FLAGS_ERROR([-fmudflapth])
+            _APPEND_COMPILE_FLAGS_ERROR([-fno-inline])
+            _APPEND_COMPILE_FLAGS_ERROR([-fno-eliminate-unused-debug-types])
+            _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
+@@ -318,7 +315,6 @@
+           _APPEND_COMPILE_FLAGS_ERROR([-Wwrite-strings])
+           _APPEND_COMPILE_FLAGS_ERROR([-Wformat-security])
+           _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
+-          _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
+           _APPEND_COMPILE_FLAGS_ERROR([-pipe])
+           _APPEND_COMPILE_FLAGS_ERROR([-fPIE -pie])
+           _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
diff --git a/dev-libs/libmemcached/files/libmemcached-1.0.18-disable-sphinx.patch b/dev-libs/libmemcached/files/libmemcached-1.0.18-disable-sphinx.patch
new file mode 100644
index 000000000000..964173c852ba
--- /dev/null
+++ b/dev-libs/libmemcached/files/libmemcached-1.0.18-disable-sphinx.patch
@@ -0,0 +1,13 @@
+Disable invoking sphinx
+https://bugs.gentoo.org/806613
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -57,7 +57,6 @@
+ include libmemcachedutil-1.0/include.am
+ 
+ include clients/include.am
+-include docs/include.am
+ include man/include.am
+ 
+ if BUILD_LIBMEMCACHED_PROTOCOL
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
new file mode 100644
index 000000000000..9033195b21fb
--- /dev/null
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="a C client library to the memcached server"
+HOMEPAGE="https://libmemcached.org/libMemcached.html"
+SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug hsieh +libevent sasl"
+# https://bugs.gentoo.org/498250
+# https://bugs.launchpad.net/gentoo/+bug/1278023
+RESTRICT="test"
+
+RDEPEND="
+	net-misc/memcached
+	sasl? ( dev-libs/cyrus-sasl )
+	libevent? ( dev-libs/libevent )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/debug-disable-enable-1.0.18.patch
+	"${FILESDIR}"/continuum-1.0.18.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-disable-sphinx.patch
+)
+
+src_prepare() {
+	default
+	rm README.win32 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dtrace \
+		$(use_enable sasl sasl) \
+		$(use_enable debug debug) \
+		$(use_enable debug assert) \
+		$(use_enable hsieh hsieh_hash)
+}
+
+src_install() {
+	default
+
+	# https://bugs.gentoo.org/299330
+	# remove manpage to avoid collision
+	rm -f "${ED}"/usr/share/man/man1/memdump.* || die
+	newman man/memdump.1 memcached_memdump.1
+
+	find "${ED}" -name '*.la' -delete || die
+}