commit: e058ebca83d9e00aa4daefd02fe73af6f7263123
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 14:31:38 2019 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 14:35:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e058ebca
net-misc/memcached: 1.5.17 stable amd64 and x86 with cleanup
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
net-misc/memcached/Manifest | 1 -
net-misc/memcached/memcached-1.5.16.ebuild | 95 ------------------------------
net-misc/memcached/memcached-1.5.17.ebuild | 2 +-
3 files changed, 1 insertion(+), 97 deletions(-)
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index a904a696437..614a55f6127 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,4 +1,3 @@
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.17.tar.gz 490891 BLAKE2B
a971083ec29452755de953537ff9c23fc872496d4746420c9c20e91c226481bd3818c00495cb7a5d85f2bd38683061e57a9e92cbfe0e4cd28bcafde37f05cabf
SHA512
533c916015d738ff4c7ba8420654ae15b19370b3e959b89d43bc60cae1bda65d36906be05fad44a025ea1878570a8c1a36041c4e4c0cdf0cea84e6bb0e7ba325
DIST memcached-1.5.18.tar.gz 502185 BLAKE2B
a138dd2178906607fb75e76fa9806e41fe284cefd57a1be6b49f64ae4d3fd972c6996f1dedc161871e02271c9d3c42fbb4c957426f24c100f6024327fa03ba41
SHA512
00d12a97b6ae00814735491b31d1390a8dd15c99e971ae99547e70bf6b343023b88d6e26bb8404dea5f8636f26688e71cd39d8612d06902285b9be91786f9931
diff --git a/net-misc/memcached/memcached-1.5.16.ebuild
b/net-misc/memcached/memcached-1.5.16.ebuild
deleted file mode 100644
index c1fd0fcba78..00000000000
--- a/net-misc/memcached/memcached-1.5.16.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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
-}
diff --git a/net-misc/memcached/memcached-1.5.17.ebuild
b/net-misc/memcached/memcached-1.5.17.ebuild
index 8d046a22030..c1fd0fcba78 100644
--- a/net-misc/memcached/memcached-1.5.17.ebuild
+++ b/net-misc/memcached/memcached-1.5.17.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:=
