Add net-misc/memcached-1.4.36

3 files changed, 97 insertions, 2 deletions

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 61e5736b..98b420a3 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,4 +1,4 @@
-AUX Manifest.gentoo 795 SHA256 82ac0de5a7272a2ce8bf9fbf8b5908dece2ef23cfe723f449bbe05cec99a4aab SHA512 eee3930f41232ec93edc9be816464303a5dc05b7083cb5f111fd2c930b42fa77f59440c9705bc26cf59747ec0828fb752565f11738b67378b3f2419249c14cbc WHIRLPOOL 67ad166c1a1880051ec4a084c4cd38f00a59fbf2ebdce1887ef5a4405002ffc5ce6396e15c5f346c5382e79f594c60afc90f40afcb08d045f9a81e60bcffe6c6
+AUX Manifest.gentoo 795 SHA256 4c02c451eb6ce8afbfec08b6061f6df6138cb13b592b02db5897659e696c81f6 SHA512 ae966f9c03608246daf72fbdc396058133c72cb5f43adc535ac4398fb4f52d581eea338023d5c70880f74c1f487df078185987cff8922b985e770bc01952f46e WHIRLPOOL 5fefe25a26ab121787b00020f62556515c2e4639e7b6dea4c0362c3d41470589a5c6c77ec6222974f25763722c40ae5522f20f834ac6b254f6ad17571bf5448a
 AUX Manifest.gentoo_prefix 795 SHA256 82ac0de5a7272a2ce8bf9fbf8b5908dece2ef23cfe723f449bbe05cec99a4aab SHA512 eee3930f41232ec93edc9be816464303a5dc05b7083cb5f111fd2c930b42fa77f59440c9705bc26cf59747ec0828fb752565f11738b67378b3f2419249c14cbc WHIRLPOOL 67ad166c1a1880051ec4a084c4cd38f00a59fbf2ebdce1887ef5a4405002ffc5ce6396e15c5f346c5382e79f594c60afc90f40afcb08d045f9a81e60bcffe6c6
 AUX memcached-1.2.2-fbsd.patch 328 SHA256 a0e91bd63a01a1a3361b0465fb9c63d091627d8714f3f64c853723b31da54b2f SHA512 efbafa228cc969c49b303e1d746f1699acd3c627ba65f57a8cd9fe63b87c3ce3aa01daa6a767d09c4edb8fdd9159254a0d14e8b6b05263e82041d5d5dcf251a2 WHIRLPOOL eefb5240bd848446f90f68f5b46bfdd9e1559bb3ade827a20082ba3ac72b77e28bf6fa1d7a3d9b7fd6f8cdfe84e2624cdcc14a9ef98ad9d0b73106107ec01a08
 AUX memcached-1.3.3-gcc4-slab-fixup.patch 1051 SHA256 a812ac8711230764408eab9c3379811b7143d799d787d6f1642a45c82967c62d SHA512 7ba91b6add12d7a45d02a425f172052f3762d038eec921c9f2b65afb1cb031acb2bff07c299cf7792894653138afb04fe9924df7939a10559dacff53a8786dd3 WHIRLPOOL 2a8b6c329ad2b6ba1fd1c36d5687e46c50e9be88997d8f44e374cbf83c78018d45aa6dcf6af384d7abc88d0d3bad1fc12db201ef4726fe169863ae3322b62341
@@ -13,8 +13,10 @@ DIST memcached-1.4.24.tar.gz 354917 SHA256 08a426c504ecf64633151eec1058584754d2f
 DIST memcached-1.4.25.tar.gz 359709 SHA256 f058437b3c224d321919a9a6bb4e3eedb2312ed718c0caf087ff2f04ab795dda SHA512 e037c3bbb68c4077f814f855663501af418ce3b1f8bc20f8e7eba3249aea378e55b3291457952fa4511779ec3702496fdaab5799edae7d59bc64eb6fd54ee14e WHIRLPOOL 213bb95d9b814e446dce31073701d997ac6b994bca655bf38eb7b8f552c4bd7e87bd36d5f9a802a965649306fe5e1ea3f093b4ce274119b23fe7aaf22a55f2ca
 DIST memcached-1.4.31.tar.gz 389502 SHA256 77ce5f820bafe94c33bf7bd86268d9bcdb3b76f68128d795b106db53d528707f SHA512 0e3faf7f574599d06df6764c98e0f01f3ed64c480efdc59ed01975e6149a836a1d47844ed9c1824a596ae1c42c1c5e36fd64692399d1073c120ea97a655c3532 WHIRLPOOL 51b7cbe3dca71895b8702af527644f671e6e5683b2af6b85abf9f73ccea41d5ea2e6a2ecb034f0e932a64cd9eee06225ea584d04ca02c49efbde4322de1f6899
 DIST memcached-1.4.33.tar.gz 389813 SHA256 83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d SHA512 00af5a2f46702fb8e606b1035cdaad125445d8eb701927a3ccccd7cd6c12e0811efb3ad917e3118043fd993b5c313f1aa0c4b2a471218e971a21fed7c896e136 WHIRLPOOL 05ee1d4ea931a1f1792283b1d947ffa48752cb6ad1417d06221f967b00e638f5fa21448080efc1de1adf7457bd202b6102ae1495ba1e01368fcba04565c95299
