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