gentoo resync : 20.10.2021

3 files changed, 2 insertions, 58 deletions

diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index 9ebb9ed7fab2..b70b5a216c47 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -5,6 +5,5 @@ AUX libmemcached-1.0.18-disable-sphinx.patch 264 BLAKE2B 6b26230f2c79d4f9f0cffcd
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
 AUX libmemcached-1.0.18-musl.patch 1495 BLAKE2B be213de08d246829d5a017ca4f77c7c4581ead106c7ec817511698f2d66bca3271c2d2ab5f2017a15545538787f0c3a6bee8d0b148b180718fd43809a6bc6b6c SHA512 ddb0594d826d756115743caec69762995fd25e09fd3765c685cfd558e2918ffad0679fc2872d37c8e1954cbcdc14852dd861fcbf9eac645f47a86265ab2bd651
 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 1412 BLAKE2B 36bac5bd8bdb31b5eab5cd1f64b7d0188020b539c7e308128a345bbb7b948e17c8967851cf4afb1cb00a6a04f8fe6d843bbe7aba3e5765427fcfda15cb01440d SHA512 580b63b314ff87a1ef1dba80c54f32681c60a3d188cbd794abae2d37a18bd31f3331117e67cbdd6e60ebe2be5991faddd9a3d6eafd00b64f001778ec1e9f59a7
+EBUILD libmemcached-1.0.18-r4.ebuild 1405 BLAKE2B 31c13537a1643368d6b61c8345ca831f87f6be44c8b9a91bf3e170598834a8accbda232a4370cfe2ef2c21f81f1bd7184820e4ef0d50be66fea3f08d3671abf5 SHA512 5506713ed94046270f469af8595e31746f6ee7b03ccd9a5cf9725d87cbf5fb2e22b12aa65589c29da7287194dd31e9eabf64b82ceadc2c07866135f3a7347f3b
 MISC metadata.xml 827 BLAKE2B b3e3a04c088a9119eba98099919684fc7b59205259b6cac2301eefbfe3623d4dac1fc9692abce68505af65fb8a5a277337488f18d32bdf6e3823199a3c86391f SHA512 579b472acfc9763e94e7ccbf8173327aa40cc89c7dddb4234e20e9106aab809ccc928cf197c81f5bea096c2c2fb6703aba518e003122d7e552f75e7d59cb2f25
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
deleted file mode 100644
index cca07f3e5255..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.13
-
-inherit autotools epatch multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-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 static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/debug-disable-enable-1.0.18.patch"
-	epatch "${FILESDIR}/continuum-1.0.18.patch"
-	epatch "${FILESDIR}"/${P}-gcc7.patch
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	sed -e "/_APPEND_COMPILE_FLAGS_ERROR(\[-fmudflapth\?\])/d" -i m4/ax_harden_compiler_flags.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
index 213043a11dc1..494ea66b4cd5 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
@@ -11,7 +11,7 @@ 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"
+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