commit: 5e25f23d665fc2dbd383ae4717b81240ca8172d4
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 4 16:29:25 2020 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Mar 4 16:29:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e25f23d
net-misc/memcached: 1.5.22 stable amd64/x86 with cleanup
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
net-misc/memcached/Manifest | 1 -
net-misc/memcached/memcached-1.5.21-r1.ebuild | 100 --------------------------
net-misc/memcached/memcached-1.5.22.ebuild | 2 +-
3 files changed, 1 insertion(+), 102 deletions(-)
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 2e04c8eac0d..7b13f21fa61 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,3 +1,2 @@
DIST memcached-1.5.14.tar.gz 485076 BLAKE2B
729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6
SHA512
d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
-DIST memcached-1.5.21.tar.gz 532631 BLAKE2B
eaed8eae81c7874c48dfc6df5611d83d21a69a19c9b79bddbf909d15f1c84b3c03416002bf0beff07a8e6502741ad6f776e1cc86cf4b16840ea83c727db3c80b
SHA512
4ade3e15e6821b76f086b4933f5599248f8de7e7b2ae106dc8ecbc8a5073a1966e4c3956413fd57387bb88fca2c0e95b9a3ce7bfce19c42bec584a3268f06998
DIST memcached-1.5.22.tar.gz 532713 BLAKE2B
90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3
SHA512
19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
diff --git a/net-misc/memcached/memcached-1.5.21-r1.ebuild
b/net-misc/memcached/memcached-1.5.21-r1.ebuild
deleted file mode 100644
index 98253142de8..00000000000
--- a/net-misc/memcached/memcached-1.5.21-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils flag-o-matic systemd
-
-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}
- acct-user/memcached
- test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
- "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
- "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
- "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
- "${FILESDIR}/${PN}-1.5.21-hash-fix-build-failure-against-gcc-10.patch"
-)
-
-src_prepare() {
- 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() {
- 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.22.ebuild
b/net-misc/memcached/memcached-1.5.22.ebuild
index 4bd4eefadec..98253142de8 100644
--- a/net-misc/memcached/memcached-1.5.22.ebuild
+++ b/net-misc/memcached/memcached-1.5.22.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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:=
