1 |
djc 12/12/26 11:05:46 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: redis-2.4.18.ebuild |
5 |
Removed: redis-2.4.17-r1.ebuild |
6 |
Log: |
7 |
Version bump redis to 2.4.18 (bug 446236). |
8 |
|
9 |
(Portage version: 2.1.11.27/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB) |
10 |
|
11 |
Revision Changes Path |
12 |
1.54 dev-db/redis/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.54&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.54&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?r1=1.53&r2=1.54 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v |
21 |
retrieving revision 1.53 |
22 |
retrieving revision 1.54 |
23 |
diff -u -r1.53 -r1.54 |
24 |
--- ChangeLog 26 Dec 2012 11:01:44 -0000 1.53 |
25 |
+++ ChangeLog 26 Dec 2012 11:05:46 -0000 1.54 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for dev-db/redis |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.53 2012/12/26 11:01:44 djc Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.54 2012/12/26 11:05:46 djc Exp $ |
31 |
+ |
32 |
+*redis-2.4.18 (26 Dec 2012) |
33 |
+ |
34 |
+ 26 Dec 2012; Dirkjan Ochtman <djc@g.o> -redis-2.4.17-r1.ebuild, |
35 |
+ +redis-2.4.18.ebuild: |
36 |
+ And replace 2.4.17-r1 with 2.4.18 (bug 446236). |
37 |
|
38 |
*redis-2.4.17-r1 (26 Dec 2012) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 dev-db/redis/redis-2.4.18.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.4.18.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.4.18.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: redis-2.4.18.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2012 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.18.ebuild,v 1.1 2012/12/26 11:05:46 djc Exp $ |
53 |
|
54 |
EAPI="4" |
55 |
|
56 |
inherit autotools eutils flag-o-matic user |
57 |
|
58 |
DESCRIPTION="A persistent caching system, key-value and data structures database." |
59 |
HOMEPAGE="http://redis.io/" |
60 |
SRC_URI="http://redis.googlecode.com/files/${P}.tar.gz" |
61 |
|
62 |
LICENSE="BSD" |
63 |
KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris" |
64 |
IUSE="+jemalloc tcmalloc test" |
65 |
SLOT="0" |
66 |
|
67 |
RDEPEND="tcmalloc? ( dev-util/google-perftools ) |
68 |
jemalloc? ( >=dev-libs/jemalloc-3.2 )" |
69 |
DEPEND=">=sys-devel/autoconf-2.63 |
70 |
test? ( dev-lang/tcl ) |
71 |
${RDEPEND}" |
72 |
REQUIRED_USE="tcmalloc? ( !jemalloc ) |
73 |
jemalloc? ( !tcmalloc )" |
74 |
|
75 |
S="${WORKDIR}/${PN}-${PV/_/-}" |
76 |
|
77 |
REDIS_PIDDIR=/var/run/redis/ |
78 |
REDIS_PIDFILE=${REDIS_PIDDIR}/redis.pid |
79 |
REDIS_DATAPATH=/var/lib/redis |
80 |
REDIS_LOGPATH=/var/log/redis |
81 |
REDIS_LOGFILE=${REDIS_LOGPATH}/redis.log |
82 |
|
83 |
pkg_setup() { |
84 |
enewgroup redis 75 |
85 |
enewuser redis 75 -1 ${REDIS_DATAPATH} redis |
86 |
} |
87 |
|
88 |
src_prepare() { |
89 |
epatch "${FILESDIR}/${P}-shared.patch" |
90 |
epatch "${FILESDIR}/redis-2.4.4-tcmalloc.patch" |
91 |
|
92 |
# now we will rewrite present Makefiles |
93 |
local makefiles="" |
94 |
for MKF in $(find -name 'Makefile' | cut -b 3-); do |
95 |
mv "${MKF}" "${MKF}.in" |
96 |
sed -i -e 's:$(CC):@CC@:g' \ |
97 |
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
98 |
-e 's: $(DEBUG)::g' \ |
99 |
-e 's:$(OBJARCH)::g' \ |
100 |
-e 's:ARCH:TARCH:g' \ |
101 |
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
102 |
"${MKF}.in" \ |
103 |
|| die "Sed failed for ${MKF}" |
104 |
makefiles+=" ${MKF}" |
105 |
done |
106 |
# autodetection of compiler and settings; generates the modified Makefiles |
107 |
cp "${FILESDIR}"/configure.ac-2.2 configure.ac |
108 |
sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
109 |
configure.ac || die "Sed failed for configure.ac" |
110 |
eautoconf |
111 |
} |
112 |
|
113 |
src_compile() { |
114 |
local myconf="" |
115 |
|
116 |
if use tcmalloc ; then |
117 |
myconf="${myconf} USE_TCMALLOC=yes" |
118 |
elif use jemalloc ; then |
119 |
myconf="${myconf} JEMALLOC_SHARED=yes" |
120 |
else |
121 |
myconf="${myconf} FORCE_LIBC_MALLOC=yes" |
122 |
fi |
123 |
|
124 |
emake ${myconf} |
125 |
} |
126 |
|
127 |
src_install() { |
128 |
# configuration file rewrites |
129 |
insinto /etc/ |
130 |
sed -r \ |
131 |
-e "/^pidfile\>/s,/var.*,${REDIS_PIDFILE}," \ |
132 |
-e '/^daemonize\>/s,no,yes,' \ |
133 |
-e '/^# bind/s,^# ,,' \ |
134 |
-e '/^# maxmemory\>/s,^# ,,' \ |
135 |
-e '/^maxmemory\>/s,<bytes>,67108864,' \ |
136 |
-e "/^dbfilename\>/s,dump.rdb,${REDIS_DATAPATH}/dump.rdb," \ |
137 |
-e "/^dir\>/s, .*, ${REDIS_DATAPATH}/," \ |
138 |
-e '/^loglevel\>/s:(verbose|debug):notice:' \ |
139 |
-e "/^logfile\>/s:stdout:${REDIS_LOGFILE}:" \ |
140 |
<redis.conf \ |
141 |
>redis.conf.gentoo |
142 |
newins redis.conf.gentoo redis.conf |
143 |
use prefix || fowners redis:redis /etc/redis.conf |
144 |
fperms 0644 /etc/redis.conf |
145 |
|
146 |
newconfd "${FILESDIR}/redis.confd" redis |
147 |
newinitd "${FILESDIR}/redis.initd" redis |
148 |
|
149 |
nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING README |
150 |
|
151 |
dobin src/redis-cli |
152 |
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump |
153 |
fperms 0750 /usr/sbin/redis-benchmark |
154 |
|
155 |
if use prefix; then |
156 |
diropts -m0750 |
157 |
else |
158 |
diropts -m0750 -o redis -g redis |
159 |
fi |
160 |
keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} |
161 |
} |