1 |
commit: b0bfe42fbfc50ae534028328e2605c609af15d3d |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Oct 25 04:53:47 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 26 13:17:47 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bfe42f |
7 |
|
8 |
dev-db/redis: drop old |
9 |
|
10 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/10167 |
13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
14 |
|
15 |
dev-db/redis/Manifest | 2 - |
16 |
dev-db/redis/redis-5.0_rc4.ebuild | 144 -------------------------------------- |
17 |
dev-db/redis/redis-5.0_rc5.ebuild | 144 -------------------------------------- |
18 |
3 files changed, 290 deletions(-) |
19 |
|
20 |
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest |
21 |
index 0a88d5bb999..bb7d91b87b0 100644 |
22 |
--- a/dev-db/redis/Manifest |
23 |
+++ b/dev-db/redis/Manifest |
24 |
@@ -8,5 +8,3 @@ DIST redis-4.0.7.tar.gz 1729488 BLAKE2B 7a5337b868e4da4a7387b31bc9d6bd4c86abd701 |
25 |
DIST redis-4.0.8.tar.gz 1729973 BLAKE2B 32d82a07beba9ea8f0b08a8fc69da548a1974e5839f052a9803ffb0f52ef920df9b128092e061b5e693581a50efef4a1212c1f6310dc8492eff5ca841ff3b03a SHA512 11c126ddef3bedbceb02ee7a80a61374e081da8087055d77970b0097066a6f1c5e0c4f0d246c9851f8c3beca22f185c184669a9dc4f1c7c229f8cd2c34196ab6 |
26 |
DIST redis-4.0.9.tar.gz 1737022 BLAKE2B 35a83d146062f5b14c023d7fd9f28d743ba6bec3e0e4bf9ce8e065a706bbd7508ffbcb8b1b4d18f6b6774589b5456540ba8717b9f449fcbd758c0f57dbd505a3 SHA512 a6cf63cb361f0a87da3955ba628190dc04cad342f7a664d18e44416ee67dd86ed6e3a46b9701e994f1417e56b819b3c6fc595f363c10bb4b83d5033919d29598 |
27 |
DIST redis-5.0.0.tar.gz 1947721 BLAKE2B c776796a2efe3efd9f9b70dc9be06c10695a5f3cb40765b64f7adddbe5e77eb68650986d8c705e947d1aa46f0f909a2aa2743f43a12ba6c30615e5f9fc2ca55b SHA512 818277cf8c14eb5f0b864e936f657c8021a3614a76dda8975d82b20ab4e3983731363b7b527fb504fd41292304de079f78702503fca867ac6f45a97a391eec07 |
28 |
-DIST redis-5.0_rc4.tar.gz 1937238 BLAKE2B b8f768b83e27476bc038fc554193680f4873eb2405f238e0a6f2053cf68c4a9e6c45546730a263463b805d6811334c1ba056be0230676f19d0562d488a3d4c97 SHA512 75b308bca026fe3b7cff1a92df3990bab5bb7ffe24cdfbc263f4d522ebe7ec8d86a9ed66da1778fe67c08a39b6f0c83cb10c5a332818c6ad04621d01c4aa6add |
29 |
-DIST redis-5.0_rc5.tar.gz 1941761 BLAKE2B 294cf455e40bbbcfb87972fd4130854ced714369dcfc08a77e9be693d1b819f3c5dfe8b407582726e8bd140be3965f9c6cab03cd28002004ed1e634a0827a060 SHA512 173e529bec234339be3b6c2c5c360085a186a66c4d08a4dfeb51aa689ab61ba1d8ab2914af5ba4923799b17bc09a05a488ce6e6cfae7fa7faa5c5a55e38c111c |
30 |
|
31 |
diff --git a/dev-db/redis/redis-5.0_rc4.ebuild b/dev-db/redis/redis-5.0_rc4.ebuild |
32 |
deleted file mode 100644 |
33 |
index 1b2b1a57ecf..00000000000 |
34 |
--- a/dev-db/redis/redis-5.0_rc4.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,144 +0,0 @@ |
37 |
-# Copyright 1999-2018 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=6 |
41 |
- |
42 |
-inherit autotools eutils flag-o-matic systemd toolchain-funcs user |
43 |
- |
44 |
-MY_PV="${PV/_/-}" |
45 |
-MY_P="${PN}-${MY_PV}" |
46 |
- |
47 |
-DESCRIPTION="A persistent caching system, key-value and data structures database" |
48 |
-HOMEPAGE="https://redis.io" |
49 |
-SRC_URI="https://github.com/antirez/redis/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" |
50 |
- |
51 |
-LICENSE="BSD" |
52 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" |
53 |
-IUSE="+jemalloc tcmalloc luajit test" |
54 |
-SLOT="0" |
55 |
- |
56 |
-# Redis does NOT build with Lua 5.2 or newer at this time. |
57 |
-# This should link correctly with both unslotted & slotted Lua, without |
58 |
-# changes. |
59 |
-RDEPEND=" |
60 |
- luajit? ( dev-lang/luajit:2 ) |
61 |
- !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) |
62 |
- tcmalloc? ( dev-util/google-perftools ) |
63 |
- jemalloc? ( >=dev-libs/jemalloc-3.2 )" |
64 |
- |
65 |
-DEPEND=" |
66 |
- ${RDEPEND} |
67 |
- virtual/pkgconfig |
68 |
- >=sys-devel/autoconf-2.63 |
69 |
- test? ( dev-lang/tcl:0= )" |
70 |
- |
71 |
-REQUIRED_USE="?? ( tcmalloc jemalloc )" |
72 |
- |
73 |
-S="${WORKDIR}/${MY_P}" |
74 |
- |
75 |
-pkg_setup() { |
76 |
- enewgroup redis 75 |
77 |
- enewuser redis 75 -1 /var/lib/redis redis |
78 |
-} |
79 |
- |
80 |
-src_prepare() { |
81 |
- eapply \ |
82 |
- "${FILESDIR}"/${PN}-3.2.3-config.patch \ |
83 |
- "${FILESDIR}"/${PN}-5.0-shared.patch \ |
84 |
- "${FILESDIR}"/${PN}-5.0-sharedlua.patch \ |
85 |
- "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
86 |
- eapply_user |
87 |
- |
88 |
- # Copy lua modules into build dir |
89 |
- cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
90 |
- cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
91 |
- # Append cflag for lua_cjson |
92 |
- # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
93 |
- append-cflags "-DENABLE_CJSON_GLOBAL" |
94 |
- |
95 |
- # now we will rewrite present Makefiles |
96 |
- local makefiles="" MKF |
97 |
- for MKF in $(find -name 'Makefile' | cut -b 3-); do |
98 |
- mv "${MKF}" "${MKF}.in" |
99 |
- sed -i -e 's:$(CC):@CC@:g' \ |
100 |
- -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
101 |
- -e 's: $(DEBUG)::g' \ |
102 |
- -e 's:$(OBJARCH)::g' \ |
103 |
- -e 's:ARCH:TARCH:g' \ |
104 |
- -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
105 |
- "${MKF}.in" \ |
106 |
- || die "Sed failed for ${MKF}" |
107 |
- makefiles+=" ${MKF}" |
108 |
- done |
109 |
- # autodetection of compiler and settings; generates the modified Makefiles |
110 |
- cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
111 |
- |
112 |
- # Use the correct pkgconfig name for Lua |
113 |
- has_version 'dev-lang/lua:5.1' \ |
114 |
- && LUAPKGCONFIG=lua5.1 \ |
115 |
- || LUAPKGCONFIG=lua |
116 |
- sed -i \ |
117 |
- -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
118 |
- -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
119 |
- -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \ |
120 |
- configure.ac || die "Sed failed for configure.ac" |
121 |
- eautoreconf |
122 |
-} |
123 |
- |
124 |
-src_configure() { |
125 |
- econf \ |
126 |
- $(use_with luajit) |
127 |
- |
128 |
- # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
129 |
- # also, don't define ANSI/c99 for lua twice |
130 |
- sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
131 |
-} |
132 |
- |
133 |
-src_compile() { |
134 |
- tc-export CC AR RANLIB |
135 |
- |
136 |
- local myconf="" |
137 |
- |
138 |
- if use tcmalloc; then |
139 |
- myconf="${myconf} USE_TCMALLOC=yes" |
140 |
- elif use jemalloc; then |
141 |
- myconf="${myconf} JEMALLOC_SHARED=yes" |
142 |
- else |
143 |
- myconf="${myconf} MALLOC=yes" |
144 |
- fi |
145 |
- |
146 |
- emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" |
147 |
-} |
148 |
- |
149 |
-src_install() { |
150 |
- insinto /etc/ |
151 |
- doins redis.conf sentinel.conf |
152 |
- use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
153 |
- fperms 0644 /etc/{redis,sentinel}.conf |
154 |
- |
155 |
- newconfd "${FILESDIR}/redis.confd-r1" redis |
156 |
- newinitd "${FILESDIR}/redis.initd-5" redis |
157 |
- |
158 |
- systemd_newunit "${FILESDIR}/redis.service-2" redis.service |
159 |
- systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf |
160 |
- |
161 |
- newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel |
162 |
- newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel |
163 |
- |
164 |
- insinto /etc/logrotate.d/ |
165 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
166 |
- |
167 |
- dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
168 |
- |
169 |
- dobin src/redis-cli |
170 |
- dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
171 |
- fperms 0750 /usr/sbin/redis-benchmark |
172 |
- dosym redis-server /usr/sbin/redis-sentinel |
173 |
- |
174 |
- if use prefix; then |
175 |
- diropts -m0750 |
176 |
- else |
177 |
- diropts -m0750 -o redis -g redis |
178 |
- fi |
179 |
- keepdir /var/{log,lib}/redis |
180 |
-} |
181 |
|
182 |
diff --git a/dev-db/redis/redis-5.0_rc5.ebuild b/dev-db/redis/redis-5.0_rc5.ebuild |
183 |
deleted file mode 100644 |
184 |
index 1c203774f8c..00000000000 |
185 |
--- a/dev-db/redis/redis-5.0_rc5.ebuild |
186 |
+++ /dev/null |
187 |
@@ -1,144 +0,0 @@ |
188 |
-# Copyright 1999-2018 Gentoo Foundation |
189 |
-# Distributed under the terms of the GNU General Public License v2 |
190 |
- |
191 |
-EAPI=6 |
192 |
-WANT_AUTOCONF="latest" |
193 |
- |
194 |
-inherit autotools eapi7-ver flag-o-matic systemd toolchain-funcs user |
195 |
- |
196 |
-MY_PV="$(ver_rs 2 -)" |
197 |
-MY_P="${PN}-${MY_PV}" |
198 |
- |
199 |
-DESCRIPTION="A persistent caching system, key-value and data structures database" |
200 |
-HOMEPAGE="https://redis.io" |
201 |
-SRC_URI="https://github.com/antirez/redis/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" |
202 |
- |
203 |
-LICENSE="BSD" |
204 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" |
205 |
-IUSE="+jemalloc tcmalloc luajit test" |
206 |
-SLOT="0" |
207 |
- |
208 |
-# Redis does NOT build with Lua 5.2 or newer at this time. |
209 |
-# This should link correctly with both unslotted & slotted Lua, without |
210 |
-# changes. |
211 |
-RDEPEND=" |
212 |
- luajit? ( dev-lang/luajit:2 ) |
213 |
- !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) |
214 |
- tcmalloc? ( dev-util/google-perftools ) |
215 |
- jemalloc? ( >=dev-libs/jemalloc-3.2 )" |
216 |
- |
217 |
-DEPEND=" |
218 |
- ${RDEPEND} |
219 |
- virtual/pkgconfig |
220 |
- test? ( dev-lang/tcl:0= )" |
221 |
- |
222 |
-REQUIRED_USE="?? ( tcmalloc jemalloc )" |
223 |
- |
224 |
-S="${WORKDIR}/${MY_P}" |
225 |
- |
226 |
-pkg_setup() { |
227 |
- enewgroup redis 75 |
228 |
- enewuser redis 75 -1 /var/lib/redis redis |
229 |
-} |
230 |
- |
231 |
-src_prepare() { |
232 |
- eapply \ |
233 |
- "${FILESDIR}"/${PN}-3.2.3-config.patch \ |
234 |
- "${FILESDIR}"/${PN}-5.0-shared.patch \ |
235 |
- "${FILESDIR}"/${PN}-5.0-sharedlua.patch \ |
236 |
- "${FILESDIR}"/${PN}-sentinel-5.0-config.patch |
237 |
- eapply_user |
238 |
- |
239 |
- # Copy lua modules into build dir |
240 |
- cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
241 |
- cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
242 |
- # Append cflag for lua_cjson |
243 |
- # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
244 |
- append-cflags "-DENABLE_CJSON_GLOBAL" |
245 |
- |
246 |
- # now we will rewrite present Makefiles |
247 |
- local makefiles="" MKF |
248 |
- for MKF in $(find -name 'Makefile' | cut -b 3-); do |
249 |
- mv "${MKF}" "${MKF}.in" |
250 |
- sed -i -e 's:$(CC):@CC@:g' \ |
251 |
- -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
252 |
- -e 's: $(DEBUG)::g' \ |
253 |
- -e 's:$(OBJARCH)::g' \ |
254 |
- -e 's:ARCH:TARCH:g' \ |
255 |
- -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
256 |
- "${MKF}.in" \ |
257 |
- || die "Sed failed for ${MKF}" |
258 |
- makefiles+=" ${MKF}" |
259 |
- done |
260 |
- # autodetection of compiler and settings; generates the modified Makefiles |
261 |
- cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
262 |
- |
263 |
- # Use the correct pkgconfig name for Lua |
264 |
- has_version 'dev-lang/lua:5.1' \ |
265 |
- && LUAPKGCONFIG=lua5.1 \ |
266 |
- || LUAPKGCONFIG=lua |
267 |
- sed -i \ |
268 |
- -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
269 |
- -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
270 |
- -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \ |
271 |
- configure.ac || die "Sed failed for configure.ac" |
272 |
- eautoreconf |
273 |
-} |
274 |
- |
275 |
-src_configure() { |
276 |
- econf \ |
277 |
- $(use_with luajit) |
278 |
- |
279 |
- # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
280 |
- # also, don't define ANSI/c99 for lua twice |
281 |
- sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
282 |
-} |
283 |
- |
284 |
-src_compile() { |
285 |
- tc-export CC AR RANLIB |
286 |
- |
287 |
- local myconf="" |
288 |
- |
289 |
- if use tcmalloc; then |
290 |
- myconf="${myconf} USE_TCMALLOC=yes" |
291 |
- elif use jemalloc; then |
292 |
- myconf="${myconf} JEMALLOC_SHARED=yes" |
293 |
- else |
294 |
- myconf="${myconf} MALLOC=yes" |
295 |
- fi |
296 |
- |
297 |
- emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" |
298 |
-} |
299 |
- |
300 |
-src_install() { |
301 |
- insinto /etc/ |
302 |
- doins redis.conf sentinel.conf |
303 |
- use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
304 |
- fperms 0644 /etc/{redis,sentinel}.conf |
305 |
- |
306 |
- newconfd "${FILESDIR}/redis.confd-r1" redis |
307 |
- newinitd "${FILESDIR}/redis.initd-5" redis |
308 |
- |
309 |
- systemd_newunit "${FILESDIR}/redis.service-2" redis.service |
310 |
- systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf |
311 |
- |
312 |
- newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel |
313 |
- newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel |
314 |
- |
315 |
- insinto /etc/logrotate.d/ |
316 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
317 |
- |
318 |
- dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md |
319 |
- |
320 |
- dobin src/redis-cli |
321 |
- dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb |
322 |
- fperms 0750 /usr/sbin/redis-benchmark |
323 |
- dosym redis-server /usr/sbin/redis-sentinel |
324 |
- |
325 |
- if use prefix; then |
326 |
- diropts -m0750 |
327 |
- else |
328 |
- diropts -m0750 -o redis -g redis |
329 |
- fi |
330 |
- keepdir /var/{log,lib}/redis |
331 |
-} |