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