gentoo christmass resync : 25.12.2020

3 files changed, 2 insertions, 103 deletions

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 58251156ebe8..cd5d1cadbb33 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -7,11 +7,9 @@ AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034
 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.7.tar.gz 547791 BLAKE2B 7ee39a5867cfaa52eb5cfb947ce42f711e030422b03b5c5547284d5cab91c044d04293cc355da3b868fb0ca02e151aec5980e455c1bb8067e38682209b1e3e4e SHA512 8b4c44ae4da8577cc5431aaca6118fdba27c42418a51a6d319d9040a975371a2fda9fcea2cb44c3d20c92f08961cb5f0ddd28c2f4cd12986b73c9342d91ea2c8
 DIST memcached-1.6.8.tar.gz 548024 BLAKE2B ab20f2c2e5a8f6cc4e0e1ef26e21f5d5b0baae35df887abd427d460591f9eadebbc08217a52e153c60b98098051ef855b918b74983bcb26f50b413caf508dca8 SHA512 256dd2b62fe9365183a44d9df99510f99f2fbb01d2afdf1558987331e7e746407f1caf5b93c82cb3e9b22ca8f8bc3d021706faf3849e60e43d9fdf7c1ec7cdcb
 DIST memcached-1.6.9.tar.gz 556137 BLAKE2B 429d0d5de480d0a17a2c9942f595fab125d60ef1f3ff88754ab6e97eb9acdb71b26e40323babc7197e41d1605a82d2f094ce5638d2f4442467c8f652e20aaa44 SHA512 2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c
 EBUILD memcached-1.5.22.ebuild 2945 BLAKE2B 0c4c35283d3974009dbd401699b8bb10e695b9d608daceb87402316b083772c2f1ef932d9ccf72ca17bc895602e7ac032fcd215bf7a40a9d29d8843ef774b01c SHA512 a22de0a032ffd098a4283ebf97aefc0e315744d59893c61110a46eba734f78ec4f98d1c8968756471811244fd02c38b7d17f83a385aeb1117aec0dee9a977618
-EBUILD memcached-1.6.7.ebuild 2879 BLAKE2B f544543fa423ec039db5de7f4833e827e751abe31c7238ccd8449dc1ec9d04e793acccd892b03b2251e1ee72232983211c4185d55b0dc66bd09124b97c77c0de SHA512 e89bbf64686b0edd4514f42707ecec7aac5dd34e4a6892052b51d0408d71c42ba14fe9a56eec83556d1a4664cb19fbbe638b2cf77a6c78e332edc05a745c4121
 EBUILD memcached-1.6.8.ebuild 2879 BLAKE2B f544543fa423ec039db5de7f4833e827e751abe31c7238ccd8449dc1ec9d04e793acccd892b03b2251e1ee72232983211c4185d55b0dc66bd09124b97c77c0de SHA512 e89bbf64686b0edd4514f42707ecec7aac5dd34e4a6892052b51d0408d71c42ba14fe9a56eec83556d1a4664cb19fbbe638b2cf77a6c78e332edc05a745c4121
-EBUILD memcached-1.6.9.ebuild 2881 BLAKE2B 46e83166f00bda0762f966c90b943260d2e648ae57cf1bfa48e750367fbe7c7e4dc8e52906f17f4c12085ac50a72ac471e87fb958eb777fbf7b4d1728acfb0e7 SHA512 342fdc991a53c4dfb58b54682384cfa7c803a26d435f01dbf06cd23688fae99ab4d2736024c0d3bf0df596beb74326be262f7147a88965f590257dc3a08bacbb
+EBUILD memcached-1.6.9.ebuild 2879 BLAKE2B f544543fa423ec039db5de7f4833e827e751abe31c7238ccd8449dc1ec9d04e793acccd892b03b2251e1ee72232983211c4185d55b0dc66bd09124b97c77c0de SHA512 e89bbf64686b0edd4514f42707ecec7aac5dd34e4a6892052b51d0408d71c42ba14fe9a56eec83556d1a4664cb19fbbe638b2cf77a6c78e332edc05a745c4121
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.6.7.ebuild b/net-misc/memcached/memcached-1.6.7.ebuild
deleted file mode 100644
index 563ec54b1aea..000000000000
--- a/net-misc/memcached/memcached-1.6.7.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 ~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.9.ebuild b/net-misc/memcached/memcached-1.6.9.ebuild
index d1349f310a79..563ec54b1aea 100644
--- a/net-misc/memcached/memcached-1.6.9.ebuild
+++ b/net-misc/memcached/memcached-1.6.9.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 ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=