Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/
Date: Sun, 27 Dec 2020 06:27:20
Message-Id: 1609050433.50fa33601648b36d17fc4b038fcb760f0c14fe50.prometheanfire@gentoo
1 commit: 50fa33601648b36d17fc4b038fcb760f0c14fe50
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 27 06:26:54 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 27 06:27:13 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50fa3360
7
8 net-misc/memcached: 1.6.8 cleanup
9
10 Package-Manager: Portage-3.0.9, Repoman-3.0.2
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 net-misc/memcached/Manifest | 1 -
14 net-misc/memcached/memcached-1.6.8.ebuild | 99 -------------------------------
15 2 files changed, 100 deletions(-)
16
17 diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
18 index c14e3105cd1..e01a2b2ce3f 100644
19 --- a/net-misc/memcached/Manifest
20 +++ b/net-misc/memcached/Manifest
21 @@ -1,3 +1,2 @@
22 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
23 -DIST memcached-1.6.8.tar.gz 548024 BLAKE2B ab20f2c2e5a8f6cc4e0e1ef26e21f5d5b0baae35df887abd427d460591f9eadebbc08217a52e153c60b98098051ef855b918b74983bcb26f50b413caf508dca8 SHA512 256dd2b62fe9365183a44d9df99510f99f2fbb01d2afdf1558987331e7e746407f1caf5b93c82cb3e9b22ca8f8bc3d021706faf3849e60e43d9fdf7c1ec7cdcb
24 DIST memcached-1.6.9.tar.gz 556137 BLAKE2B 429d0d5de480d0a17a2c9942f595fab125d60ef1f3ff88754ab6e97eb9acdb71b26e40323babc7197e41d1605a82d2f094ce5638d2f4442467c8f652e20aaa44 SHA512 2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c
25
26 diff --git a/net-misc/memcached/memcached-1.6.8.ebuild b/net-misc/memcached/memcached-1.6.8.ebuild
27 deleted file mode 100644
28 index 563ec54b1ae..00000000000
29 --- a/net-misc/memcached/memcached-1.6.8.ebuild
30 +++ /dev/null
31 @@ -1,99 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -inherit autotools eutils flag-o-matic systemd
37 -
38 -MY_PV="${PV/_rc/-rc}"
39 -MY_P="${PN}-${MY_PV}"
40 -
41 -DESCRIPTION="High-performance, distributed memory object caching system"
42 -HOMEPAGE="http://memcached.org/"
43 -SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
44 - https://www.memcached.org/files/old/${MY_P}.tar.gz"
45 -
46 -LICENSE="BSD"
47 -SLOT="0"
48 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
49 -IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
50 -
51 -RDEPEND=">=dev-libs/libevent-1.4:=
52 - dev-lang/perl
53 - sasl? ( dev-libs/cyrus-sasl )
54 - seccomp? ( sys-libs/libseccomp )
55 - selinux? ( sec-policy/selinux-memcached )"
56 -DEPEND="${RDEPEND}
57 - acct-user/memcached
58 - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
59 -
60 -S="${WORKDIR}/${MY_P}"
61 -
62 -RESTRICT="!test? ( test )"
63 -
64 -PATCHES=(
65 - "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
66 - "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
67 - "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
68 - "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
69 -)
70 -
71 -src_prepare() {
72 - sed -i -e 's,-Werror,,g' configure.ac || die
73 - sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
74 - eautoreconf
75 - use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
76 -
77 - # Tweak upstream systemd unit to use Gentoo variables/envfile.
78 - # As noted by bug #587440
79 - sed -i -e '/^ExecStart/{
80 - s,{USER},{MEMCACHED_RUNAS},g;
81 - s,{CACHESIZE},{MEMUSAGE},g;
82 - s,OPTIONS,MISC_OPTS,g;
83 - };
84 - /Environment=/{s,OPTIONS,MISC_OPTS,g;};
85 - /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
86 - ' \
87 - "${S}"/scripts/memcached.service
88 - default
89 -}
90 -
91 -src_configure() {
92 - econf \
93 - --disable-docs \
94 - $(use_enable sasl)
95 - # The xml2rfc tool to build the additional docs requires TCL :-(
96 - # `use_enable doc docs`
97 -}
98 -
99 -src_compile() {
100 - # There is a heavy degree of per-object compile flags
101 - # Users do NOT know better than upstream. Trying to compile the testapp and
102 - # the -debug version with -DNDEBUG _WILL_ fail.
103 - append-flags -UNDEBUG -pthread
104 - emake testapp memcached-debug CFLAGS="${CFLAGS}"
105 - filter-flags -UNDEBUG
106 - emake
107 -}
108 -
109 -src_install() {
110 - emake DESTDIR="${D}" install
111 - dobin scripts/memcached-tool
112 - use debug && dobin memcached-debug
113 -
114 - dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
115 -
116 - newconfd "${FILESDIR}/memcached.confd" memcached
117 - newinitd "${FILESDIR}/memcached.init2" memcached
118 - systemd_dounit "${S}/scripts/memcached.service"
119 -}
120 -
121 -pkg_postinst() {
122 - elog "With this version of Memcached Gentoo now supports multiple instances."
123 - elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
124 - elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
125 - elog "Please see Gentoo bug #122246 for more info"
126 -}
127 -
128 -src_test() {
129 - emake -j1 test
130 -}