New version

(Portage version: 2.1.10.10/cvs/Linux x86_64)

3 files changed, 171 insertions, 1 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 88bb9f85582b..dd061a9cb83a 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -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.21 2011/07/04 08:17:29 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.22 2011/08/14 12:32:55 lu_zero Exp $
+
+*redis-2.2.12 (14 Aug 2011)
+
+  14 Aug 2011; Luca Barbato <lu_zero@gentoo.org> +redis-2.2.12.ebuild,
+  +files/redis-2.2-as-needed.patch:
+  New version
 
 *redis-2.2.11 (04 Jul 2011)
 
diff --git a/dev-db/redis/files/redis-2.2-as-needed.patch b/dev-db/redis/files/redis-2.2-as-needed.patch
new file mode 100644
index 000000000000..d40cf0dbae6c
--- /dev/null
+++ b/dev-db/redis/files/redis-2.2-as-needed.patch
@@ -0,0 +1,53 @@
+From e1f01c9b28751d71ba0df682fb0f6b62f4db9191 Mon Sep 17 00:00:00 2001
+From: Pieter Noordhuis <pcnoordhuis@gmail.com>
+Date: Thu, 28 Jul 2011 10:38:11 +0200
+Subject: [PATCH] Fix link order for ld --as-needed (thanks to Nigel Babu)
+
+---
+ src/Makefile |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 67b0972..f2bbfac 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -32,7 +32,7 @@ ifeq ($(USE_TCMALLOC),yes)
+   CCLINK+= -ltcmalloc
+   CFLAGS+= -DUSE_TCMALLOC
+ endif
+-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
++CCOPT= $(CFLAGS) $(ARCH) $(PROF)
+ 
+ PREFIX= /usr/local
+ INSTALL_BIN= $(PREFIX)/bin
+@@ -130,12 +130,12 @@ dependencies:
+ 	cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
+ 
+ redis-server: $(OBJ)
+-	$(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
++	$(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(CCLINK)
+ 
+ redis-benchmark: dependencies $(BENCHOBJ)
+ 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR)
+ 	cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)"
+-	$(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a
++	$(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a $(CCLINK)
+ 
+ redis-benchmark.o:
+ 	$(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
+@@ -147,10 +147,10 @@ redis-cli.o:
+ 	$(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis -I../deps/linenoise $(DEBUG) $(COMPILE_TIME) $<
+ 
+ redis-check-dump: $(CHECKDUMPOBJ)
+-	$(QUIET_LINK)$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
++	$(QUIET_LINK)$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ) $(CCLINK)
+ 
+ redis-check-aof: $(CHECKAOFOBJ)
+-	$(QUIET_LINK)$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ)
++	$(QUIET_LINK)$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) $(CCLINK)
+ 
+ .c.o:
+ 	$(QUIET_CC)$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
+-- 
+1.7.6
+
diff --git a/dev-db/redis/redis-2.2.12.ebuild b/dev-db/redis/redis-2.2.12.ebuild
new file mode 100644
index 000000000000..ebd7c2850cae
--- /dev/null
+++ b/dev-db/redis/redis-2.2.12.ebuild
@@ -0,0 +1,111 @@
+# 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.2.12.ebuild,v 1.1 2011/08/14 12:32:55 lu_zero Exp $
+
+EAPI="2"
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A persistent caching system, key-value and data structures database."
+HOMEPAGE="http://code.google.com/p/redis/"
+SRC_URI="http://redis.googlecode.com/files/${PN}-${PV/_/-}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris"
+IUSE="tcmalloc test"
+SLOT="0"
+
+RDEPEND=""
+DEPEND=">=sys-devel/autoconf-2.63
+	tcmalloc? ( dev-util/google-perftools )
+	test? ( dev-lang/tcl )
+	${RDEPEND}"
+
+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 || die "problem adding 'redis' group"
+	enewuser redis 75 -1 ${REDIS_DATAPATH} redis || die "problem adding 'redis' user"
+	# set tcmalloc-variable for the build as specified in
+	# https://github.com/antirez/redis/blob/2.2/README. If build system gets
+	# better integrated into autotools, replace with append-flags and
+	# append-ldflags in src_configure()
+	use tcmalloc && export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.2-as-needed.patch"
+	# 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
+
+	dodoc 00-RELEASENOTES BUGS Changelog CONTRIBUTING README TODO
+	dodoc design-documents/*
+	newdoc client-libraries/README README.client-libraries
+	docinto html
+	dodoc doc/*
+
+	dobin src/redis-cli || die "redis-cli could not be found"
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump \
+	|| die "some redis executables could not be found"
+	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} ${REDIS_PIDDIR}
+}
+
+pkg_postinst() {
+	einfo "New features of Redis you want to consider enabling in redis.conf:"
+	einfo " * unix sockets (using this is highly recommended)"
+	einfo " * logging to syslog"
+	einfo " * VM aka redis' own swap mechanism"
+}