gentoo resync : 02.06.2019

3 files changed, 99 insertions, 2 deletions

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 8af472cb0515..a73fe2f4073e 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -11,12 +11,14 @@ DIST memcached-1.5.11.tar.gz 457692 BLAKE2B 248e1b1e6aa54db06d18086add51964b8fc6
 DIST memcached-1.5.12.tar.gz 457719 BLAKE2B 6ad223cc62b3514f42eb91851cb906aa6c22f1bed65aed8b9bd5f11d8201bd1e946ddf980e26f4a2a8380f1da03ad7a4e9ad68f2c830bbfa948fe117b2689c3c SHA512 95927fcc06e83e46a050dd50c85e50faf41e6d1f6901b757f7a842b7727a596054082a512a3b830729171556e8a995f037d39d991df2198a80a4e61a6efa1fd8
 DIST memcached-1.5.13.tar.gz 483697 BLAKE2B fb4f58cbeb518941a92dc213ce2d30dda501bc84c61ae5fa520c1a3a5cfd58ed92128ea098430d57b2a3db69f0d8e8a77dd38ea7edf4440b3f6c484d3b3fb966 SHA512 77ea80135f572ff49d030ea1da01b31aa6513589e75c370ef306a986a79129358062730dfebe6801487eeb20b1367aed4096514e882ef35425c764434493fa7b
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
+DIST memcached-1.5.16.tar.gz 487868 BLAKE2B b9889866b8adbbbf23785f0da35f6f6b3cd5c842c6167beab3dd5385d6ed53e4607a2ffc18cd815005f2a1d67a3a549c780411b93d34335c541f4999d793b8a0 SHA512 999872c4c68e0210feab76f74c9487fbfb652cf3e6b7fa347f882767aad41ea6d8ba3ee056494409c054d673fc209032d8a890605810b2c6c9048d26d50751a0
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
 EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9
 EBUILD memcached-1.5.10.ebuild 2933 BLAKE2B 53ed1e26ad2f3d60088b0f0eb4020d8338fcf27bca4a72224ecf61f3c9b31421ee1d6480f1aba03c7dfe07948fc0b7112f3442655ec27762d4dcc543b7d3c630 SHA512 450b27248f092e78827d95e7fab3276112b2da4b907339519e5afaaf3ce3902f2a5ac082db187d68fbd1c26874450596d5d2b42df4d6e96bcbf442b56e08f0b4
 EBUILD memcached-1.5.11.ebuild 2932 BLAKE2B 694ee35427d6009183f94e438b3ca51d2cb4bfda1c1bc0e93fa7e18b823c9291440698ffa364fe40fea6621248bfe87c6d789cb943dab9ca634550613e26fb4a SHA512 db18f156d71c8d7f31228669109ee1448ac6df8722b9f11ac02dcdcb0c33d4b367d1540c4cc5b3d1f036118c482a6e61a8672b3cde0c27c6f091a94d8a864475
 EBUILD memcached-1.5.12.ebuild 2923 BLAKE2B db692987cbde108325f1a634338339a33cc05994a3dbc9d5ee30a096b5fac6bf91779874257a217b95ae6266a29c6c821798deb20821f42be92b71c6945dfc04 SHA512 f32c20794b3385d881abdcd109c1569d725af77e4d08ce384e1ff10c55ca330f9fb200a5c9a8f1353f36d650633a8e110a1af3ddc54d7c6a446ab181caacef29
 EBUILD memcached-1.5.13.ebuild 2921 BLAKE2B 2b1c3a401a1709575ed32394830c0e8c155962ed8762d5645983437aaf55eb97ecc04c29dc8bb4d85601a019034e7187ad8cfc0ffe50531c9303969e4f103d62 SHA512 d2aa1b965e03d0242265b151dd29c0fd1dab9858c650eace0a1a931a24b6ecb5e5adda22993d738eb8bf06c62a8db3ca6f2e002aa0378f5847ecd4010e756129
-EBUILD memcached-1.5.14.ebuild 2919 BLAKE2B b1b560721a021cb44bf6d5fe0fbe299a2c14c4309b925ba066f76d1c5abcd2e256ff815b285c6f6befc47708b7c6977f747f9ee0e82c21441304f7736be34a56 SHA512 d6d65f3eeaa12b4d336e688f69ebfd3723b995eb85d72092af0100aaf3ad3a7be9b305c33051dd3116056d447b829f0d69be00d7e77f54059c3ee935932646eb
+EBUILD memcached-1.5.14.ebuild 2914 BLAKE2B 340b10974394fb77b2b4c04c0864675374c466ea93b853d4e5f042a0de7759f9d4fb09f2e4a73120716b58e8d7887ba4322cc38d533ae0783e1e486ec1abce29 SHA512 2b63ffb131a7a499610cb4b51f83478284f5c20b468147a3b23158b7380b52f86bdd007269d76e75936aec901652dc206ebab508435e814f2ae32034b61df663
+EBUILD memcached-1.5.16.ebuild 2922 BLAKE2B e2dd55a2876f4ae53465b2df1aedac099e496227b4ae56c00a9c081a8069d2e6ad4d489b8414865a431101db52dd32f50a65e2245122e3a484d3b3afc2800a1d SHA512 45cff587c952d530c1c986789ef6b54f5cd177b238e2941f8ea604412374b9fbdc09b4fb0a676914f6d54edfbde3a463d2fa94a45a70876a20ba89166e4af251
 EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.14.ebuild b/net-misc/memcached/memcached-1.5.14.ebuild
index 4e9b834c2f91..c1fbb16c9220 100644
--- a/net-misc/memcached/memcached-1.5.14.ebuild
+++ b/net-misc/memcached/memcached-1.5.14.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 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~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:=
diff --git a/net-misc/memcached/memcached-1.5.16.ebuild b/net-misc/memcached/memcached-1.5.16.ebuild
new file mode 100644
index 000000000000..8d046a22030e
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.16.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic systemd user
+
+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 ~sh ~sparc ~x86 ~x86-fbsd ~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}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	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() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	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
+}