diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-10-08 05:15:35 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-10-08 05:15:35 +0000 |
| commit | 7f6b663d473f7c521aed16659535d88ffe619e72 (patch) | |
| tree | f6aee78a425f9dfc9e15472bc6c4fa2511501d3d /dev-db | |
| parent | Drop alpha keywords (diff) | |
| download | gentoo-2-7f6b663d473f7c521aed16659535d88ffe619e72.tar.gz gentoo-2-7f6b663d473f7c521aed16659535d88ffe619e72.tar.bz2 gentoo-2-7f6b663d473f7c521aed16659535d88ffe619e72.zip | |
Fix verbosity issue per bus #428722 and EMAKE_EXTRA bug #437344.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/redis/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-db/redis/redis-2.4.17.ebuild | 31 |
2 files changed, 23 insertions, 13 deletions
diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog index 217c724c00e9..d71a127b3e61 100644 --- a/dev-db/redis/ChangeLog +++ b/dev-db/redis/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-db/redis # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.51 2012/09/30 13:18:59 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.52 2012/10/08 05:15:35 robbat2 Exp $ + + 08 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> redis-2.4.17.ebuild: + Fix verbosity issue per bus #428722 and EMAKE_EXTRA bug #437344. 30 Sep 2012; Dirkjan Ochtman <djc@gentoo.org> -redis-2.4.4-r1.ebuild: Remove another old version. diff --git a/dev-db/redis/redis-2.4.17.ebuild b/dev-db/redis/redis-2.4.17.ebuild index 858877239ed9..998db06a9b15 100644 --- a/dev-db/redis/redis-2.4.17.ebuild +++ b/dev-db/redis/redis-2.4.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.17.ebuild,v 1.1 2012/09/30 12:16:12 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.17.ebuild,v 1.2 2012/10/08 05:15:34 robbat2 Exp $ EAPI="4" @@ -34,13 +34,6 @@ 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() { @@ -70,6 +63,20 @@ src_prepare() { eautoconf } +src_compile() { + local myconf="" + + if use tcmalloc ; then + myconf="${myconf} USE_TCMALLOC=yes" + elif use jemalloc ; then + myconf="${myconf} JEMALLOC_SHARED=yes" + else + myconf="${myconf} FORCE_LIBC_MALLOC=yes" + fi + + emake ${myconf} +} + src_install() { # configuration file rewrites insinto /etc/ @@ -81,7 +88,7 @@ src_install() { -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 '/^loglevel\>/s:(verbose|debug):notice:' \ -e "/^logfile\>/s:stdout:${REDIS_LOGFILE}:" \ <redis.conf \ >redis.conf.gentoo @@ -92,16 +99,16 @@ src_install() { newconfd "${FILESDIR}/redis.confd" redis newinitd "${FILESDIR}/redis.initd" redis - nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING README TODO + nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING README 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 + diropts -m0750 else - diropts -m0750 -o redis -g redis + diropts -m0750 -o redis -g redis fi keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} } |