Version bump redis to 2.2.6.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 122 insertions, 5 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index df38d02bf83b..9ccdfaca5e2c 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2011/05/06 07:00:22 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.15 2011/05/06 07:56:32 djc Exp $
+
+*redis-2.2.6 (06 May 2011)
+
+  06 May 2011; Dirkjan Ochtman <djc@gentoo.org> +redis-2.2.6.ebuild:
+  Version bump to 2.2.6.
 
   06 May 2011; Dirkjan Ochtman <djc@gentoo.org> -files/configure.ac-1.02:
   And one more.
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 0c37216db616..04ccc1b25b33 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -5,13 +5,15 @@ AUX configure.ac-2.2 1522 RMD160 76faaedfd1debd7e10d9a7a15a8ca845a7c4dad8 SHA1 b
 AUX redis.confd 450 RMD160 237a72f30b3ba5c77e7dd31d2dfebc2db2cea2ad SHA1 4c298810900f0e627cd3f7bf480feb639b6cc2d5 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b
 AUX redis.initd 859 RMD160 a5718f3b4eab11450223c21bc98ab75d408e932e SHA1 ba3237364dba1da920ec4f14c13ff2cd45062144 SHA256 8b25b60bca695a8393e381078b2a42330c1b6cc2953bbe3c1b7cbd41ca36fe5d
 DIST redis-2.2.2.tar.gz 446269 RMD160 a7a21ab6aa07f79e5cdeb991a26dd1d55446e38e SHA1 75b953e4a3067570555c5f3f5e8f481c40489904 SHA256 4c5ff589ec80bf019ebebcf5fb5187939d7e50c34fa9f8a0511e40825a3ec235
+DIST redis-2.2.6.tar.gz 447913 RMD160 76ddcd22ba31a7a9dd8a2fb7b465330c933a15c7 SHA1 dd5a5a443327da09483701c48b7ea87e5d160c69 SHA256 64ab9ec01792c50344b030e19dfc2453ff76822cf5845eb6da5654bc1ea09477
 EBUILD redis-2.2.2.ebuild 3513 RMD160 e1e9ff63d0b2867f3defd5ee66fcefaba8678da9 SHA1 c84630720c0c2ee44f74f4f938861f86b967cbf6 SHA256 2a8f29f0bcf2806f8c69ab6a7937923cd9c3c2343f025d975f794bb18ac605d4
-MISC ChangeLog 2411 RMD160 6771bf335a908a261e7edccd1825280e3ada6d2b SHA1 9bff3533025a3213adc6789fc23bb83de4188389 SHA256 be63fbc653b3a7ff2bd9752d585289b179408de9dca608284bcf25b7b21eae5a
+EBUILD redis-2.2.6.ebuild 3509 RMD160 083c83cffb25bfe735d4c15ea0bd06ae42300c27 SHA1 cb83e8afa3db8b802ed7623d8b2beda51bff0b60 SHA256 785f738f9f36434bc35d07ff5c280460e588c301b549e12ef879b0239de26de3
+MISC ChangeLog 2534 RMD160 0a06e880cabdf5da3cba20080efbddfe43414f04 SHA1 b60855ab039628a4cdae4f1867dd9311d897325f SHA256 7364545247ecec0f5dca487dc6d91b24a99d5b7e7d18eba45d03d8ca3f7351b8
 MISC metadata.xml 553 RMD160 3be3be322cb813db7b6ca636b6fdca13a9a0483c SHA1 7d5dd7d39f782f4903052bc1f78a8baeff06460e SHA256 0533101247089bd059f8740d38b49a326307d60d0c6d66818ab552f3a65f0e34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3DnI8ACgkQxeMuLWsGW/siYACghKCO9IE674xJ/gmjXLi3lE+l
-ZhwAoIb5+ctxIRq67OAYtocb77rK+ZI4
-=LUlK
+iEYEARECAAYFAk3DqboACgkQxeMuLWsGW/sEawCeIgoc9c0zSncRpQPMC5EbXpwv
+tg8An2BSQPTc4GZWiICyWHXOaHXo1nRq
+=weLL
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.2.6.ebuild b/dev-db/redis/redis-2.2.6.ebuild
new file mode 100644
index 000000000000..a9fa25363365
--- /dev/null
+++ b/dev-db/redis/redis-2.2.6.ebuild
@@ -0,0 +1,110 @@
+# 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.6.ebuild,v 1.1 2011/05/06 07:56:32 djc 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() {
+	# 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"
+}