1 |
djc 11/12/01 10:45:31 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: redis-2.4.4-r1.ebuild |
5 |
Log: |
6 |
Clean up for EAPI=4, fix initd script (thanks jbergstroem). |
7 |
|
8 |
(Portage version: 2.1.10.39/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.29 dev-db/redis/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.29&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.29&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?r1=1.28&r2=1.29 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v |
20 |
retrieving revision 1.28 |
21 |
retrieving revision 1.29 |
22 |
diff -u -r1.28 -r1.29 |
23 |
--- ChangeLog 30 Nov 2011 12:14:20 -0000 1.28 |
24 |
+++ ChangeLog 1 Dec 2011 10:45:31 -0000 1.29 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for dev-db/redis |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.28 2011/11/30 12:14:20 djc Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.29 2011/12/01 10:45:31 djc Exp $ |
30 |
+ |
31 |
+*redis-2.4.4-r1 (01 Dec 2011) |
32 |
+ |
33 |
+ 01 Dec 2011; Dirkjan Ochtman <djc@g.o> +redis-2.4.4-r1.ebuild, |
34 |
+ files/redis.initd: |
35 |
+ Clean up for EAPI=4, fix initd script (thanks jbergstroem). |
36 |
|
37 |
30 Nov 2011; Dirkjan Ochtman <djc@g.o> -redis-2.2.2.ebuild, |
38 |
-redis-2.2.6.ebuild, -redis-2.2.8.ebuild, -redis-2.2.11.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.1 dev-db/redis/redis-2.4.4-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.4.4-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.4.4-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: redis-2.4.4-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2011 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.4.4-r1.ebuild,v 1.1 2011/12/01 10:45:31 djc Exp $ |
52 |
|
53 |
EAPI="4" |
54 |
|
55 |
inherit autotools eutils flag-o-matic |
56 |
|
57 |
DESCRIPTION="A persistent caching system, key-value and data structures database." |
58 |
HOMEPAGE="http://redis.io/" |
59 |
SRC_URI="http://redis.googlecode.com/files/${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="" |
67 |
DEPEND=">=sys-devel/autoconf-2.63 |
68 |
tcmalloc? ( dev-util/google-perftools ) |
69 |
jemalloc? ( dev-libs/jemalloc ) |
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 |
if use tcmalloc ; then |
87 |
export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes" |
88 |
elif use jemalloc ; then |
89 |
export EXTRA_EMAKE="${EXTRA_EMAKE} JEMALLOC_SHARED=yes" |
90 |
else |
91 |
export EXTRA_EMAKE="${EXTRA_EMAKE} FORCE_LIBC_MALLOC=yes" |
92 |
fi |
93 |
} |
94 |
|
95 |
src_prepare() { |
96 |
epatch "${FILESDIR}/redis-2.4.3-shared.patch" |
97 |
epatch "${FILESDIR}/${P}-tcmalloc.patch" |
98 |
if use jemalloc ; then |
99 |
sed -i -e "s/je_/j/" src/zmalloc.c |
100 |
fi |
101 |
# now we will rewrite present Makefiles |
102 |
local makefiles="" |
103 |
for MKF in $(find -name 'Makefile' | cut -b 3-); do |
104 |
mv "${MKF}" "${MKF}.in" |
105 |
sed -i -e 's:$(CC):@CC@:g' \ |
106 |
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \ |
107 |
-e 's: $(DEBUG)::g' \ |
108 |
-e 's:$(OBJARCH)::g' \ |
109 |
-e 's:ARCH:TARCH:g' \ |
110 |
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \ |
111 |
"${MKF}.in" \ |
112 |
|| die "Sed failed for ${MKF}" |
113 |
makefiles+=" ${MKF}" |
114 |
done |
115 |
# autodetection of compiler and settings; generates the modified Makefiles |
116 |
cp "${FILESDIR}"/configure.ac-2.2 configure.ac |
117 |
sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
118 |
configure.ac || die "Sed failed for configure.ac" |
119 |
eautoconf |
120 |
} |
121 |
|
122 |
src_install() { |
123 |
# configuration file rewrites |
124 |
insinto /etc/ |
125 |
sed -r \ |
126 |
-e "/^pidfile\>/s,/var.*,${REDIS_PIDFILE}," \ |
127 |
-e '/^daemonize\>/s,no,yes,' \ |
128 |
-e '/^# bind/s,^# ,,' \ |
129 |
-e '/^# maxmemory\>/s,^# ,,' \ |
130 |
-e '/^maxmemory\>/s,<bytes>,67108864,' \ |
131 |
-e "/^dbfilename\>/s,dump.rdb,${REDIS_DATAPATH}/dump.rdb," \ |
132 |
-e "/^dir\>/s, .*, ${REDIS_DATAPATH}/," \ |
133 |
-e '/^loglevel\>/s:debug:notice:' \ |
134 |
-e "/^logfile\>/s:stdout:${REDIS_LOGFILE}:" \ |
135 |
<redis.conf \ |
136 |
>redis.conf.gentoo |
137 |
newins redis.conf.gentoo redis.conf |
138 |
use prefix || fowners redis:redis /etc/redis.conf |
139 |
fperms 0644 /etc/redis.conf |
140 |
|
141 |
newconfd "${FILESDIR}/redis.confd" redis |
142 |
newinitd "${FILESDIR}/redis.initd" redis |
143 |
|
144 |
nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING README TODO |
145 |
|
146 |
dobin src/redis-cli |
147 |
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump |
148 |
fperms 0750 /usr/sbin/redis-benchmark |
149 |
|
150 |
if use prefix; then |
151 |
diropts -m0750 |
152 |
else |
153 |
diropts -m0750 -o redis -g redis |
154 |
fi |
155 |
keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} |
156 |
} |