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