Gentoo Archives: gentoo-commits

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