1 |
commit: 466cb8a7e6f1cc16bf071e070a2cfe207a78ab78 |
2 |
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 24 09:28:14 2015 +0000 |
4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 24 09:28:14 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466cb8a7 |
7 |
|
8 |
dev-db/redis: version bump fix #563770 #563768 |
9 |
|
10 |
Package-Manager: portage-2.2.24 |
11 |
|
12 |
dev-db/redis/Manifest | 2 + |
13 |
dev-db/redis/redis-2.8.23.ebuild | 120 +++++++++++++++++++++++++++++++++++++++ |
14 |
dev-db/redis/redis-3.0.5.ebuild | 116 +++++++++++++++++++++++++++++++++++++ |
15 |
3 files changed, 238 insertions(+) |
16 |
|
17 |
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest |
18 |
index f9258d1..b27607f 100644 |
19 |
--- a/dev-db/redis/Manifest |
20 |
+++ b/dev-db/redis/Manifest |
21 |
@@ -3,5 +3,7 @@ DIST redis-2.6.16.tar.gz 999579 SHA256 81490918dcf82d124b36e48b0a9911bfba3f13abb |
22 |
DIST redis-2.8.17.tar.gz 1234543 SHA256 53c7cc639571729fa57d7baa7f81aec1d5886f86bac9c66f6ad06dbdaee236a7 SHA512 29515abd4437e03da20063a1831f0eb11ac65ba9d51cbfbb1987726102e3a55c76a3286b8c9a3bfbaf5290998fb5b662ef4aadbe0d131cd60824c8533e088441 WHIRLPOOL 22eb01f8100a07178352e397f4342d44f478aadda7a0a7bdfa9a08d8cfa1578ac6e98ba0cce0a9828cc226364d9a7995d86bc78adfc73476c04868639307be30 |
23 |
DIST redis-2.8.19.tar.gz 1254857 SHA256 29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145 SHA512 34997b45815cfdec9fbb06cd6664ed6ddf71baf064fd9ac155b7b969fd5945f78927cd5dfde83b043dc8ff1d7e35b172b9403cdf6115b8ca7bdf80c581ee9cdd WHIRLPOOL df3408de1e53a8a13c0b645054ce944453f3a812c264b168b797519a6d8536e0a60095fbd314f591ba21f0532be5b6b37e1ec8b11e928cdd6447ab70dfb8be33 |
24 |
DIST redis-2.8.21.tar.gz 1260030 SHA256 3da371693bb54c22da04d86cab1b871072c8d19bdfbc4f811469b7b53384c563 SHA512 8be68e949e08fc1d143c2fd7bbd123d0c3618d8ac9333bd9ef691384364d307c85f9222b7a607668cf667e5c2193ef40d0c7167fa15b981c6ffcfe5f2e6120d8 WHIRLPOOL d548a7aff0c84c2eb0fbf4c33436a0e46b7f6150f83e768e634441003974715b31c755d658fbc7f2fb5635511232e50c8ad2f7dce10a196bcc7b3da9193c3224 |
25 |
+DIST redis-2.8.23.tar.gz 1265194 SHA256 f3c79778f478a01237035b67edaaa19332e5624dfa849d66815a4328d3e95ace SHA512 ab27d5f4da3a1a03f513dd6e731517b59c8857961599651f51ced29138c907e3968390d2a473e26690d8ada6808cff1b948999ed171e9826cad8449031fc39ce WHIRLPOOL e18e5caf086c41743642d817b69ce7d923505ebb90373c7b8ccac5990bfa1972e264292e3d78310e84378b958c0ab818d208349763ab43eb9cfc05030755a6f5 |
26 |
DIST redis-3.0.3.tar.gz 1360959 SHA256 1d08fa665b16d0950274dfbd47fbbcf3485e43e901021338640a0334666e9da5 SHA512 68b2d85341487efed26c92cd7925b4e9d889b5a19f08f4695ffd07087c01ae0c872086575744636513b01720829002c8d5c7bf43b20ee2c561599fa8d1c475f5 WHIRLPOOL 32d543454cda029259d8719f5696f3e16d40c489c0d44a8475bf65a7b26b9f6df74f5cdbfac2b5d44bea97844b68ae49d8656c8668fdf6ce6102cb482c200a29 |
27 |
DIST redis-3.0.4.tar.gz 1364993 SHA256 a35e90ad581925134aa0fc92e969cc825f5cdee8e13c36a87d4d6995316112cf SHA512 7d8d681222892c759e7c3809203522a96a547457e0ff123cca296bac911395c7d8c1ded06331ae5cb487b87d0adcbaa02aa12c2dd724196a7b86111e236b023a WHIRLPOOL e12f7751e3e25068a25c02990d0e8416cedc152f66b5e9e1e47ae91f10a0d543b96ad456a4eb7fe16cb92ed46a0cc2fee65954207b354b9c211f425191a6c388 |
28 |
+DIST redis-3.0.5.tar.gz 1366160 SHA256 4c176826eee909fbdc63db1c15adc22aab42d758043829e556f4331e6a5bd480 SHA512 f44e2bcf2f4910da9f9d9e31ec542d5816ec0ba4329efe3e5053cc0176a5a8557d905f23bd3fd37e8a6e674eaf12804613718f63cb2ca1eac2b4f9c6082acab6 WHIRLPOOL 5b58ca02af6be7768c89e9307d668081cc161f9a200a1db40f0216b6c564cb67c8230d420024c12fb5f2397cedb8979a62ad01a61d526030018171a69a22e19d |
29 |
|
30 |
diff --git a/dev-db/redis/redis-2.8.23.ebuild b/dev-db/redis/redis-2.8.23.ebuild |
31 |
new file mode 100644 |
32 |
index 0000000..cf19590 |
33 |
--- /dev/null |
34 |
+++ b/dev-db/redis/redis-2.8.23.ebuild |
35 |
@@ -0,0 +1,120 @@ |
36 |
+# Copyright 1999-2015 Gentoo Foundation |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+# $Id$ |
39 |
+ |
40 |
+EAPI=5 |
41 |
+ |
42 |
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user |
43 |
+ |
44 |
+DESCRIPTION="A persistent caching system, key-value and data structures database" |
45 |
+HOMEPAGE="http://redis.io/" |
46 |
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="BSD" |
49 |
+KEYWORDS="~amd64 ~amd64-linux ~hppa ~x86 ~x86-linux ~x86-macos ~x86-solaris" |
50 |
+IUSE="+jemalloc tcmalloc test" |
51 |
+SLOT="0" |
52 |
+ |
53 |
+RDEPEND=">=dev-lang/lua-5.1:* |
54 |
+ tcmalloc? ( dev-util/google-perftools ) |
55 |
+ jemalloc? ( >=dev-libs/jemalloc-3.2 )" |
56 |
+DEPEND="virtual/pkgconfig |
57 |
+ >=sys-devel/autoconf-2.63 |
58 |
+ test? ( dev-lang/tcl:0= ) |
59 |
+ ${RDEPEND}" |
60 |
+REQUIRED_USE="?? ( tcmalloc jemalloc )" |
61 |
+ |
62 |
+S="${WORKDIR}/${PN}-${PV/_/-}" |
63 |
+ |
64 |
+pkg_setup() { |
65 |
+ enewgroup redis 75 |
66 |
+ enewuser redis 75 -1 /var/lib/redis redis |
67 |
+} |
68 |
+ |
69 |
+src_prepare() { |
70 |
+ epatch "${FILESDIR}"/${PN}-2.8.3-shared.patch |
71 |
+ epatch "${FILESDIR}"/${PN}-2.8.17-config.patch |
72 |
+ epatch "${FILESDIR}"/${PN}-2.8.19-sharedlua.patch |
73 |
+ |
74 |
+ # Copy lua modules into build dir |
75 |
+ cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
76 |
+ cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
77 |
+ # Append cflag for lua_cjson |
78 |
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
79 |
+ append-cflags "-DENABLE_CJSON_GLOBAL" |
80 |
+ |
81 |
+ # Avoid glibc noise |
82 |
+ # https://github.com/antirez/redis/pull/2189 |
83 |
+ [[ ${CHOST} == *linux* ]] && append-cflags "-D_DEFAULT_SOURCE" |
84 |
+ |
85 |
+ # now we will rewrite present Makefiles |
86 |
+ local makefiles="" |
87 |
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do |
88 |
+ mv "${MKF}" "${MKF}.in" |
89 |
+ sed -i -e 's:$(CC):@CC@:g' \ |
90 |
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
91 |
+ -e 's: $(DEBUG)::g' \ |
92 |
+ -e 's:$(OBJARCH)::g' \ |
93 |
+ -e 's:ARCH:TARCH:g' \ |
94 |
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
95 |
+ "${MKF}.in" \ |
96 |
+ || die "Sed failed for ${MKF}" |
97 |
+ makefiles+=" ${MKF}" |
98 |
+ done |
99 |
+ # autodetection of compiler and settings; generates the modified Makefiles |
100 |
+ cp "${FILESDIR}"/configure.ac-2.2 configure.ac |
101 |
+ sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
102 |
+ configure.ac || die "Sed failed for configure.ac" |
103 |
+ eautoconf |
104 |
+} |
105 |
+ |
106 |
+src_configure() { |
107 |
+ econf |
108 |
+ |
109 |
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
110 |
+ # also, don't define ANSI/c99 for lua twice |
111 |
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
112 |
+} |
113 |
+ |
114 |
+src_compile() { |
115 |
+ tc-export CC AR RANLIB |
116 |
+ |
117 |
+ local myconf="" |
118 |
+ |
119 |
+ if use tcmalloc ; then |
120 |
+ myconf="${myconf} USE_TCMALLOC=yes" |
121 |
+ elif use jemalloc ; then |
122 |
+ myconf="${myconf} JEMALLOC_SHARED=yes" |
123 |
+ else |
124 |
+ myconf="${myconf} MALLOC=yes" |
125 |
+ fi |
126 |
+ |
127 |
+ emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" |
128 |
+} |
129 |
+ |
130 |
+src_install() { |
131 |
+ insinto /etc/ |
132 |
+ doins redis.conf sentinel.conf |
133 |
+ use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
134 |
+ fperms 0644 /etc/{redis,sentinel}.conf |
135 |
+ |
136 |
+ newconfd "${FILESDIR}/redis.confd" redis |
137 |
+ newinitd "${FILESDIR}/redis.initd-4" redis |
138 |
+ |
139 |
+ systemd_newunit "${FILESDIR}/redis.service-2" redis.service |
140 |
+ systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf |
141 |
+ |
142 |
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README |
143 |
+ |
144 |
+ dobin src/redis-cli |
145 |
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump |
146 |
+ fperms 0750 /usr/sbin/redis-benchmark |
147 |
+ dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel |
148 |
+ |
149 |
+ if use prefix; then |
150 |
+ diropts -m0750 |
151 |
+ else |
152 |
+ diropts -m0750 -o redis -g redis |
153 |
+ fi |
154 |
+ keepdir /var/{log,lib}/redis |
155 |
+} |
156 |
|
157 |
diff --git a/dev-db/redis/redis-3.0.5.ebuild b/dev-db/redis/redis-3.0.5.ebuild |
158 |
new file mode 100644 |
159 |
index 0000000..328adcb |
160 |
--- /dev/null |
161 |
+++ b/dev-db/redis/redis-3.0.5.ebuild |
162 |
@@ -0,0 +1,116 @@ |
163 |
+# Copyright 1999-2015 Gentoo Foundation |
164 |
+# Distributed under the terms of the GNU General Public License v2 |
165 |
+# $Id$ |
166 |
+ |
167 |
+EAPI=5 |
168 |
+ |
169 |
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user |
170 |
+ |
171 |
+DESCRIPTION="A persistent caching system, key-value and data structures database" |
172 |
+HOMEPAGE="http://redis.io/" |
173 |
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz" |
174 |
+ |
175 |
+LICENSE="BSD" |
176 |
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" |
177 |
+IUSE="+jemalloc tcmalloc test" |
178 |
+SLOT="0" |
179 |
+ |
180 |
+RDEPEND=">=dev-lang/lua-5.1:* |
181 |
+ tcmalloc? ( dev-util/google-perftools ) |
182 |
+ jemalloc? ( >=dev-libs/jemalloc-3.2 )" |
183 |
+DEPEND="virtual/pkgconfig |
184 |
+ >=sys-devel/autoconf-2.63 |
185 |
+ test? ( dev-lang/tcl:0= ) |
186 |
+ ${RDEPEND}" |
187 |
+REQUIRED_USE="?? ( tcmalloc jemalloc )" |
188 |
+ |
189 |
+S="${WORKDIR}/${PN}-${PV/_/-}" |
190 |
+ |
191 |
+pkg_setup() { |
192 |
+ enewgroup redis 75 |
193 |
+ enewuser redis 75 -1 /var/lib/redis redis |
194 |
+} |
195 |
+ |
196 |
+src_prepare() { |
197 |
+ epatch "${FILESDIR}"/${PN}-2.8.3-shared.patch |
198 |
+ epatch "${FILESDIR}"/${PN}-2.8.17-config.patch |
199 |
+ epatch "${FILESDIR}"/${PN}-3.0.0-sharedlua.patch |
200 |
+ |
201 |
+ # Copy lua modules into build dir |
202 |
+ cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
203 |
+ cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
204 |
+ # Append cflag for lua_cjson |
205 |
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
206 |
+ append-cflags "-DENABLE_CJSON_GLOBAL" |
207 |
+ |
208 |
+ # now we will rewrite present Makefiles |
209 |
+ local makefiles="" |
210 |
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do |
211 |
+ mv "${MKF}" "${MKF}.in" |
212 |
+ sed -i -e 's:$(CC):@CC@:g' \ |
213 |
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
214 |
+ -e 's: $(DEBUG)::g' \ |
215 |
+ -e 's:$(OBJARCH)::g' \ |
216 |
+ -e 's:ARCH:TARCH:g' \ |
217 |
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
218 |
+ "${MKF}.in" \ |
219 |
+ || die "Sed failed for ${MKF}" |
220 |
+ makefiles+=" ${MKF}" |
221 |
+ done |
222 |
+ # autodetection of compiler and settings; generates the modified Makefiles |
223 |
+ cp "${FILESDIR}"/configure.ac-2.2 configure.ac |
224 |
+ sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
225 |
+ configure.ac || die "Sed failed for configure.ac" |
226 |
+ eautoconf |
227 |
+} |
228 |
+ |
229 |
+src_configure() { |
230 |
+ econf |
231 |
+ |
232 |
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
233 |
+ # also, don't define ANSI/c99 for lua twice |
234 |
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
235 |
+} |
236 |
+ |
237 |
+src_compile() { |
238 |
+ tc-export CC AR RANLIB |
239 |
+ |
240 |
+ local myconf="" |
241 |
+ |
242 |
+ if use tcmalloc ; then |
243 |
+ myconf="${myconf} USE_TCMALLOC=yes" |
244 |
+ elif use jemalloc ; then |
245 |
+ myconf="${myconf} JEMALLOC_SHARED=yes" |
246 |
+ else |
247 |
+ myconf="${myconf} MALLOC=yes" |
248 |
+ fi |
249 |
+ |
250 |
+ emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" |
251 |
+} |
252 |
+ |
253 |
+src_install() { |
254 |
+ insinto /etc/ |
255 |
+ doins redis.conf sentinel.conf |
256 |
+ use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
257 |
+ fperms 0644 /etc/{redis,sentinel}.conf |
258 |
+ |
259 |
+ newconfd "${FILESDIR}/redis.confd" redis |
260 |
+ newinitd "${FILESDIR}/redis.initd-4" redis |
261 |
+ |
262 |
+ systemd_newunit "${FILESDIR}/redis.service-2" redis.service |
263 |
+ systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf |
264 |
+ |
265 |
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README |
266 |
+ |
267 |
+ dobin src/redis-cli |
268 |
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump |
269 |
+ fperms 0750 /usr/sbin/redis-benchmark |
270 |
+ dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel |
271 |
+ |
272 |
+ if use prefix; then |
273 |
+ diropts -m0750 |
274 |
+ else |
275 |
+ diropts -m0750 -o redis -g redis |
276 |
+ fi |
277 |
+ keepdir /var/{log,lib}/redis |
278 |
+} |