commit: 19b320d6b8f434c7bafc14427150604a1047e0ff
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 18:44:17 2020 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 18:44:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b320d6
net-misc/memcached: 1.6.8 stable amd64/x86 with 1.6.6 cleanup
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
net-misc/memcached/Manifest | 1 -
net-misc/memcached/memcached-1.6.6.ebuild | 99 -------------------------------
net-misc/memcached/memcached-1.6.8.ebuild | 2 +-
3 files changed, 1 insertion(+), 101 deletions(-)
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index ed88ef0e388..18661a6a9d6 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,5 +1,4 @@
DIST memcached-1.5.22.tar.gz 532713 BLAKE2B
90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3
SHA512
19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
-DIST memcached-1.6.6.tar.gz 543661 BLAKE2B
04de48d6450961585ac3b1c8ae6f803c59e5bbf34e45aa27c9e53309350608dc3c899cf169095361c4ccdc44e0bcc2860662d7066477abd7fdc8e80e34d22d36
SHA512
dfd19bf42d35fff391bb479338706a83082e3cdd3ff6e225d3d4da9df01b0a1f659a012dc30766651ffd57f0c19128fc4c3df29b721e588c909656d02cfdaa0a
DIST memcached-1.6.7.tar.gz 547791 BLAKE2B
7ee39a5867cfaa52eb5cfb947ce42f711e030422b03b5c5547284d5cab91c044d04293cc355da3b868fb0ca02e151aec5980e455c1bb8067e38682209b1e3e4e
SHA512
8b4c44ae4da8577cc5431aaca6118fdba27c42418a51a6d319d9040a975371a2fda9fcea2cb44c3d20c92f08961cb5f0ddd28c2f4cd12986b73c9342d91ea2c8
DIST memcached-1.6.8.tar.gz 548024 BLAKE2B
ab20f2c2e5a8f6cc4e0e1ef26e21f5d5b0baae35df887abd427d460591f9eadebbc08217a52e153c60b98098051ef855b918b74983bcb26f50b413caf508dca8
SHA512
256dd2b62fe9365183a44d9df99510f99f2fbb01d2afdf1558987331e7e746407f1caf5b93c82cb3e9b22ca8f8bc3d021706faf3849e60e43d9fdf7c1ec7cdcb
DIST memcached-1.6.9.tar.gz 556137 BLAKE2B
429d0d5de480d0a17a2c9942f595fab125d60ef1f3ff88754ab6e97eb9acdb71b26e40323babc7197e41d1605a82d2f094ce5638d2f4442467c8f652e20aaa44
SHA512
2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c
diff --git a/net-misc/memcached/memcached-1.6.6.ebuild
b/net-misc/memcached/memcached-1.6.6.ebuild
deleted file mode 100644
index 563ec54b1ae..00000000000
--- a/net-misc/memcached/memcached-1.6.6.ebuild
+++ /dev/null
@@ -1,99 +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 ~sparc
x86 ~amd64-linux ~x86-linux ~ppc-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"
-)
-
-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.6.8.ebuild
b/net-misc/memcached/memcached-1.6.8.ebuild
index d1349f310a7..563ec54b1ae 100644
--- a/net-misc/memcached/memcached-1.6.8.ebuild
+++ b/net-misc/memcached/memcached-1.6.8.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 ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
RDEPEND=">=dev-libs/libevent-1.4:=
