1 |
djc 13/08/26 11:47:13 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: redis-2.6.15.ebuild |
5 |
Log: |
6 |
Version bump redis to 2.6.15 (fixes 472968, 478536). |
7 |
|
8 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB) |
9 |
|
10 |
Revision Changes Path |
11 |
1.67 dev-db/redis/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.67&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.67&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?r1=1.66&r2=1.67 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v |
20 |
retrieving revision 1.66 |
21 |
retrieving revision 1.67 |
22 |
diff -u -r1.66 -r1.67 |
23 |
--- ChangeLog 4 Jul 2013 12:23:47 -0000 1.66 |
24 |
+++ ChangeLog 26 Aug 2013 11:47:13 -0000 1.67 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for dev-db/redis |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.66 2013/07/04 12:23:47 ago Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.67 2013/08/26 11:47:13 djc Exp $ |
30 |
+ |
31 |
+*redis-2.6.15 (26 Aug 2013) |
32 |
+ |
33 |
+ 26 Aug 2013; Dirkjan Ochtman <djc@g.o> +files/redis.initd-3, |
34 |
+ +redis-2.6.15.ebuild: |
35 |
+ Version bump redis to 2.6.15 (fixes 472968, 478536). |
36 |
|
37 |
04 Jul 2013; Agostino Sarubbo <ago@g.o> redis-2.6.13.ebuild: |
38 |
Stable for x86, wrt bug #472854 |
39 |
|
40 |
|
41 |
|
42 |
1.1 dev-db/redis/redis-2.6.15.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.6.15.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.6.15.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: redis-2.6.15.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2013 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.6.15.ebuild,v 1.1 2013/08/26 11:47:13 djc Exp $ |
52 |
|
53 |
EAPI=5 |
54 |
|
55 |
inherit autotools eutils flag-o-matic toolchain-funcs user |
56 |
|
57 |
DESCRIPTION="A persistent caching system, key-value and data structures database." |
58 |
HOMEPAGE="http://redis.io/" |
59 |
SRC_URI="http://download.redis.io/releases/${P}.tar.gz" |
60 |
|
61 |
LICENSE="BSD" |
62 |
KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris" |
63 |
IUSE="+jemalloc tcmalloc test" |
64 |
SLOT="0" |
65 |
|
66 |
RDEPEND="tcmalloc? ( dev-util/google-perftools ) |
67 |
jemalloc? ( >=dev-libs/jemalloc-3.2 )" |
68 |
DEPEND=">=sys-devel/autoconf-2.63 |
69 |
test? ( dev-lang/tcl ) |
70 |
${RDEPEND}" |
71 |
REQUIRED_USE="tcmalloc? ( !jemalloc ) |
72 |
jemalloc? ( !tcmalloc )" |
73 |
|
74 |
S="${WORKDIR}/${PN}-${PV/_/-}" |
75 |
|
76 |
pkg_setup() { |
77 |
enewgroup redis 75 |
78 |
enewuser redis 75 -1 /var/lib/redis redis |
79 |
} |
80 |
|
81 |
src_prepare() { |
82 |
epatch "${FILESDIR}/${PN}-2.6.7"-{shared,config}.patch |
83 |
|
84 |
# bug 467172, 467174 |
85 |
sed -i -e 's:AR=:AR?=:g' -e 's:RANLIB=:RANLIB?=:g' "${S}/deps/lua/src/Makefile" || die |
86 |
|
87 |
# now we will rewrite present Makefiles |
88 |
local makefiles="" |
89 |
for MKF in $(find -name 'Makefile' | cut -b 3-); do |
90 |
mv "${MKF}" "${MKF}.in" |
91 |
sed -i -e 's:$(CC):@CC@:g' \ |
92 |
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
93 |
-e 's: $(DEBUG)::g' \ |
94 |
-e 's:$(OBJARCH)::g' \ |
95 |
-e 's:ARCH:TARCH:g' \ |
96 |
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
97 |
"${MKF}.in" \ |
98 |
|| die "Sed failed for ${MKF}" |
99 |
makefiles+=" ${MKF}" |
100 |
done |
101 |
# autodetection of compiler and settings; generates the modified Makefiles |
102 |
cp "${FILESDIR}"/configure.ac-2.2 configure.ac |
103 |
sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
104 |
configure.ac || die "Sed failed for configure.ac" |
105 |
eautoconf |
106 |
} |
107 |
|
108 |
src_configure() { |
109 |
econf |
110 |
|
111 |
# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
112 |
# also, don't define ANSI/c99 for lua twice |
113 |
sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
114 |
} |
115 |
|
116 |
src_compile() { |
117 |
tc-export CC AR RANLIB |
118 |
|
119 |
local myconf="" |
120 |
|
121 |
if use tcmalloc ; then |
122 |
myconf="${myconf} USE_TCMALLOC=yes" |
123 |
elif use jemalloc ; then |
124 |
myconf="${myconf} JEMALLOC_SHARED=yes" |
125 |
else |
126 |
myconf="${myconf} MALLOC=yes" |
127 |
fi |
128 |
|
129 |
emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" |
130 |
} |
131 |
|
132 |
src_install() { |
133 |
insinto /etc/ |
134 |
doins redis.conf sentinel.conf |
135 |
use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
136 |
fperms 0644 /etc/{redis,sentinel}.conf |
137 |
|
138 |
newconfd "${FILESDIR}/redis.confd" redis |
139 |
newinitd "${FILESDIR}/redis.initd-3" redis |
140 |
|
141 |
nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README |
142 |
|
143 |
dobin src/redis-cli |
144 |
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump |
145 |
fperms 0750 /usr/sbin/redis-benchmark |
146 |
dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel |
147 |
|
148 |
if use prefix; then |
149 |
diropts -m0750 |
150 |
else |
151 |
diropts -m0750 -o redis -g redis |
152 |
fi |
153 |
keepdir /var/{log,lib}/redis |
154 |
} |