+DIST memcached-1.4.36.tar.gz 399047 SHA256 773b6bb20bf80223ca6a15d75f570fbab346ad11ec98595e5af5e33f54bd82d8 SHA512 37334c0e04af3175153fa4ac37606c2040dcba31556435abfd17d44d9038fc46df9355bf13103ecdede2c6716baf82699e7f62f1891aa587db232e992cf3aeea WHIRLPOOL 27e4b48ad395811fa9a145e650e43ce18f68315dc18d85947742bab8d068bca570aa41e80024956e8d401eb5b656f353d97376151ff6ab8b0624b1cb686002d6
 EBUILD memcached-1.4.17.ebuild 2404 SHA256 a350996912a33beea0281a12267a4f5e5d3ac02593d22376dd67bca79154fca6 SHA512 f6f37ec46b57579e17f146e37b6a27bfe8bdd2fb52d9394f7383c2c1518733446ff20f87dc625ddeb0c33baf44a7b99979eb752dbfbd30e901273cb529635f4b WHIRLPOOL e6dd59daa411e7dcbd57a056d9f6b09ce56a3ef02b23cff17d7e87eb001f967fd2fe2530b4516b3696aa0b23c05ea6a108728b20f515def7e7152a1633e12e86
 EBUILD memcached-1.4.24.ebuild 2703 SHA256 703a28434545e7e1d090ead7fe78914723563f1f805a503476e0a30ebe960017 SHA512 07dc20120d8e0c9f7cad82e75cbabc917bfb0274ec94f662aa8672d20a19909d50ae7cd7efb92c372101c3ac080e1ff952a1d559d3088325d40e250b2eebec90 WHIRLPOOL 12bdbca745044e6b918d01e1ec0ad46d19ef4c28ba2aaa2b2d8541040a2c053d4d6bf7fb378c56e39d496c0407dac4c062103cf3a6ab6de2bbd78e93ee3290bb
 EBUILD memcached-1.4.25.ebuild 2714 SHA256 383ed57831889569e842eb9d84eb6f368051925d97dbb87dd6442619c0b9a374 SHA512 0001d1196b8193caee6e496509bd493b88cc7040c76fa2cc83b8deaf42e5cf158c9e09d773ac91a6efda652a3fc263b19c073c47fcf32b2d1f8e2e4d12a85768 WHIRLPOOL f4a5e2f9d2b433a7a2755542207ae46193cf507e4d08be0468d2c579a5bb83ff42c176ce12ad0b2dcbf76a005c93067592898edd23f2a18c7f4a1ae6534fdb5a
 EBUILD memcached-1.4.31.ebuild 2715 SHA256 07c5f995afd4bcce0c178a3d0197e47daceda5ee27c4e14340895e2355c9f43b SHA512 6c6cfc28963c160398a5227969b18f275488321c0c3c8f16d484ad721a3349d00e6f018f59bf96091b94804cf69edeffeac51c8b835091a82fffeecaf283b9e2 WHIRLPOOL 2f871d2636438dfe4a761ef69725cd7051b96246708e64338eac372918f5664bed439cdd5107e73bc057fd3e72917e95d9b2729ff2d98bc7a9008fa7af8dc255
 EBUILD memcached-1.4.33.ebuild 2710 SHA256 b5a73d621e8b0aafe9df895eaea6bc1c5f23a8b3f02f60db2fa169bd4304f216 SHA512 1b550c4b55831b052a1fdefab63809b91cdcc44f96d1d733967cc44e161491133176f7e20c09d1383a2d2e1342b1d6fbdebe2e009927e7a70b1fe3986302f326 WHIRLPOOL 7fffc66eea94e9f82dd8e2cc76d20111535b4f7b8d74f8c0c17c50432e87a20854c3c1da0950675b63733e6609d52fe4f78558f54350716530e3fb00e2927483
+EBUILD memcached-1.4.36.ebuild 2915 SHA256 52fe2d4687fd7bc1c466e8754bbddd3c71d8dfc72c8d507792c733b4228b3399 SHA512 33902cae1469376fa703f267a8c4f39c8c1af2641d71c6a3bd3b83b48693087504be7131e9575114160c20b6e054dc039d51c75319d40fd6ad25f7eadd216cda WHIRLPOOL 2342c99687b568976531135b52870f8dc138cc4bed775d522b0b60cd7619dd3d8b186a1e841afe812c128aba84587416e9b1b465ba4ae95617397a7285465899
diff --git a/net-misc/memcached/files/Manifest.gentoo b/net-misc/memcached/files/Manifest.gentoo
index 13a97224..2544e78a 100644
--- a/net-misc/memcached/files/Manifest.gentoo
+++ b/net-misc/memcached/files/Manifest.gentoo
@@ -9,5 +9,5 @@ memcached-1.4.33.ebuild	db407f7f652ccb8dc49fbbc14c4e1f7d
 memcached-1.4.33-r1.ebuild	dbd2ff6f55660ada9d838c995469d421
 memcached-1.4.34.ebuild	dbd2ff6f55660ada9d838c995469d421
 memcached-1.4.35.ebuild	dbd2ff6f55660ada9d838c995469d421
-memcached-1.4.36.ebuild	dbd2ff6f55660ada9d838c995469d421
+memcached-1.4.36.ebuild	152e70dd24fd49fee7104adaea1d5eac
 metadata.xml	6ce932b915adee14573401097525c964
diff --git a/net-misc/memcached/memcached-1.4.36.ebuild b/net-misc/memcached/memcached-1.4.36.ebuild
new file mode 100644
index 00000000..aa5d2180
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.36.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl selinux systemd" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )
+		 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
+}
+
+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
+	use systemd && 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
+}