gentoo resync : 18.11.2019

4 files changed, 105 insertions, 2 deletions

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index a1ca53ee9c95..0ca51a939686 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -7,6 +7,8 @@ AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c0564
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
 DIST memcached-1.5.19.tar.gz 517380 BLAKE2B 8c6e7c87e786d88c783da87396daec9deb0c9f8c4112fa7cec6d79e8e96505576c2b7f3dff91317a3f45582322cfdb435535a41bb537b0a0bfec9df6f8d5986f SHA512 4445f383e18ffc53071c13b495c3864978658f4f6f439ab4579dd831fc12ad4850e04e9526954608ae627b0b23a9d6cb327560f02d15abff23e12f5d7c1723b4
-EBUILD memcached-1.5.14.ebuild 2902 BLAKE2B ac9d561fc47ca13f81329356c6df5b4e8a01d9455523d2f76ec59dc72f988c0a419419f20ee6554e43b47256f9ee575f8d6b003c55a31456ac0980049fcd04d4 SHA512 40d6050f2d55fbe1f3aa44813d3838d7bc6f7b8450b28812b560d71fc3ff5d2c3d091add8561832109c2675c91eb0947126f29e693fa08972e3a03a77840c12e
-EBUILD memcached-1.5.19.ebuild 2910 BLAKE2B 45f2b2f38071fbac8b3136504cb867ce0bc3ff88f07a16ac345a9c6e1e25b911d2a444a205f724cbf99cdc01d12c9f91b0bc59ea3cec3f7fc20b59d6eb3892cd SHA512 eea0bfb868eb713e062903928d3a3a6994d4aaa6ef655ccdd040f124d992ef7e85008ab96c44e4f563bc97ffd8c742d6efb85780962a245d0b76d65daf9c4cae
+DIST memcached-1.5.20.tar.gz 531035 BLAKE2B fcabbb8deac585f20100855bbdd27616077e0f129a8537c39869ceb251fae8d598c64998846120f63f29a690afdc2a3603f87bb21ecc473e13f5ef9e9c48bbb9 SHA512 07b125971fcec2cd06797fe16e9825e18b9d3446f6b91583f82f1b50920cd0e55c65506ebdf5fcef7b08d92f9641a20859ba67b3dd3986ba5624d0d6f494293d
+EBUILD memcached-1.5.14.ebuild 2930 BLAKE2B 1e47dcee14202eb3f7de51c779c5e6ddb9eea26fd743a362919fb6bf60e4d2333910b8eb1db13491f429eeb19d9451912e6ec1bdb753ee21eb7f2bdf90415864 SHA512 29986b6567a677dc7b9fb514a03966dc9f661ddfcc5e380118eb4e1b12d06601347149a8e4a97bfbdcbec04f6de243c2fd9201725017c562cb73bc407d79578d
+EBUILD memcached-1.5.19.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8
+EBUILD memcached-1.5.20.ebuild 2940 BLAKE2B abcb695f6e2510d3e471d671a63e7603137557f7189a9eec1ca060dca67407a3fd1dc5b104d66978265c4bc3ec2e5b3b690440fe88d23d0dcedcb19b82a8d292 SHA512 ce50addf474089d4a901216fd4c0e936fdb469a6da0f6ab66e75328622b4b9c7f70fdc4a1bb011e30a7c6440cc01b56e3ae99fbd0a4fca88a398389de7775413
 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 7aa1883474fc..2b30e1b9a807 100644
--- a/net-misc/memcached/memcached-1.5.14.ebuild
+++ b/net-misc/memcached/memcached-1.5.14.ebuild
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
 	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
diff --git a/net-misc/memcached/memcached-1.5.19.ebuild b/net-misc/memcached/memcached-1.5.19.ebuild
index c2d8ac61d125..77a0b3f38a8a 100644
--- a/net-misc/memcached/memcached-1.5.19.ebuild
+++ b/net-misc/memcached/memcached-1.5.19.ebuild
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
 	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
diff --git a/net-misc/memcached/memcached-1.5.20.ebuild b/net-misc/memcached/memcached-1.5.20.ebuild
new file mode 100644
index 000000000000..0a1da23139ba
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.20.ebuild
@@ -0,0 +1,97 @@
+# 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 ~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}"
+
+RESTRICT="!test? ( test )"
+
+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
+}