| 1 |
mschiff 15/03/07 03:21:25 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: redis-2.8.19-r1.ebuild |
| 5 |
Removed: redis-2.8.19.ebuild |
| 6 |
Log: |
| 7 |
Fix init script pid file handling (Fixes #541856) and minor RDEPEND slot error. |
| 8 |
|
| 9 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.91 dev-db/redis/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.91&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.91&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?r1=1.90&r2=1.91 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v |
| 21 |
retrieving revision 1.90 |
| 22 |
retrieving revision 1.91 |
| 23 |
diff -u -r1.90 -r1.91 |
| 24 |
--- ChangeLog 28 Dec 2014 12:05:57 -0000 1.90 |
| 25 |
+++ ChangeLog 7 Mar 2015 03:21:24 -0000 1.91 |
| 26 |
@@ -1,6 +1,13 @@ |
| 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.90 2014/12/28 12:05:57 ago Exp $ |
| 30 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.91 2015/03/07 03:21:24 mschiff Exp $ |
| 32 |
+ |
| 33 |
+*redis-2.8.19-r1 (07 Mar 2015) |
| 34 |
+ |
| 35 |
+ 07 Mar 2015; Marc Schiffbauer <mschiff@g.o> +redis-2.8.19-r1.ebuild, |
| 36 |
+ -redis-2.8.19.ebuild, files/redis.initd-4: |
| 37 |
+ Fix init script pid file handling (Fixes #541856) and minor RDEPEND slot |
| 38 |
+ error. |
| 39 |
|
| 40 |
28 Dec 2014; Agostino Sarubbo <ago@g.o> redis-2.8.17-r1.ebuild: |
| 41 |
Stable for x86, wrt bug #528312 |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.1 dev-db/redis/redis-2.8.19-r1.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.8.19-r1.ebuild?rev=1.1&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.8.19-r1.ebuild?rev=1.1&content-type=text/plain |
| 49 |
|
| 50 |
Index: redis-2.8.19-r1.ebuild |
| 51 |
=================================================================== |
| 52 |
# Copyright 1999-2015 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.8.19-r1.ebuild,v 1.1 2015/03/07 03:21:24 mschiff Exp $ |
| 55 |
|
| 56 |
EAPI=5 |
| 57 |
|
| 58 |
inherit autotools eutils flag-o-matic systemd toolchain-funcs user |
| 59 |
|
| 60 |
DESCRIPTION="A persistent caching system, key-value and data structures database" |
| 61 |
HOMEPAGE="http://redis.io/" |
| 62 |
SRC_URI="http://download.redis.io/releases/${P}.tar.gz" |
| 63 |
|
| 64 |
LICENSE="BSD" |
| 65 |
KEYWORDS="~amd64 ~amd64-linux ~hppa ~x86 ~x86-linux ~x86-macos ~x86-solaris" |
| 66 |
IUSE="+jemalloc tcmalloc test" |
| 67 |
SLOT="0" |
| 68 |
|
| 69 |
RDEPEND=">=dev-lang/lua-5.1:* |
| 70 |
tcmalloc? ( dev-util/google-perftools ) |
| 71 |
jemalloc? ( >=dev-libs/jemalloc-3.2 )" |
| 72 |
DEPEND="virtual/pkgconfig |
| 73 |
>=sys-devel/autoconf-2.63 |
| 74 |
test? ( dev-lang/tcl ) |
| 75 |
${RDEPEND}" |
| 76 |
REQUIRED_USE="?? ( tcmalloc jemalloc )" |
| 77 |
|
| 78 |
S="${WORKDIR}/${PN}-${PV/_/-}" |
| 79 |
|
| 80 |
pkg_setup() { |
| 81 |
enewgroup redis 75 |
| 82 |
enewuser redis 75 -1 /var/lib/redis redis |
| 83 |
} |
| 84 |
|
| 85 |
src_prepare() { |
| 86 |
epatch "${FILESDIR}"/${PN}-2.8.3-shared.patch |
| 87 |
epatch "${FILESDIR}"/${PN}-2.8.17-config.patch |
| 88 |
epatch "${FILESDIR}"/${P}-sharedlua.patch |
| 89 |
|
| 90 |
# Copy lua modules into build dir |
| 91 |
cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die |
| 92 |
cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die |
| 93 |
# Append cflag for lua_cjson |
| 94 |
# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 |
| 95 |
append-cflags "-DENABLE_CJSON_GLOBAL" |
| 96 |
|
| 97 |
# Avoid glibc noise |
| 98 |
# https://github.com/antirez/redis/pull/2189 |
| 99 |
[[ ${CHOST} == *linux* ]] && append-cflags "-D_DEFAULT_SOURCE" |
| 100 |
|
| 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_configure() { |
| 123 |
econf |
| 124 |
|
| 125 |
# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 |
| 126 |
# also, don't define ANSI/c99 for lua twice |
| 127 |
sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die |
| 128 |
} |
| 129 |
|
| 130 |
src_compile() { |
| 131 |
tc-export CC AR RANLIB |
| 132 |
|
| 133 |
local myconf="" |
| 134 |
|
| 135 |
if use tcmalloc ; then |
| 136 |
myconf="${myconf} USE_TCMALLOC=yes" |
| 137 |
elif use jemalloc ; then |
| 138 |
myconf="${myconf} JEMALLOC_SHARED=yes" |
| 139 |
else |
| 140 |
myconf="${myconf} MALLOC=yes" |
| 141 |
fi |
| 142 |
|
| 143 |
emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" |
| 144 |
} |
| 145 |
|
| 146 |
src_install() { |
| 147 |
insinto /etc/ |
| 148 |
doins redis.conf sentinel.conf |
| 149 |
use prefix || fowners redis:redis /etc/{redis,sentinel}.conf |
| 150 |
fperms 0644 /etc/{redis,sentinel}.conf |
| 151 |
|
| 152 |
newconfd "${FILESDIR}/redis.confd" redis |
| 153 |
newinitd "${FILESDIR}/redis.initd-4" redis |
| 154 |
|
| 155 |
systemd_dounit "${FILESDIR}/redis.service" |
| 156 |
systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf |
| 157 |
|
| 158 |
nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README |
| 159 |
|
| 160 |
dobin src/redis-cli |
| 161 |
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump |
| 162 |
fperms 0750 /usr/sbin/redis-benchmark |
| 163 |
dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel |
| 164 |
|
| 165 |
if use prefix; then |
| 166 |
diropts -m0750 |
| 167 |
else |
| 168 |
diropts -m0750 -o redis -g redis |
| 169 |
fi |
| 170 |
keepdir /var/{log,lib}/redis |
| 171 |
} |
Archives