gentoo resync : 23.12.2017

2 files changed, 97 insertions, 0 deletions

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 941d7a9c4edf..6b2aa95a38f6 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -10,9 +10,11 @@ DIST memcached-1.4.39.tar.gz 403751 BLAKE2B fc6082eb9b6dc5ee41c42ded9bcde03ebfe8
 DIST memcached-1.5.1.tar.gz 407282 BLAKE2B cdaf384c10c28560acf97304fe97b39ed7b90110394bdbd913025ef239a45b04a273d7b322f1408a2b9b228c7371935b3024f6352909e35b3d247aa680744200 SHA512 686ad82f1fd73f683fa09930d4e14aa85bd8237106e39752c9676d31aa397db1687378c4ddfadf4591f7c623837cadf90e6643263aea78a80eb294683ed0dfbb
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
 DIST memcached-1.5.3.tar.gz 409131 BLAKE2B e54b364c19ab1ecc2b4d56b5a778d8542cf588155bd4c5f352bb5c9993e53017e75226cfa805f11e2727fc2ba5cccb39f91dff28a8c27dafb223694500f4565e SHA512 b28282c579891e7c5508eb5ab4680b933aa76e8e4a8fe575c996fd4e750f2b4b35ee734d01ae0f280cf4cf6e0530f7f6a95c2e07be3660b07c5ade6ad3c835e2
+DIST memcached-1.5.4.tar.gz 448831 BLAKE2B 721288bdc6184daf70817010074d6513b3fa189c86bde04afb61e7d8ac28f09e71eba0f819a0e0a96df26a938b8f94c3d047e85d93e43abb884cafdbaf54b323 SHA512 3154a2cad54d57f14bf9c07cfc6e4ed0bd6908f81642de9766d65c69b78bb36effb6221684b1e5f9e355fd8c64a0338aade3cb3bf36603d311c86bc94fe5d13d
 EBUILD memcached-1.4.33.ebuild 2624 BLAKE2B b5e15c766386beb37088661384ac7580e3b446bc338cabb047ee36141668a4459e1ceb19786f96d72de8fcb8da7a02fbfc093181163a949c146bc901a8fe4961 SHA512 95106208e83a37e1d1f94c04cb2942194f4ed9e7f8470b831529849c3ca62b48477fc0937e87ec7cd44204d87df7672ff72e20199068d21f63b8320335e074a2
 EBUILD memcached-1.4.39.ebuild 2887 BLAKE2B 373162846501fb6d7228f0d72046b01c64dddbc6af0c6442bce84d9d13feb67fcab5bf96a67725ab7e5e971925ea0d0610d1065bb8285325496cd3481d8e3205 SHA512 0726d795ffbaa17ed04b3b307146742bd647ab6c2084a1e0f22b333b293ac6e15a7488d69fd166f2480c49c87b236f14e7d7d7642c40fe853097347e9199e706
 EBUILD memcached-1.5.1.ebuild 2903 BLAKE2B 084d39e32b81980d5fc24b55852e26a95bdf1e319131c2c033411815633651adb79b4a963bbc505f9dd217fac08a6413ab662c39ab4b461388c8dfeb84d19d61 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6
 EBUILD memcached-1.5.2.ebuild 2898 BLAKE2B aad8137980122e3ff16c1140d8197916a76f1708dce092f8a1a0983ad182be27853ea749e922488e438339106d01767cbe2ba541c7ce952598f6b20863a51454 SHA512 6f77d52dd72cc12be893c36df6b1953bef5980e97d2fca15288b9fc5c826c1178ed6d780dfc7bca95606733c63320830a819f05b61f6d034131a42bb4ca98595
 EBUILD memcached-1.5.3-r1.ebuild 2947 BLAKE2B 8a4326cc80965c2207d347ede2733d9881832c847d7d4a0f849d935bdb295af0460c5268d21997098c0e159913472e760f8dbc92e48d360b97b4297d7fc2926b SHA512 c34042999c6efe39d94a11175f4050b0ff83aa0b0a8d67f3cc50f0b21fd0590c0120134d22d87e0b28e858ebf4962d88c9c02c919ac4ba3130db25cda2a6a929
+EBUILD memcached-1.5.4.ebuild 2947 BLAKE2B 8a4326cc80965c2207d347ede2733d9881832c847d7d4a0f849d935bdb295af0460c5268d21997098c0e159913472e760f8dbc92e48d360b97b4297d7fc2926b SHA512 c34042999c6efe39d94a11175f4050b0ff83aa0b0a8d67f3cc50f0b21fd0590c0120134d22d87e0b28e858ebf4962d88c9c02c919ac4ba3130db25cda2a6a929
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.4.ebuild b/net-misc/memcached/memcached-1.5.4.ebuild
new file mode 100644
index 000000000000..ec97582ffbf3
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 ~sparc-fbsd ~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
+}