1 |
commit: 7486aa16a7b0f330f7b6fdbe2284a53dbf4c0446 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 11 01:10:35 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 11 01:10:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7486aa16 |
7 |
|
8 |
dev-db/redis: drop 6.0.12, 6.0.13-r1, 6.2.1, 6.2.3-r1 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/773328 |
11 |
Bug: https://bugs.gentoo.org/788211 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
dev-db/redis/Manifest | 4 - |
15 |
dev-db/redis/redis-6.0.12.ebuild | 184 ----------------------------------- |
16 |
dev-db/redis/redis-6.0.13-r1.ebuild | 187 ------------------------------------ |
17 |
dev-db/redis/redis-6.2.1.ebuild | 184 ----------------------------------- |
18 |
dev-db/redis/redis-6.2.3-r1.ebuild | 187 ------------------------------------ |
19 |
5 files changed, 746 deletions(-) |
20 |
|
21 |
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest |
22 |
index 96e6a41f3c3..1ae5c9b29a0 100644 |
23 |
--- a/dev-db/redis/Manifest |
24 |
+++ b/dev-db/redis/Manifest |
25 |
@@ -1,7 +1,3 @@ |
26 |
DIST redis-5.0.12.tar.gz 1995069 BLAKE2B 03bb5956fb1206ecfa7f621b22b3101d1ebad62c40ce52157fb802ecfa5c32ca493ff03a1cf909a1b0f1acdac83b3a939ab2042fbf092fea983cabe35d00f4c3 SHA512 f0ab161762006926064ba2176ea63bb2fa416fa386b44ca55a8edad9169627fcd1c4bd9c699fec585aefc68506deb0796f6a89844c21e74d2bdb19ca1638bbe7 |
27 |
-DIST redis-6.0.12.tar.gz 2276349 BLAKE2B ab49b0278420c65fc995a90e850130971ccaf3df34a08a5cc10a8c211239eba8449b87fe67684189c71816cf259a70a23a77935ec61e8baa787daa61cb994201 SHA512 9dd8e3bed51e1356470e1bf08892f771744c0c9418ff874c16ea932ad1f471a908ffd8479efe1f32531d7f63cd7af5224273ce50f2fe7aa26c47716e0e78330b |
28 |
-DIST redis-6.0.13.tar.gz 2276777 BLAKE2B 735ebc7068b26e7e424e5ce701bb80cfbdf09f65734cbdd5760b75d78141ff542d1a91f2f58f7ef97ea4a1e9e225e96189736384e1dd0c8195e4ca651da75492 SHA512 5053cd60df354c8a00e5864179c6354db6b0243d56717d5dc44954405908ad8b3b09ba9f069312825705dd8abc83d533dd7a5a60485a30e8f4adf166fa058549 |
29 |
DIST redis-6.0.14.tar.gz 2277029 BLAKE2B 1eeeae5243ca380e354dfe5c8ad5b869669dc94b9570c8151033f89a23025bf027267eea00549f411e019b3c79ffa5d2e29eacff660e9f4b614953b023824c04 SHA512 a1de2131420bc11f831ff48607be2cf4a7775702fcc4fc777e09ebdc36277f1b468b22a1d35758338c0b44f9b3ae7b119139a79eb2419d40acbbf49d8c4a7e77 |
30 |
-DIST redis-6.2.1.tar.gz 2438367 BLAKE2B 8717630771eafaf8a15dd371d46475f81f15bbcdc9a4fabd8f270ab6e09fbfb3ee2a1cddddb6c7778922d3552bcf5ee475eec7ba0623147ec36a5c5422cb0de0 SHA512 7c339cc360fc3125bb67c5748bb4fe940977faa937e3a86294829bde472479a811df8ea0ce4961d8128ec8d4ffba5d5a943c2957589c8da0cfc3f109f82e4af6 |
31 |
-DIST redis-6.2.3.tar.gz 2456050 BLAKE2B f41096c790a373bdfbe2b9af0be867fdf4c9cdcf5b76e92c50786de917d9e52bd65e65bd43127fd5ad040bc3fed50fda9caa145cd261f79bcfa16ddf369315e9 SHA512 0a020aaa5664ed419a30e85d3b5c79fe69353067b755421c702f89ca923f1ba7794b4792f4a44049e38936f221363153c9ffcfb6fa232731b224d20c2982ac68 |
32 |
DIST redis-6.2.4.tar.gz 2457940 BLAKE2B 3e89e404a624db6f739fdab72b8b7f7f92b6e96b01e33c63b6f5fa2f80fc72d8b8eaca4ecb7c57cdaf127956ba1a580ec851012b57426ebe7bb4cba890e1dcae SHA512 22db5b64de20a4823fd219b559c05f329e37fc86ce32099c64655dc50e60228706c99bffeae8d7080d8689910879318ec6621388bde23bf1486aefb881f33cb0 |
33 |
|
34 |
diff --git a/dev-db/redis/redis-6.0.12.ebuild b/dev-db/redis/redis-6.0.12.ebuild |
35 |
deleted file mode 100644 |
36 |
index 707d9982768..00000000000 |
37 |
--- a/dev-db/redis/redis-6.0.12.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,184 +0,0 @@ |
40 |
-# Copyright 1999-2021 Gentoo Authors |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=7 |
44 |
- |
45 |
-# Redis does NOT build with Lua 5.2 or newer at this time: |
46 |
-# - 5.3 and 5.4 give: |
47 |
-# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" |
48 |
-# - 5.2 fails with: |
49 |
-# scripting.c:(.text+0x1f9b): undefined reference to `lua_open' |
50 |
-# because lua_open became lua_newstate in 5.2 |
51 |
-LUA_COMPAT=( lua5-1 luajit ) |
52 |
- |
53 |
-inherit autotools flag-o-matic lua-single systemd toolchain-funcs tmpfiles |
54 |
- |
55 |
-DESCRIPTION="A persistent caching system, key-value and data structures database" |
56 |
-HOMEPAGE="https://redis.io" |
57 |
-SRC_URI="https://download.redis.io/releases/${P}.tar.gz" |
58 |
- |
59 |
-LICENSE="BSD" |
60 |
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" |
61 |
-IUSE="+jemalloc ssl tcmalloc test" |
62 |
-RESTRICT="!test? ( test )" |
63 |
-SLOT="0" |
64 |
- |
65 |
-COMMON_DEPEND=" |
66 |
- ${LUA_DEPS} |
67 |
- jemalloc? ( >=dev-libs/jemalloc-5.1:= ) |
68 |
- ssl? ( dev-libs/openssl:0= ) |
69 |
- tcmalloc? ( dev-util/google-perftools ) |
70 |
-" |
71 |
- |
72 |
-RDEPEND=" |
73 |
- ${COMMON_DEPEND} |
74 |
- acct-group/redis |
75 |
- acct-user/redis |
76 |
-" |
77 |
- |
78 |
-BDEPEND=" |
79 |
- ${COMMON_DEPEND} |
80 |
- virtual/pkgconfig |
81 |
-" |
82 |
- |
83 |
-# Tcl is only needed in the CHOST test env |
84 |
-DEPEND=" |
85 |
- ${COMMON_DEPEND} |
86 |
- test? ( |
87 |
- dev-lang/tcl:0= |
88 |
- ssl? ( dev-tcltk/tls ) |
89 |
- )" |
90 |
- |
91 |
-REQUIRED_USE="?? ( jemalloc tcmalloc ) |
92 |
- ${LUA_REQUIRED_USE}" |
93 |
- |
94 |
-PATCHES=( |
95 |
- "${FILESDIR}"/${PN}-3.2.3-config.patch |
96 |
- "${FILESDIR}"/${PN}-5.0-shared.patch |
97 |
- "${FILESDIR}"/${PN}-6.0.12-sharedlua.patch |
98 |
- "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch |
99 |
- "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
100 |
-) |
101 |
- |
102 |
-src_prepare() { |
103 |
- default |
104 |
- |
105 |
- # unstable on jemalloc |
106 |
- > tests/unit/memefficiency.tcl || die |
107 |
- |
108 |
- # Copy lua modules into build dir |
109 |
- cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
110 |
- cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
111 |
- # Append cflag for lua_cjson |
112 |
- # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
113 |
- append-cflags "-DENABLE_CJSON_GLOBAL" |
114 |
- |
115 |
- # now we will rewrite present Makefiles |
116 |
- local makefiles="" MKF |
117 |
- for MKF in $(find -name 'Makefile' | cut -b 3-); do |
118 |
- mv "${MKF}" "${MKF}.in" |
119 |
- sed -i -e 's:$(CC):@CC@:g' \ |
120 |
- -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
121 |
- -e 's: $(DEBUG)::g' \ |
122 |
- -e 's:$(OBJARCH)::g' \ |
123 |
- -e 's:ARCH:TARCH:g' \ |
124 |
- -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
125 |
- "${MKF}.in" \ |
126 |
- || die "Sed failed for ${MKF}" |
127 |
- makefiles+=" ${MKF}" |
128 |
- done |
129 |
- # autodetection of compiler and settings; generates the modified Makefiles |
130 |
- cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
131 |
- |
132 |
- # Use the correct pkgconfig name for Lua. |
133 |
- # The upstream configure script handles luajit specially, and is not |
134 |
- # effected by these changes. |
135 |
- sed -i \ |
136 |
- -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
137 |
- -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
138 |
- -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \ |
139 |
- configure.ac || die "Sed failed for configure.ac" |
140 |
- eautoreconf |
141 |
-} |
142 |
- |
143 |
-src_configure() { |
144 |
- econf $(use_with lua_single_target_luajit luajit) |
145 |
- |
146 |
- # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
147 |
- # also, don't define ANSI/c99 for lua twice |
148 |
- sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
149 |
-} |
150 |
- |
151 |
-src_compile() { |
152 |
- local myconf="" |
153 |
- |
154 |
- if use jemalloc; then |
155 |
- myconf+="MALLOC=jemalloc" |
156 |
- elif use tcmalloc; then |
157 |
- myconf+="MALLOC=tcmalloc" |
158 |
- else |
159 |
- myconf+="MALLOC=libc" |
160 |
- fi |
161 |
- |
162 |
- if use ssl; then |
163 |
- myconf+=" BUILD_TLS=yes" |
164 |
- fi |
165 |
- |
166 |
- tc-export AR CC RANLIB |
167 |
- emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" |
168 |
-} |
169 |
- |
170 |
-src_test() { |
171 |
- # Known to fail with FEATURES=usersandbox |
172 |
- if has usersandbox ${FEATURES}; then |
173 |
- ewarn "You are emerging ${P} with 'usersandbox' enabled." \ |
174 |
- "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" |
175 |
- fi |
176 |
- |
177 |
- if use ssl; then |
178 |
- ./utils/gen-test-certs.sh |
179 |
- ./runtest --tls |
180 |
- else |
181 |
- ./runtest |
182 |
- fi |
183 |
-} |
184 |
- |
185 |
-src_install() { |
186 |
- insinto /etc/redis |
187 |
- doins redis.conf sentinel.conf |
188 |
- use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf |
189 |
- fperms 0750 /etc/redis |
190 |
- fperms 0644 /etc/redis/{redis,sentinel}.conf |
191 |
- |
192 |
- newconfd "${FILESDIR}/redis.confd-r2" redis |
193 |
- newinitd "${FILESDIR}/redis.initd-6" redis |
194 |
- |
195 |
- systemd_newunit "${FILESDIR}/redis.service-4" redis.service |
196 |
- newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf |
197 |
- |
198 |
- newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel |
199 |
- newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel |
200 |
- |
201 |
- insinto /etc/logrotate.d/ |
202 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
203 |
- |
204 |
- dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
205 |
- |
206 |
- dobin src/redis-cli |
207 |
- dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
208 |
- fperms 0750 /usr/sbin/redis-benchmark |
209 |
- dosym redis-server /usr/sbin/redis-sentinel |
210 |
- |
211 |
- if use prefix; then |
212 |
- diropts -m0750 |
213 |
- else |
214 |
- diropts -m0750 -o redis -g redis |
215 |
- fi |
216 |
- keepdir /var/{log,lib}/redis |
217 |
-} |
218 |
- |
219 |
-pkg_postinst() { |
220 |
- ewarn "The default redis configuration file location changed to:" |
221 |
- ewarn " /etc/redis/{redis,sentinel}.conf" |
222 |
- ewarn "Please apply your changes to the new configuration files." |
223 |
-} |
224 |
|
225 |
diff --git a/dev-db/redis/redis-6.0.13-r1.ebuild b/dev-db/redis/redis-6.0.13-r1.ebuild |
226 |
deleted file mode 100644 |
227 |
index d871156cf34..00000000000 |
228 |
--- a/dev-db/redis/redis-6.0.13-r1.ebuild |
229 |
+++ /dev/null |
230 |
@@ -1,187 +0,0 @@ |
231 |
-# Copyright 1999-2021 Gentoo Authors |
232 |
-# Distributed under the terms of the GNU General Public License v2 |
233 |
- |
234 |
-EAPI=7 |
235 |
- |
236 |
-# Redis does NOT build with Lua 5.2 or newer at this time: |
237 |
-# - 5.3 and 5.4 give: |
238 |
-# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" |
239 |
-# - 5.2 fails with: |
240 |
-# scripting.c:(.text+0x1f9b): undefined reference to `lua_open' |
241 |
-# because lua_open became lua_newstate in 5.2 |
242 |
-LUA_COMPAT=( lua5-1 luajit ) |
243 |
- |
244 |
-inherit autotools flag-o-matic lua-single systemd toolchain-funcs tmpfiles |
245 |
- |
246 |
-DESCRIPTION="A persistent caching system, key-value and data structures database" |
247 |
-HOMEPAGE="https://redis.io" |
248 |
-SRC_URI="https://download.redis.io/releases/${P}.tar.gz" |
249 |
- |
250 |
-LICENSE="BSD" |
251 |
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" |
252 |
-IUSE="+jemalloc ssl systemd tcmalloc test" |
253 |
-RESTRICT="!test? ( test )" |
254 |
-SLOT="0" |
255 |
- |
256 |
-COMMON_DEPEND=" |
257 |
- ${LUA_DEPS} |
258 |
- jemalloc? ( >=dev-libs/jemalloc-5.1:= ) |
259 |
- ssl? ( dev-libs/openssl:0= ) |
260 |
- systemd? ( sys-apps/systemd:= ) |
261 |
- tcmalloc? ( dev-util/google-perftools ) |
262 |
-" |
263 |
- |
264 |
-RDEPEND=" |
265 |
- ${COMMON_DEPEND} |
266 |
- acct-group/redis |
267 |
- acct-user/redis |
268 |
-" |
269 |
- |
270 |
-BDEPEND=" |
271 |
- ${COMMON_DEPEND} |
272 |
- virtual/pkgconfig |
273 |
-" |
274 |
- |
275 |
-# Tcl is only needed in the CHOST test env |
276 |
-DEPEND=" |
277 |
- ${COMMON_DEPEND} |
278 |
- test? ( |
279 |
- dev-lang/tcl:0= |
280 |
- ssl? ( dev-tcltk/tls ) |
281 |
- )" |
282 |
- |
283 |
-REQUIRED_USE="?? ( jemalloc tcmalloc ) |
284 |
- ${LUA_REQUIRED_USE}" |
285 |
- |
286 |
-PATCHES=( |
287 |
- "${FILESDIR}"/${PN}-3.2.3-config.patch |
288 |
- "${FILESDIR}"/${PN}-5.0-shared.patch |
289 |
- "${FILESDIR}"/${PN}-6.0.12-sharedlua.patch |
290 |
- "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch |
291 |
- "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
292 |
-) |
293 |
- |
294 |
-src_prepare() { |
295 |
- default |
296 |
- |
297 |
- # unstable on jemalloc |
298 |
- > tests/unit/memefficiency.tcl || die |
299 |
- |
300 |
- # Copy lua modules into build dir |
301 |
- cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
302 |
- cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
303 |
- # Append cflag for lua_cjson |
304 |
- # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
305 |
- append-cflags "-DENABLE_CJSON_GLOBAL" |
306 |
- |
307 |
- # now we will rewrite present Makefiles |
308 |
- local makefiles="" MKF |
309 |
- for MKF in $(find -name 'Makefile' | cut -b 3-); do |
310 |
- mv "${MKF}" "${MKF}.in" |
311 |
- sed -i -e 's:$(CC):@CC@:g' \ |
312 |
- -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
313 |
- -e 's: $(DEBUG)::g' \ |
314 |
- -e 's:$(OBJARCH)::g' \ |
315 |
- -e 's:ARCH:TARCH:g' \ |
316 |
- -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
317 |
- "${MKF}.in" \ |
318 |
- || die "Sed failed for ${MKF}" |
319 |
- makefiles+=" ${MKF}" |
320 |
- done |
321 |
- # autodetection of compiler and settings; generates the modified Makefiles |
322 |
- cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
323 |
- |
324 |
- # Use the correct pkgconfig name for Lua. |
325 |
- # The upstream configure script handles luajit specially, and is not |
326 |
- # effected by these changes. |
327 |
- sed -i \ |
328 |
- -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
329 |
- -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
330 |
- -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \ |
331 |
- configure.ac || die "Sed failed for configure.ac" |
332 |
- eautoreconf |
333 |
-} |
334 |
- |
335 |
-src_configure() { |
336 |
- econf $(use_with lua_single_target_luajit luajit) |
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 |
- local myconf="" |
345 |
- |
346 |
- if use jemalloc; then |
347 |
- myconf+="MALLOC=jemalloc" |
348 |
- elif use tcmalloc; then |
349 |
- myconf+="MALLOC=tcmalloc" |
350 |
- else |
351 |
- myconf+="MALLOC=libc" |
352 |
- fi |
353 |
- |
354 |
- if use ssl; then |
355 |
- myconf+=" BUILD_TLS=yes" |
356 |
- fi |
357 |
- |
358 |
- export USE_SYSTEMD=$(usex systemd) |
359 |
- |
360 |
- tc-export AR CC RANLIB |
361 |
- emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" |
362 |
-} |
363 |
- |
364 |
-src_test() { |
365 |
- # Known to fail with FEATURES=usersandbox |
366 |
- if has usersandbox ${FEATURES}; then |
367 |
- ewarn "You are emerging ${P} with 'usersandbox' enabled." \ |
368 |
- "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" |
369 |
- fi |
370 |
- |
371 |
- if use ssl; then |
372 |
- ./utils/gen-test-certs.sh |
373 |
- ./runtest --tls |
374 |
- else |
375 |
- ./runtest |
376 |
- fi |
377 |
-} |
378 |
- |
379 |
-src_install() { |
380 |
- insinto /etc/redis |
381 |
- doins redis.conf sentinel.conf |
382 |
- use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf |
383 |
- fperms 0750 /etc/redis |
384 |
- fperms 0644 /etc/redis/{redis,sentinel}.conf |
385 |
- |
386 |
- newconfd "${FILESDIR}/redis.confd-r2" redis |
387 |
- newinitd "${FILESDIR}/redis.initd-6" redis |
388 |
- |
389 |
- systemd_newunit "${FILESDIR}/redis.service-4" redis.service |
390 |
- newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf |
391 |
- |
392 |
- newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel |
393 |
- newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel |
394 |
- |
395 |
- insinto /etc/logrotate.d/ |
396 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
397 |
- |
398 |
- dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
399 |
- |
400 |
- dobin src/redis-cli |
401 |
- dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
402 |
- fperms 0750 /usr/sbin/redis-benchmark |
403 |
- dosym redis-server /usr/sbin/redis-sentinel |
404 |
- |
405 |
- if use prefix; then |
406 |
- diropts -m0750 |
407 |
- else |
408 |
- diropts -m0750 -o redis -g redis |
409 |
- fi |
410 |
- keepdir /var/{log,lib}/redis |
411 |
-} |
412 |
- |
413 |
-pkg_postinst() { |
414 |
- ewarn "The default redis configuration file location changed to:" |
415 |
- ewarn " /etc/redis/{redis,sentinel}.conf" |
416 |
- ewarn "Please apply your changes to the new configuration files." |
417 |
-} |
418 |
|
419 |
diff --git a/dev-db/redis/redis-6.2.1.ebuild b/dev-db/redis/redis-6.2.1.ebuild |
420 |
deleted file mode 100644 |
421 |
index 5eef07c1367..00000000000 |
422 |
--- a/dev-db/redis/redis-6.2.1.ebuild |
423 |
+++ /dev/null |
424 |
@@ -1,184 +0,0 @@ |
425 |
-# Copyright 1999-2021 Gentoo Authors |
426 |
-# Distributed under the terms of the GNU General Public License v2 |
427 |
- |
428 |
-EAPI=7 |
429 |
- |
430 |
-# Redis does NOT build with Lua 5.2 or newer at this time: |
431 |
-# - 5.3 and 5.4 give: |
432 |
-# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" |
433 |
-# - 5.2 fails with: |
434 |
-# scripting.c:(.text+0x1f9b): undefined reference to `lua_open' |
435 |
-# because lua_open became lua_newstate in 5.2 |
436 |
-LUA_COMPAT=( lua5-1 luajit ) |
437 |
- |
438 |
-inherit autotools flag-o-matic lua-single systemd toolchain-funcs tmpfiles |
439 |
- |
440 |
-DESCRIPTION="A persistent caching system, key-value and data structures database" |
441 |
-HOMEPAGE="https://redis.io" |
442 |
-SRC_URI="https://download.redis.io/releases/${P}.tar.gz" |
443 |
- |
444 |
-LICENSE="BSD" |
445 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
446 |
-IUSE="+jemalloc ssl tcmalloc test" |
447 |
-RESTRICT="!test? ( test )" |
448 |
-SLOT="0" |
449 |
- |
450 |
-COMMON_DEPEND=" |
451 |
- ${LUA_DEPS} |
452 |
- jemalloc? ( >=dev-libs/jemalloc-5.1:= ) |
453 |
- ssl? ( dev-libs/openssl:0= ) |
454 |
- tcmalloc? ( dev-util/google-perftools ) |
455 |
-" |
456 |
- |
457 |
-RDEPEND=" |
458 |
- ${COMMON_DEPEND} |
459 |
- acct-group/redis |
460 |
- acct-user/redis |
461 |
-" |
462 |
- |
463 |
-BDEPEND=" |
464 |
- ${COMMON_DEPEND} |
465 |
- virtual/pkgconfig |
466 |
-" |
467 |
- |
468 |
-# Tcl is only needed in the CHOST test env |
469 |
-DEPEND=" |
470 |
- ${COMMON_DEPEND} |
471 |
- test? ( |
472 |
- dev-lang/tcl:0= |
473 |
- ssl? ( dev-tcltk/tls ) |
474 |
- )" |
475 |
- |
476 |
-REQUIRED_USE="?? ( jemalloc tcmalloc ) |
477 |
- ${LUA_REQUIRED_USE}" |
478 |
- |
479 |
-PATCHES=( |
480 |
- "${FILESDIR}"/${PN}-6.2.1-config.patch |
481 |
- "${FILESDIR}"/${PN}-5.0-shared.patch |
482 |
- "${FILESDIR}"/${PN}-6.2.1-sharedlua.patch |
483 |
- "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch |
484 |
- "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
485 |
-) |
486 |
- |
487 |
-src_prepare() { |
488 |
- default |
489 |
- |
490 |
- # unstable on jemalloc |
491 |
- > tests/unit/memefficiency.tcl || die |
492 |
- |
493 |
- # Copy lua modules into build dir |
494 |
- cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
495 |
- cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
496 |
- # Append cflag for lua_cjson |
497 |
- # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
498 |
- append-cflags "-DENABLE_CJSON_GLOBAL" |
499 |
- |
500 |
- # now we will rewrite present Makefiles |
501 |
- local makefiles="" MKF |
502 |
- for MKF in $(find -name 'Makefile' | cut -b 3-); do |
503 |
- mv "${MKF}" "${MKF}.in" |
504 |
- sed -i -e 's:$(CC):@CC@:g' \ |
505 |
- -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
506 |
- -e 's: $(DEBUG)::g' \ |
507 |
- -e 's:$(OBJARCH)::g' \ |
508 |
- -e 's:ARCH:TARCH:g' \ |
509 |
- -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
510 |
- "${MKF}.in" \ |
511 |
- || die "Sed failed for ${MKF}" |
512 |
- makefiles+=" ${MKF}" |
513 |
- done |
514 |
- # autodetection of compiler and settings; generates the modified Makefiles |
515 |
- cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
516 |
- |
517 |
- # Use the correct pkgconfig name for Lua. |
518 |
- # The upstream configure script handles luajit specially, and is not |
519 |
- # effected by these changes. |
520 |
- sed -i \ |
521 |
- -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
522 |
- -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
523 |
- -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \ |
524 |
- configure.ac || die "Sed failed for configure.ac" |
525 |
- eautoreconf |
526 |
-} |
527 |
- |
528 |
-src_configure() { |
529 |
- econf $(use_with lua_single_target_luajit luajit) |
530 |
- |
531 |
- # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
532 |
- # also, don't define ANSI/c99 for lua twice |
533 |
- sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
534 |
-} |
535 |
- |
536 |
-src_compile() { |
537 |
- local myconf="" |
538 |
- |
539 |
- if use jemalloc; then |
540 |
- myconf+="MALLOC=jemalloc" |
541 |
- elif use tcmalloc; then |
542 |
- myconf+="MALLOC=tcmalloc" |
543 |
- else |
544 |
- myconf+="MALLOC=libc" |
545 |
- fi |
546 |
- |
547 |
- if use ssl; then |
548 |
- myconf+=" BUILD_TLS=yes" |
549 |
- fi |
550 |
- |
551 |
- tc-export AR CC RANLIB |
552 |
- emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" |
553 |
-} |
554 |
- |
555 |
-src_test() { |
556 |
- # Known to fail with FEATURES=usersandbox |
557 |
- if has usersandbox ${FEATURES}; then |
558 |
- ewarn "You are emerging ${P} with 'usersandbox' enabled." \ |
559 |
- "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" |
560 |
- fi |
561 |
- |
562 |
- if use ssl; then |
563 |
- ./utils/gen-test-certs.sh |
564 |
- ./runtest --tls |
565 |
- else |
566 |
- ./runtest |
567 |
- fi |
568 |
-} |
569 |
- |
570 |
-src_install() { |
571 |
- insinto /etc/redis |
572 |
- doins redis.conf sentinel.conf |
573 |
- use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf |
574 |
- fperms 0750 /etc/redis |
575 |
- fperms 0644 /etc/redis/{redis,sentinel}.conf |
576 |
- |
577 |
- newconfd "${FILESDIR}/redis.confd-r2" redis |
578 |
- newinitd "${FILESDIR}/redis.initd-6" redis |
579 |
- |
580 |
- systemd_newunit "${FILESDIR}/redis.service-4" redis.service |
581 |
- newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf |
582 |
- |
583 |
- newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel |
584 |
- newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel |
585 |
- |
586 |
- insinto /etc/logrotate.d/ |
587 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
588 |
- |
589 |
- dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
590 |
- |
591 |
- dobin src/redis-cli |
592 |
- dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
593 |
- fperms 0750 /usr/sbin/redis-benchmark |
594 |
- dosym redis-server /usr/sbin/redis-sentinel |
595 |
- |
596 |
- if use prefix; then |
597 |
- diropts -m0750 |
598 |
- else |
599 |
- diropts -m0750 -o redis -g redis |
600 |
- fi |
601 |
- keepdir /var/{log,lib}/redis |
602 |
-} |
603 |
- |
604 |
-pkg_postinst() { |
605 |
- ewarn "The default redis configuration file location changed to:" |
606 |
- ewarn " /etc/redis/{redis,sentinel}.conf" |
607 |
- ewarn "Please apply your changes to the new configuration files." |
608 |
-} |
609 |
|
610 |
diff --git a/dev-db/redis/redis-6.2.3-r1.ebuild b/dev-db/redis/redis-6.2.3-r1.ebuild |
611 |
deleted file mode 100644 |
612 |
index a40086fabfb..00000000000 |
613 |
--- a/dev-db/redis/redis-6.2.3-r1.ebuild |
614 |
+++ /dev/null |
615 |
@@ -1,187 +0,0 @@ |
616 |
-# Copyright 1999-2021 Gentoo Authors |
617 |
-# Distributed under the terms of the GNU General Public License v2 |
618 |
- |
619 |
-EAPI=7 |
620 |
- |
621 |
-# Redis does NOT build with Lua 5.2 or newer at this time: |
622 |
-# - 5.3 and 5.4 give: |
623 |
-# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" |
624 |
-# - 5.2 fails with: |
625 |
-# scripting.c:(.text+0x1f9b): undefined reference to `lua_open' |
626 |
-# because lua_open became lua_newstate in 5.2 |
627 |
-LUA_COMPAT=( lua5-1 luajit ) |
628 |
- |
629 |
-inherit autotools flag-o-matic lua-single systemd toolchain-funcs tmpfiles |
630 |
- |
631 |
-DESCRIPTION="A persistent caching system, key-value and data structures database" |
632 |
-HOMEPAGE="https://redis.io" |
633 |
-SRC_URI="https://download.redis.io/releases/${P}.tar.gz" |
634 |
- |
635 |
-LICENSE="BSD" |
636 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" |
637 |
-IUSE="+jemalloc ssl systemd tcmalloc test" |
638 |
-RESTRICT="!test? ( test )" |
639 |
-SLOT="0" |
640 |
- |
641 |
-COMMON_DEPEND=" |
642 |
- ${LUA_DEPS} |
643 |
- jemalloc? ( >=dev-libs/jemalloc-5.1:= ) |
644 |
- ssl? ( dev-libs/openssl:0= ) |
645 |
- systemd? ( sys-apps/systemd:= ) |
646 |
- tcmalloc? ( dev-util/google-perftools ) |
647 |
-" |
648 |
- |
649 |
-RDEPEND=" |
650 |
- ${COMMON_DEPEND} |
651 |
- acct-group/redis |
652 |
- acct-user/redis |
653 |
-" |
654 |
- |
655 |
-BDEPEND=" |
656 |
- ${COMMON_DEPEND} |
657 |
- virtual/pkgconfig |
658 |
-" |
659 |
- |
660 |
-# Tcl is only needed in the CHOST test env |
661 |
-DEPEND=" |
662 |
- ${COMMON_DEPEND} |
663 |
- test? ( |
664 |
- dev-lang/tcl:0= |
665 |
- ssl? ( dev-tcltk/tls ) |
666 |
- )" |
667 |
- |
668 |
-REQUIRED_USE="?? ( jemalloc tcmalloc ) |
669 |
- ${LUA_REQUIRED_USE}" |
670 |
- |
671 |
-PATCHES=( |
672 |
- "${FILESDIR}"/${PN}-6.2.1-config.patch |
673 |
- "${FILESDIR}"/${PN}-5.0-shared.patch |
674 |
- "${FILESDIR}"/${PN}-6.2.1-sharedlua.patch |
675 |
- "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch |
676 |
- "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
677 |
-) |
678 |
- |
679 |
-src_prepare() { |
680 |
- default |
681 |
- |
682 |
- # unstable on jemalloc |
683 |
- > tests/unit/memefficiency.tcl || die |
684 |
- |
685 |
- # Copy lua modules into build dir |
686 |
- cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
687 |
- cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
688 |
- # Append cflag for lua_cjson |
689 |
- # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
690 |
- append-cflags "-DENABLE_CJSON_GLOBAL" |
691 |
- |
692 |
- # now we will rewrite present Makefiles |
693 |
- local makefiles="" MKF |
694 |
- for MKF in $(find -name 'Makefile' | cut -b 3-); do |
695 |
- mv "${MKF}" "${MKF}.in" |
696 |
- sed -i -e 's:$(CC):@CC@:g' \ |
697 |
- -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
698 |
- -e 's: $(DEBUG)::g' \ |
699 |
- -e 's:$(OBJARCH)::g' \ |
700 |
- -e 's:ARCH:TARCH:g' \ |
701 |
- -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
702 |
- "${MKF}.in" \ |
703 |
- || die "Sed failed for ${MKF}" |
704 |
- makefiles+=" ${MKF}" |
705 |
- done |
706 |
- # autodetection of compiler and settings; generates the modified Makefiles |
707 |
- cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
708 |
- |
709 |
- # Use the correct pkgconfig name for Lua. |
710 |
- # The upstream configure script handles luajit specially, and is not |
711 |
- # effected by these changes. |
712 |
- sed -i \ |
713 |
- -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
714 |
- -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
715 |
- -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \ |
716 |
- configure.ac || die "Sed failed for configure.ac" |
717 |
- eautoreconf |
718 |
-} |
719 |
- |
720 |
-src_configure() { |
721 |
- econf $(use_with lua_single_target_luajit luajit) |
722 |
- |
723 |
- # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
724 |
- # also, don't define ANSI/c99 for lua twice |
725 |
- sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
726 |
-} |
727 |
- |
728 |
-src_compile() { |
729 |
- local myconf="" |
730 |
- |
731 |
- if use jemalloc; then |
732 |
- myconf+="MALLOC=jemalloc" |
733 |
- elif use tcmalloc; then |
734 |
- myconf+="MALLOC=tcmalloc" |
735 |
- else |
736 |
- myconf+="MALLOC=libc" |
737 |
- fi |
738 |
- |
739 |
- if use ssl; then |
740 |
- myconf+=" BUILD_TLS=yes" |
741 |
- fi |
742 |
- |
743 |
- export USE_SYSTEMD=$(usex systemd) |
744 |
- |
745 |
- tc-export AR CC RANLIB |
746 |
- emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" |
747 |
-} |
748 |
- |
749 |
-src_test() { |
750 |
- # Known to fail with FEATURES=usersandbox |
751 |
- if has usersandbox ${FEATURES}; then |
752 |
- ewarn "You are emerging ${P} with 'usersandbox' enabled." \ |
753 |
- "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" |
754 |
- fi |
755 |
- |
756 |
- if use ssl; then |
757 |
- ./utils/gen-test-certs.sh |
758 |
- ./runtest --tls |
759 |
- else |
760 |
- ./runtest |
761 |
- fi |
762 |
-} |
763 |
- |
764 |
-src_install() { |
765 |
- insinto /etc/redis |
766 |
- doins redis.conf sentinel.conf |
767 |
- use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf |
768 |
- fperms 0750 /etc/redis |
769 |
- fperms 0644 /etc/redis/{redis,sentinel}.conf |
770 |
- |
771 |
- newconfd "${FILESDIR}/redis.confd-r2" redis |
772 |
- newinitd "${FILESDIR}/redis.initd-6" redis |
773 |
- |
774 |
- systemd_newunit "${FILESDIR}/redis.service-4" redis.service |
775 |
- newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf |
776 |
- |
777 |
- newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel |
778 |
- newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel |
779 |
- |
780 |
- insinto /etc/logrotate.d/ |
781 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
782 |
- |
783 |
- dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
784 |
- |
785 |
- dobin src/redis-cli |
786 |
- dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
787 |
- fperms 0750 /usr/sbin/redis-benchmark |
788 |
- dosym redis-server /usr/sbin/redis-sentinel |
789 |
- |
790 |
- if use prefix; then |
791 |
- diropts -m0750 |
792 |
- else |
793 |
- diropts -m0750 -o redis -g redis |
794 |
- fi |
795 |
- keepdir /var/{log,lib}/redis |
796 |
-} |
797 |
- |
798 |
-pkg_postinst() { |
799 |
- ewarn "The default redis configuration file location changed to:" |
800 |
- ewarn " /etc/redis/{redis,sentinel}.conf" |
801 |
- ewarn "Please apply your changes to the new configuration files." |
802 |
-} |