From: "Dirkjan Ochtman (djc)" <djc@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/redis: ChangeLog redis-2.4.4-r1.ebuild
Date: Thu, 1 Dec 2011 10:45:31 +0000 (UTC) [thread overview]
Message-ID: <20111201104531.901432004B@flycatcher.gentoo.org> (raw)
djc 11/12/01 10:45:31
Modified: ChangeLog
Added: redis-2.4.4-r1.ebuild
Log:
Clean up for EAPI=4, fix initd script (thanks jbergstroem).
(Portage version: 2.1.10.39/cvs/Linux x86_64)
Revision Changes Path
1.29 dev-db/redis/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?r1=1.28&r2=1.29
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog 30 Nov 2011 12:14:20 -0000 1.28
+++ ChangeLog 1 Dec 2011 10:45:31 -0000 1.29
@@ -1,6 +1,12 @@
# ChangeLog for dev-db/redis
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.28 2011/11/30 12:14:20 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.29 2011/12/01 10:45:31 djc Exp $
+
+*redis-2.4.4-r1 (01 Dec 2011)
+
+ 01 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> +redis-2.4.4-r1.ebuild,
+ files/redis.initd:
+ Clean up for EAPI=4, fix initd script (thanks jbergstroem).
30 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> -redis-2.2.2.ebuild,
-redis-2.2.6.ebuild, -redis-2.2.8.ebuild, -redis-2.2.11.ebuild:
1.1 dev-db/redis/redis-2.4.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.4.4-r1.ebuild?rev=1.1&view=markup
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
Index: redis-2.4.4-r1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $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 $
EAPI="4"
inherit autotools eutils flag-o-matic
DESCRIPTION="A persistent caching system, key-value and data structures database."
HOMEPAGE="http://redis.io/"
SRC_URI="http://redis.googlecode.com/files/${P}.tar.gz"
LICENSE="BSD"
KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris"
IUSE="+jemalloc tcmalloc test"
SLOT="0"
RDEPEND=""
DEPEND=">=sys-devel/autoconf-2.63
tcmalloc? ( dev-util/google-perftools )
jemalloc? ( dev-libs/jemalloc )
test? ( dev-lang/tcl )
${RDEPEND}"
REQUIRED_USE="tcmalloc? ( !jemalloc )
jemalloc? ( !tcmalloc )"
S="${WORKDIR}/${PN}-${PV/_/-}"
REDIS_PIDDIR=/var/run/redis/
REDIS_PIDFILE=${REDIS_PIDDIR}/redis.pid
REDIS_DATAPATH=/var/lib/redis
REDIS_LOGPATH=/var/log/redis
REDIS_LOGFILE=${REDIS_LOGPATH}/redis.log
pkg_setup() {
enewgroup redis 75
enewuser redis 75 -1 ${REDIS_DATAPATH} redis
if use tcmalloc ; then
export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes"
elif use jemalloc ; then
export EXTRA_EMAKE="${EXTRA_EMAKE} JEMALLOC_SHARED=yes"
else
export EXTRA_EMAKE="${EXTRA_EMAKE} FORCE_LIBC_MALLOC=yes"
fi
}
src_prepare() {
epatch "${FILESDIR}/redis-2.4.3-shared.patch"
epatch "${FILESDIR}/${P}-tcmalloc.patch"
if use jemalloc ; then
sed -i -e "s/je_/j/" src/zmalloc.c
fi
# now we will rewrite present Makefiles
local makefiles=""
for MKF in $(find -name 'Makefile' | cut -b 3-); do
mv "${MKF}" "${MKF}.in"
sed -i -e 's:$(CC):@CC@:g' \
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-e 's: $(DEBUG)::g' \
-e 's:$(OBJARCH)::g' \
-e 's:ARCH:TARCH:g' \
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
"${MKF}.in" \
|| die "Sed failed for ${MKF}"
makefiles+=" ${MKF}"
done
# autodetection of compiler and settings; generates the modified Makefiles
cp "${FILESDIR}"/configure.ac-2.2 configure.ac
sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
configure.ac || die "Sed failed for configure.ac"
eautoconf
}
src_install() {
# configuration file rewrites
insinto /etc/
sed -r \
-e "/^pidfile\>/s,/var.*,${REDIS_PIDFILE}," \
-e '/^daemonize\>/s,no,yes,' \
-e '/^# bind/s,^# ,,' \
-e '/^# maxmemory\>/s,^# ,,' \
-e '/^maxmemory\>/s,<bytes>,67108864,' \
-e "/^dbfilename\>/s,dump.rdb,${REDIS_DATAPATH}/dump.rdb," \
-e "/^dir\>/s, .*, ${REDIS_DATAPATH}/," \
-e '/^loglevel\>/s:debug:notice:' \
-e "/^logfile\>/s:stdout:${REDIS_LOGFILE}:" \
<redis.conf \
>redis.conf.gentoo
newins redis.conf.gentoo redis.conf
use prefix || fowners redis:redis /etc/redis.conf
fperms 0644 /etc/redis.conf
newconfd "${FILESDIR}/redis.confd" redis
newinitd "${FILESDIR}/redis.initd" redis
nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING README TODO
dobin src/redis-cli
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
fperms 0750 /usr/sbin/redis-benchmark
if use prefix; then
diropts -m0750
else
diropts -m0750 -o redis -g redis
fi
keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH}
}
next reply other threads:[~2011-12-01 10:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-01 10:45 Dirkjan Ochtman (djc) [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-02-16 13:27 [gentoo-commits] gentoo-x86 commit in dev-db/redis: ChangeLog redis-2.4.4-r1.ebuild Agostino Sarubbo (ago)
2012-04-09 12:12 Markus Meier (maekke)
2012-09-30 13:18 Dirkjan Ochtman (djc)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111201104531.901432004B@flycatcher.gentoo.org \
--to=djc@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox