Gentoo Archives: gentoo-commits

From: Alexys Jacob <ultrabug@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/redis/
Date: Fri, 28 Aug 2015 10:16:08
Message-Id: 1440756949.30f3100c8750eafac494c312f861c7c62b8f54bf.ultrabug@gentoo
1 commit: 30f3100c8750eafac494c312f861c7c62b8f54bf
2 Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 28 10:15:49 2015 +0000
4 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 28 10:15:49 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f3100c
7
8 dev-db/redis: old ebuilds clean up, version bump fix #557218
9
10 Package-Manager: portage-2.2.20.1
11
12 dev-db/redis/Manifest | 6 +-
13 dev-db/redis/redis-2.8.11.ebuild | 109 --------------------
14 dev-db/redis/redis-2.8.13.ebuild | 111 ---------------------
15 dev-db/redis/redis-2.8.8.ebuild | 109 --------------------
16 dev-db/redis/redis-2.8.9.ebuild | 109 --------------------
17 .../{redis-3.0.2-r1.ebuild => redis-3.0.3.ebuild} | 2 +-
18 6 files changed, 2 insertions(+), 444 deletions(-)
19
20 diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
21 index 632bcb4..a3b15e9 100644
22 --- a/dev-db/redis/Manifest
23 +++ b/dev-db/redis/Manifest
24 @@ -1,9 +1,5 @@
25 DIST redis-2.6.15.tar.gz 998865 SHA256 b0105c6ec526d40e90a0a0bc9d070a5602d839b930776b8ecaeb9fa32493e3bc SHA512 8614b5531049f99a19e3ba87c7d632ab43d02e1c62b6287534ebec35e4a484e3eefabd94d7ca52eb31eb56675451aef94265514be78fdaebd50db5230a525563 WHIRLPOOL c1eba6bccb17c6733d3b5f6e06933ff7ea8689d4cb16e0005f002fda75bda1d730b815546e5d3b50fcd6f85a05a35585244a7a69263795e7bda53bd1a588db03
26 DIST redis-2.6.16.tar.gz 999579 SHA256 81490918dcf82d124b36e48b0a9911bfba3f13abba04d8c89820324eff7df03a SHA512 469a29e2a755543a3b2c3deb467a72ae62b81c54a60ed1baf6f9d5687ef4b87c22d9cec6a43cec43dd90d4b5561f5bbcd2448f6edf8a784041233b80d9403b0b WHIRLPOOL ed10212f6465083cc689d83cb0c4db63e15697a232a7e6621fb3b41e263cb8d16c7c3085317f0147e3cfe2d1620672b40049b764ebfb2f2710fd6737350f4804
27 -DIST redis-2.8.11.tar.gz 1101257 SHA256 60f0310afb29bc3533d57c5805fb6a693eb1dee454a3a2ef51b07317f803f6d6 SHA512 fd761f02a40cc8697d2d3e5718d4f985b30299099923ba386865fe43c8ee00052cae948fb47e19cffff84e8097b21238027144783986f22a6564ee6a1b1a88a3 WHIRLPOOL d3833555edc600da9cc7cbde90f9afd06a2dc84b4d2381cfbddc3a626c59c7979a0b2456e326b1c0cfcb529692e26bd607fabfcd863d6b6225288357ca19752b
28 -DIST redis-2.8.13.tar.gz 1227538 SHA256 b87bc83d13b9bf1f20d41a0efd06eda78b80002e013566d8b69c332e0cbccb08 SHA512 ca7face85f1d583feb7064eaf0d33cec080c7f0bb7b54734ba91d8ce1091bce263f4d5518bb86277a3ddeb2d0cb95492c5d52953922f1177f61510e1d10f30f7 WHIRLPOOL 264fd7f809f4e671ade206e1f239165c61f37669e782f50c9f12e7a431ed4ef83dff71efd6f88ebc28083b2d61d2637102a28b705a589f72c2a322c61af835a4
29 DIST redis-2.8.17.tar.gz 1234543 SHA256 53c7cc639571729fa57d7baa7f81aec1d5886f86bac9c66f6ad06dbdaee236a7 SHA512 29515abd4437e03da20063a1831f0eb11ac65ba9d51cbfbb1987726102e3a55c76a3286b8c9a3bfbaf5290998fb5b662ef4aadbe0d131cd60824c8533e088441 WHIRLPOOL 22eb01f8100a07178352e397f4342d44f478aadda7a0a7bdfa9a08d8cfa1578ac6e98ba0cce0a9828cc226364d9a7995d86bc78adfc73476c04868639307be30
30 DIST redis-2.8.19.tar.gz 1254857 SHA256 29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145 SHA512 34997b45815cfdec9fbb06cd6664ed6ddf71baf064fd9ac155b7b969fd5945f78927cd5dfde83b043dc8ff1d7e35b172b9403cdf6115b8ca7bdf80c581ee9cdd WHIRLPOOL df3408de1e53a8a13c0b645054ce944453f3a812c264b168b797519a6d8536e0a60095fbd314f591ba21f0532be5b6b37e1ec8b11e928cdd6447ab70dfb8be33
31 -DIST redis-2.8.8.tar.gz 1073450 SHA256 fd2be11b8d9300d35b6bbed6fcd6fa6d7ef1a72ccaeb0cc991ce44dc49908bc8 SHA512 99cf0c41feaf594c69c625dcc8a40d15d00ae5c3ec7947abdcbe969a18ff844f9d8c60ee047dfa878a23505963b972d7564a27315017cab74bc5925ecae67ab7 WHIRLPOOL be9aa6166f7dd3ef37f2451ac8a2bdaed1f7dfb1bd8b67df04addde1f0a1dd01ec12547dc290374b818bb644a2b05b88acac884f2613a92650bd312b142e7f1e
32 -DIST redis-2.8.9.tar.gz 1097369 SHA256 7834c37f2ff186c46aef8e4a066dfbf1d6772a285aa31c19c58162f264f1007f SHA512 f202c44e16d257e33f7fabaa3b46218bf45848158a4b8c7cc2fab119fdf42bb4e19764a2f5f82fc8c76a3e353754b6b25f2cacf20a253d28244acbf87fd6dd7a WHIRLPOOL 2d968afe427bffc69c67cf8ac7d89166b5946a701787b28587b7a1eb0007dbc5766fb8d8760eec420ff23fbbf8fbac2a2cc6fdf69145f1885b30ef341dd4cd40
33 -DIST redis-3.0.2.tar.gz 1360182 SHA256 93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f SHA512 0f72ca45c2970d595a3c533946b77ea293c7588eb59dd48491921ef5e3f3f1463a96a8095b5782a424451007702fbcab243140cc2d885306b5cb821308d0607a WHIRLPOOL 2d47fb142a63233230a9416e7833f8cdc0f630c12f326c73ae0078c82866496459a90e53eb6d0d381284284cd3941f392882ba27d8751651f22550230683950b
34 +DIST redis-3.0.3.tar.gz 1360959 SHA256 1d08fa665b16d0950274dfbd47fbbcf3485e43e901021338640a0334666e9da5 SHA512 68b2d85341487efed26c92cd7925b4e9d889b5a19f08f4695ffd07087c01ae0c872086575744636513b01720829002c8d5c7bf43b20ee2c561599fa8d1c475f5 WHIRLPOOL 32d543454cda029259d8719f5696f3e16d40c489c0d44a8475bf65a7b26b9f6df74f5cdbfac2b5d44bea97844b68ae49d8656c8668fdf6ce6102cb482c200a29
35
36 diff --git a/dev-db/redis/redis-2.8.11.ebuild b/dev-db/redis/redis-2.8.11.ebuild
37 deleted file mode 100644
38 index 1b5a693..0000000
39 --- a/dev-db/redis/redis-2.8.11.ebuild
40 +++ /dev/null
41 @@ -1,109 +0,0 @@
42 -# Copyright 1999-2015 Gentoo Foundation
43 -# Distributed under the terms of the GNU General Public License v2
44 -# $Id$
45 -
46 -EAPI=5
47 -
48 -inherit autotools eutils flag-o-matic systemd toolchain-funcs user
49 -
50 -DESCRIPTION="A persistent caching system, key-value and data structures database"
51 -HOMEPAGE="http://redis.io/"
52 -SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
53 -
54 -LICENSE="BSD"
55 -KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
56 -IUSE="+jemalloc tcmalloc test"
57 -SLOT="0"
58 -
59 -RDEPEND="tcmalloc? ( dev-util/google-perftools )
60 - jemalloc? ( >=dev-libs/jemalloc-3.2 )"
61 -DEPEND=">=sys-devel/autoconf-2.63
62 - test? ( dev-lang/tcl:0= )
63 - ${RDEPEND}"
64 -REQUIRED_USE="tcmalloc? ( !jemalloc )
65 - jemalloc? ( !tcmalloc )"
66 -
67 -S="${WORKDIR}/${PN}-${PV/_/-}"
68 -
69 -pkg_setup() {
70 - enewgroup redis 75
71 - enewuser redis 75 -1 /var/lib/redis redis
72 -}
73 -
74 -src_prepare() {
75 - epatch "${FILESDIR}"/${PN}-2.8.3-{shared,config}.patch
76 -
77 - # bug 467172, 467174
78 - sed -i -e 's:AR=:AR?=:g' -e 's:RANLIB=:RANLIB?=:g' "${S}/deps/lua/src/Makefile" || die
79 -
80 - # now we will rewrite present Makefiles
81 - local makefiles=""
82 - for MKF in $(find -name 'Makefile' | cut -b 3-); do
83 - mv "${MKF}" "${MKF}.in"
84 - sed -i -e 's:$(CC):@CC@:g' \
85 - -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
86 - -e 's: $(DEBUG)::g' \
87 - -e 's:$(OBJARCH)::g' \
88 - -e 's:ARCH:TARCH:g' \
89 - -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
90 - "${MKF}.in" \
91 - || die "Sed failed for ${MKF}"
92 - makefiles+=" ${MKF}"
93 - done
94 - # autodetection of compiler and settings; generates the modified Makefiles
95 - cp "${FILESDIR}"/configure.ac-2.2 configure.ac
96 - sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
97 - configure.ac || die "Sed failed for configure.ac"
98 - eautoconf
99 -}
100 -
101 -src_configure() {
102 - econf
103 -
104 - # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
105 - # also, don't define ANSI/c99 for lua twice
106 - sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
107 -}
108 -
109 -src_compile() {
110 - tc-export CC AR RANLIB
111 -
112 - local myconf=""
113 -
114 - if use tcmalloc ; then
115 - myconf="${myconf} USE_TCMALLOC=yes"
116 - elif use jemalloc ; then
117 - myconf="${myconf} JEMALLOC_SHARED=yes"
118 - else
119 - myconf="${myconf} MALLOC=yes"
120 - fi
121 -
122 - emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
123 -}
124 -
125 -src_install() {
126 - insinto /etc/
127 - doins redis.conf sentinel.conf
128 - use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
129 - fperms 0644 /etc/{redis,sentinel}.conf
130 -
131 - newconfd "${FILESDIR}/redis.confd" redis
132 - newinitd "${FILESDIR}/redis.initd-3" redis
133 -
134 - systemd_dounit "${FILESDIR}/redis.service"
135 - systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
136 -
137 - nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
138 -
139 - dobin src/redis-cli
140 - dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
141 - fperms 0750 /usr/sbin/redis-benchmark
142 - dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
143 -
144 - if use prefix; then
145 - diropts -m0750
146 - else
147 - diropts -m0750 -o redis -g redis
148 - fi
149 - keepdir /var/{log,lib}/redis
150 -}
151
152 diff --git a/dev-db/redis/redis-2.8.13.ebuild b/dev-db/redis/redis-2.8.13.ebuild
153 deleted file mode 100644
154 index 10a16cf..0000000
155 --- a/dev-db/redis/redis-2.8.13.ebuild
156 +++ /dev/null
157 @@ -1,111 +0,0 @@
158 -# Copyright 1999-2015 Gentoo Foundation
159 -# Distributed under the terms of the GNU General Public License v2
160 -# $Id$
161 -
162 -EAPI=5
163 -
164 -inherit autotools eutils flag-o-matic systemd toolchain-funcs user
165 -
166 -DESCRIPTION="A persistent caching system, key-value and data structures database"
167 -HOMEPAGE="http://redis.io/"
168 -SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
169 -
170 -LICENSE="BSD"
171 -KEYWORDS="~amd64 ~amd64-linux ~hppa ~x86 ~x86-linux ~x86-macos ~x86-solaris"
172 -IUSE="+jemalloc tcmalloc test"
173 -SLOT="0"
174 -
175 -RDEPEND=">=dev-lang/lua-5.1:0
176 - tcmalloc? ( dev-util/google-perftools )
177 - jemalloc? ( >=dev-libs/jemalloc-3.2 )"
178 -DEPEND="virtual/pkgconfig
179 - >=sys-devel/autoconf-2.63
180 - test? ( dev-lang/tcl:0= )
181 - ${RDEPEND}"
182 -REQUIRED_USE="?? ( tcmalloc jemalloc )"
183 -
184 -S="${WORKDIR}/${PN}-${PV/_/-}"
185 -
186 -pkg_setup() {
187 - enewgroup redis 75
188 - enewuser redis 75 -1 /var/lib/redis redis
189 -}
190 -
191 -src_prepare() {
192 - epatch "${FILESDIR}"/${PN}-2.8.3-{shared,config}.patch
193 - epatch "${FILESDIR}"/${P}-sharedlua.patch
194 -
195 - # Copy lua modules into build dir
196 - cp "${S}"/deps/lua/src/{lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
197 -
198 - # now we will rewrite present Makefiles
199 - local makefiles=""
200 - for MKF in $(find -name 'Makefile' | cut -b 3-); do
201 - mv "${MKF}" "${MKF}.in"
202 - sed -i -e 's:$(CC):@CC@:g' \
203 - -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
204 - -e 's: $(DEBUG)::g' \
205 - -e 's:$(OBJARCH)::g' \
206 - -e 's:ARCH:TARCH:g' \
207 - -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
208 - "${MKF}.in" \
209 - || die "Sed failed for ${MKF}"
210 - makefiles+=" ${MKF}"
211 - done
212 - # autodetection of compiler and settings; generates the modified Makefiles
213 - cp "${FILESDIR}"/configure.ac-2.2 configure.ac
214 - sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
215 - configure.ac || die "Sed failed for configure.ac"
216 - eautoconf
217 -}
218 -
219 -src_configure() {
220 - econf
221 -
222 - # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
223 - # also, don't define ANSI/c99 for lua twice
224 - sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
225 -}
226 -
227 -src_compile() {
228 - tc-export CC AR RANLIB
229 -
230 - local myconf=""
231 -
232 - if use tcmalloc ; then
233 - myconf="${myconf} USE_TCMALLOC=yes"
234 - elif use jemalloc ; then
235 - myconf="${myconf} JEMALLOC_SHARED=yes"
236 - else
237 - myconf="${myconf} MALLOC=yes"
238 - fi
239 -
240 - emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
241 -}
242 -
243 -src_install() {
244 - insinto /etc/
245 - doins redis.conf sentinel.conf
246 - use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
247 - fperms 0644 /etc/{redis,sentinel}.conf
248 -
249 - newconfd "${FILESDIR}/redis.confd" redis
250 - newinitd "${FILESDIR}/redis.initd-3" redis
251 -
252 - systemd_dounit "${FILESDIR}/redis.service"
253 - systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
254 -
255 - nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
256 -
257 - dobin src/redis-cli
258 - dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
259 - fperms 0750 /usr/sbin/redis-benchmark
260 - dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
261 -
262 - if use prefix; then
263 - diropts -m0750
264 - else
265 - diropts -m0750 -o redis -g redis
266 - fi
267 - keepdir /var/{log,lib}/redis
268 -}
269
270 diff --git a/dev-db/redis/redis-2.8.8.ebuild b/dev-db/redis/redis-2.8.8.ebuild
271 deleted file mode 100644
272 index 40441f7..0000000
273 --- a/dev-db/redis/redis-2.8.8.ebuild
274 +++ /dev/null
275 @@ -1,109 +0,0 @@
276 -# Copyright 1999-2015 Gentoo Foundation
277 -# Distributed under the terms of the GNU General Public License v2
278 -# $Id$
279 -
280 -EAPI=5
281 -
282 -inherit autotools eutils flag-o-matic systemd toolchain-funcs user
283 -
284 -DESCRIPTION="A persistent caching system, key-value and data structures database"
285 -HOMEPAGE="http://redis.io/"
286 -SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
287 -
288 -LICENSE="BSD"
289 -KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris"
290 -IUSE="+jemalloc tcmalloc test"
291 -SLOT="0"
292 -
293 -RDEPEND="tcmalloc? ( dev-util/google-perftools )
294 - jemalloc? ( >=dev-libs/jemalloc-3.2 )"
295 -DEPEND=">=sys-devel/autoconf-2.63
296 - test? ( dev-lang/tcl:0= )
297 - ${RDEPEND}"
298 -REQUIRED_USE="tcmalloc? ( !jemalloc )
299 - jemalloc? ( !tcmalloc )"
300 -
301 -S="${WORKDIR}/${PN}-${PV/_/-}"
302 -
303 -pkg_setup() {
304 - enewgroup redis 75
305 - enewuser redis 75 -1 /var/lib/redis redis
306 -}
307 -
308 -src_prepare() {
309 - epatch "${FILESDIR}"/${PN}-2.8.3-{shared,config}.patch
310 -
311 - # bug 467172, 467174
312 - sed -i -e 's:AR=:AR?=:g' -e 's:RANLIB=:RANLIB?=:g' "${S}/deps/lua/src/Makefile" || die
313 -
314 - # now we will rewrite present Makefiles
315 - local makefiles=""
316 - for MKF in $(find -name 'Makefile' | cut -b 3-); do
317 - mv "${MKF}" "${MKF}.in"
318 - sed -i -e 's:$(CC):@CC@:g' \
319 - -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
320 - -e 's: $(DEBUG)::g' \
321 - -e 's:$(OBJARCH)::g' \
322 - -e 's:ARCH:TARCH:g' \
323 - -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
324 - "${MKF}.in" \
325 - || die "Sed failed for ${MKF}"
326 - makefiles+=" ${MKF}"
327 - done
328 - # autodetection of compiler and settings; generates the modified Makefiles
329 - cp "${FILESDIR}"/configure.ac-2.2 configure.ac
330 - sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
331 - configure.ac || die "Sed failed for configure.ac"
332 - eautoconf
333 -}
334 -
335 -src_configure() {
336 - econf
337 -
338 - # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
339 - # also, don't define ANSI/c99 for lua twice
340 - sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
341 -}
342 -
343 -src_compile() {
344 - tc-export CC AR RANLIB
345 -
346 - local myconf=""
347 -
348 - if use tcmalloc ; then
349 - myconf="${myconf} USE_TCMALLOC=yes"
350 - elif use jemalloc ; then
351 - myconf="${myconf} JEMALLOC_SHARED=yes"
352 - else
353 - myconf="${myconf} MALLOC=yes"
354 - fi
355 -
356 - emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
357 -}
358 -
359 -src_install() {
360 - insinto /etc/
361 - doins redis.conf sentinel.conf
362 - use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
363 - fperms 0644 /etc/{redis,sentinel}.conf
364 -
365 - newconfd "${FILESDIR}/redis.confd" redis
366 - newinitd "${FILESDIR}/redis.initd-3" redis
367 -
368 - systemd_dounit "${FILESDIR}/redis.service"
369 - systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
370 -
371 - nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
372 -
373 - dobin src/redis-cli
374 - dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
375 - fperms 0750 /usr/sbin/redis-benchmark
376 - dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
377 -
378 - if use prefix; then
379 - diropts -m0750
380 - else
381 - diropts -m0750 -o redis -g redis
382 - fi
383 - keepdir /var/{log,lib}/redis
384 -}
385
386 diff --git a/dev-db/redis/redis-2.8.9.ebuild b/dev-db/redis/redis-2.8.9.ebuild
387 deleted file mode 100644
388 index e57c970..0000000
389 --- a/dev-db/redis/redis-2.8.9.ebuild
390 +++ /dev/null
391 @@ -1,109 +0,0 @@
392 -# Copyright 1999-2015 Gentoo Foundation
393 -# Distributed under the terms of the GNU General Public License v2
394 -# $Id$
395 -
396 -EAPI=5
397 -
398 -inherit autotools eutils flag-o-matic systemd toolchain-funcs user
399 -
400 -DESCRIPTION="A persistent caching system, key-value and data structures database"
401 -HOMEPAGE="http://redis.io/"
402 -SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
403 -
404 -LICENSE="BSD"
405 -KEYWORDS="~amd64 ~hppa ~x86 ~x86-macos ~x86-solaris"
406 -IUSE="+jemalloc tcmalloc test"
407 -SLOT="0"
408 -
409 -RDEPEND="tcmalloc? ( dev-util/google-perftools )
410 - jemalloc? ( >=dev-libs/jemalloc-3.2 )"
411 -DEPEND=">=sys-devel/autoconf-2.63
412 - test? ( dev-lang/tcl:0= )
413 - ${RDEPEND}"
414 -REQUIRED_USE="tcmalloc? ( !jemalloc )
415 - jemalloc? ( !tcmalloc )"
416 -
417 -S="${WORKDIR}/${PN}-${PV/_/-}"
418 -
419 -pkg_setup() {
420 - enewgroup redis 75
421 - enewuser redis 75 -1 /var/lib/redis redis
422 -}
423 -
424 -src_prepare() {
425 - epatch "${FILESDIR}"/${PN}-2.8.3-{shared,config}.patch
426 -
427 - # bug 467172, 467174
428 - sed -i -e 's:AR=:AR?=:g' -e 's:RANLIB=:RANLIB?=:g' "${S}/deps/lua/src/Makefile" || die
429 -
430 - # now we will rewrite present Makefiles
431 - local makefiles=""
432 - for MKF in $(find -name 'Makefile' | cut -b 3-); do
433 - mv "${MKF}" "${MKF}.in"
434 - sed -i -e 's:$(CC):@CC@:g' \
435 - -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
436 - -e 's: $(DEBUG)::g' \
437 - -e 's:$(OBJARCH)::g' \
438 - -e 's:ARCH:TARCH:g' \
439 - -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
440 - "${MKF}.in" \
441 - || die "Sed failed for ${MKF}"
442 - makefiles+=" ${MKF}"
443 - done
444 - # autodetection of compiler and settings; generates the modified Makefiles
445 - cp "${FILESDIR}"/configure.ac-2.2 configure.ac
446 - sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
447 - configure.ac || die "Sed failed for configure.ac"
448 - eautoconf
449 -}
450 -
451 -src_configure() {
452 - econf
453 -
454 - # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
455 - # also, don't define ANSI/c99 for lua twice
456 - sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
457 -}
458 -
459 -src_compile() {
460 - tc-export CC AR RANLIB
461 -
462 - local myconf=""
463 -
464 - if use tcmalloc ; then
465 - myconf="${myconf} USE_TCMALLOC=yes"
466 - elif use jemalloc ; then
467 - myconf="${myconf} JEMALLOC_SHARED=yes"
468 - else
469 - myconf="${myconf} MALLOC=yes"
470 - fi
471 -
472 - emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
473 -}
474 -
475 -src_install() {
476 - insinto /etc/
477 - doins redis.conf sentinel.conf
478 - use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
479 - fperms 0644 /etc/{redis,sentinel}.conf
480 -
481 - newconfd "${FILESDIR}/redis.confd" redis
482 - newinitd "${FILESDIR}/redis.initd-3" redis
483 -
484 - systemd_dounit "${FILESDIR}/redis.service"
485 - systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
486 -
487 - nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
488 -
489 - dobin src/redis-cli
490 - dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
491 - fperms 0750 /usr/sbin/redis-benchmark
492 - dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
493 -
494 - if use prefix; then
495 - diropts -m0750
496 - else
497 - diropts -m0750 -o redis -g redis
498 - fi
499 - keepdir /var/{log,lib}/redis
500 -}
501
502 diff --git a/dev-db/redis/redis-3.0.2-r1.ebuild b/dev-db/redis/redis-3.0.3.ebuild
503 similarity index 97%
504 rename from dev-db/redis/redis-3.0.2-r1.ebuild
505 rename to dev-db/redis/redis-3.0.3.ebuild
506 index 0498056..3b193e8 100644
507 --- a/dev-db/redis/redis-3.0.2-r1.ebuild
508 +++ b/dev-db/redis/redis-3.0.3.ebuild
509 @@ -100,7 +100,7 @@ src_install() {
510 systemd_newunit "${FILESDIR}/redis.service-2" redis.service
511 systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
512
513 - nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
514 + dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
515
516 dobin src/redis-cli
517 dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump