Gentoo Archives: gentoo-commits

From: "Alexys Jacob (ultrabug)" <ultrabug@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/redis: redis-2.8.8.ebuild ChangeLog
Date: Mon, 31 Mar 2014 09:25:10
Message-Id: 20140331092504.C4C5B2005C@flycatcher.gentoo.org
1 ultrabug 14/03/31 09:25:04
2
3 Modified: ChangeLog
4 Added: redis-2.8.8.ebuild
5 Log:
6 version bump fix #505818 thx to Johan Bergstrom
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
9
10 Revision Changes Path
11 1.78 dev-db/redis/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.78&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.78&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?r1=1.77&r2=1.78
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v
20 retrieving revision 1.77
21 retrieving revision 1.78
22 diff -u -r1.77 -r1.78
23 --- ChangeLog 31 Mar 2014 07:19:36 -0000 1.77
24 +++ ChangeLog 31 Mar 2014 09:25:04 -0000 1.78
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-db/redis
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.77 2014/03/31 07:19:36 djc Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.78 2014/03/31 09:25:04 ultrabug Exp $
30 +
31 +*redis-2.8.8 (31 Mar 2014)
32 +
33 + 31 Mar 2014; Ultrabug <ultrabug@g.o> +redis-2.8.8.ebuild:
34 + version bump fix #505818 thx to Johan Bergström
35
36 31 Mar 2014; Dirkjan Ochtman <djc@g.o> metadata.xml:
37 Remove myself from maintainers.
38
39
40
41 1.1 dev-db/redis/redis-2.8.8.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.8.8.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.8.8.ebuild?rev=1.1&content-type=text/plain
45
46 Index: redis-2.8.8.ebuild
47 ===================================================================
48 # Copyright 1999-2014 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.8.8.ebuild,v 1.1 2014/03/31 09:25:04 ultrabug Exp $
51
52 EAPI=5
53
54 inherit autotools eutils flag-o-matic systemd toolchain-funcs user
55
56 DESCRIPTION="A persistent caching system, key-value and data structures database."
57 HOMEPAGE="http://redis.io/"
58 SRC_URI="http://download.redis.io/releases/${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.2 )"
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 pkg_setup() {
76 enewgroup redis 75
77 enewuser redis 75 -1 /var/lib/redis redis
78 }
79
80 src_prepare() {
81 epatch "${FILESDIR}"/${PN}-2.8.3-{shared,config}.patch
82
83 # bug 467172, 467174
84 sed -i -e 's:AR=:AR?=:g' -e 's:RANLIB=:RANLIB?=:g' "${S}/deps/lua/src/Makefile" || die
85
86 # now we will rewrite present Makefiles
87 local makefiles=""
88 for MKF in $(find -name 'Makefile' | cut -b 3-); do
89 mv "${MKF}" "${MKF}.in"
90 sed -i -e 's:$(CC):@CC@:g' \
91 -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
92 -e 's: $(DEBUG)::g' \
93 -e 's:$(OBJARCH)::g' \
94 -e 's:ARCH:TARCH:g' \
95 -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
96 "${MKF}.in" \
97 || die "Sed failed for ${MKF}"
98 makefiles+=" ${MKF}"
99 done
100 # autodetection of compiler and settings; generates the modified Makefiles
101 cp "${FILESDIR}"/configure.ac-2.2 configure.ac
102 sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
103 configure.ac || die "Sed failed for configure.ac"
104 eautoconf
105 }
106
107 src_configure() {
108 econf
109
110 # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
111 # also, don't define ANSI/c99 for lua twice
112 sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
113 }
114
115 src_compile() {
116 tc-export CC AR RANLIB
117
118 local myconf=""
119
120 if use tcmalloc ; then
121 myconf="${myconf} USE_TCMALLOC=yes"
122 elif use jemalloc ; then
123 myconf="${myconf} JEMALLOC_SHARED=yes"
124 else
125 myconf="${myconf} MALLOC=yes"
126 fi
127
128 emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
129 }
130
131 src_install() {
132 insinto /etc/
133 doins redis.conf sentinel.conf
134 use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
135 fperms 0644 /etc/{redis,sentinel}.conf
136
137 newconfd "${FILESDIR}/redis.confd" redis
138 newinitd "${FILESDIR}/redis.initd-3" redis
139
140 systemd_dounit "${FILESDIR}/redis.service"
141 systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
142
143 nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
144
145 dobin src/redis-cli
146 dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
147 fperms 0750 /usr/sbin/redis-benchmark
148 dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
149
150 if use prefix; then
151 diropts -m0750
152 else
153 diropts -m0750 -o redis -g redis
154 fi
155 keepdir /var/{log,lib}/redis
156 }