Version bump redis to 2.2.11 (bug 373591).

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

3 files changed, 125 insertions, 6 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 03b7f57e0bf5..88bb9f85582b 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.20 2011/06/12 13:51:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.21 2011/07/04 08:17:29 djc Exp $
+
+*redis-2.2.11 (04 Jul 2011)
+
+  04 Jul 2011; Dirkjan Ochtman <djc@gentoo.org> +redis-2.2.11.ebuild:
+  Version bump to 2.2.11, add doc use flag (bug 373591).
 
   12 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> redis-2.2.6.ebuild:
   x86 stable wrt bug #370241
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index f62cb349368d..ceb0fa271108 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX configure.ac-2.2 1522 RMD160 76faaedfd1debd7e10d9a7a15a8ca845a7c4dad8 SHA1 baa5e21f7b90a35811e05560278ad233fa049178 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f
 AUX redis.confd 450 RMD160 237a72f30b3ba5c77e7dd31d2dfebc2db2cea2ad SHA1 4c298810900f0e627cd3f7bf480feb639b6cc2d5 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b
 AUX redis.initd 859 RMD160 a5718f3b4eab11450223c21bc98ab75d408e932e SHA1 ba3237364dba1da920ec4f14c13ff2cd45062144 SHA256 8b25b60bca695a8393e381078b2a42330c1b6cc2953bbe3c1b7cbd41ca36fe5d
+DIST redis-2.2.11.tar.gz 450839 RMD160 b5c1802395a0c375e5e9c0702e7086b83989d0ed SHA1 ba4b513c5bf7a28b2e50bbd1ca51bb7962e5685c SHA256 a94c1dd2573e19f1abd335507d5ea280753b092ddf16d014dcd3212f5a5bc0eb
 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
 DIST redis-2.2.8.tar.gz 448877 RMD160 91c95512ecd2b83834bbe4ebd562ae7fc4699599 SHA1 30fb67ed71c179a7294d06d2c83c9b074a98fb79 SHA256 d438fde47fd8a34d8b135744a4264214274e57bc7f132d0cf4ee4e98a6551bb3
+EBUILD redis-2.2.11.ebuild 3540 RMD160 c142951cb4327d0e23adc2cd02e8bfa757c0c18d SHA1 4de59ea97aa308859ca0235dea9289a35ee42d68 SHA256 b05d66884775b54f19e8d1cd8fe40b7da5f3b535d2f4c6d9b3352d16488c71e1
 EBUILD redis-2.2.2.ebuild 3514 RMD160 d6b4ec017fd6befb6f14cf6fe569fbd476961225 SHA1 d3be9363fdc9acb64c39cdd39aac79073aaeca64 SHA256 06dc29f84635803dbbfcb4961c646d3a7f1fdec2a57647dc5aa3246c469e5e45
 EBUILD redis-2.2.6.ebuild 3514 RMD160 09a2f6087b49f3d942e500772d8ac10aa98565dd SHA1 9b0b5b223e7a9d48cbb824569d7d09a43f5945b4 SHA256 7efefb3b4e9085c5ab05dcca637b53de96670c362a1d1ea9dd810270d91487f2
 EBUILD redis-2.2.8.ebuild 3509 RMD160 a7116ed0473d4d066deb4bcba4815ad1fd08b773 SHA1 4eef2a4c64593c9fceb5682e24a7349d34cf75f1 SHA256 899b63aab6e9d9968ab8f27c7c1078c93f7f86bc46c25a189f21be4b0fadf65f
-MISC ChangeLog 3102 RMD160 09fff7303d99e576a24ddfb575de3150c3ea2f7d SHA1 ed8ffcf0ae2fd9df959df056a325b8f3f9903c72 SHA256 0c85365d538d8b876ec68a065ed6b987e51353b057e8dd718166351688aded42
+MISC ChangeLog 3252 RMD160 e5ed4443ba956b3025b481114fe42a7278719cc9 SHA1 0e8861615050ef8b7ca4fa878686e6605182c287 SHA256 915a96c6abe07b8660f0137e4c8fcf9e863db729d244fe76197fca0a15bfe7d4
 MISC metadata.xml 553 RMD160 3be3be322cb813db7b6ca636b6fdca13a9a0483c SHA1 7d5dd7d39f782f4903052bc1f78a8baeff06460e SHA256 0533101247089bd059f8740d38b49a326307d60d0c6d66818ab552f3a65f0e34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk30xGsACgkQuUQtlDBCeQI0FwCeMqmzXJ+XXkGYIESZrv5Qfb5X
-HEkAn3Bosfr6V3j8bxu7TZR12xVqKEPI
-=eCQ8
+iEYEAREKAAYFAk4RdyMACgkQxeMuLWsGW/uz+wCgsFSESmDRynZpPElTGcdx/tn8
+V/gAn0ZvbtOYIE5vemY04miKQjzTBZWv
+=8ZWy
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.2.11.ebuild b/dev-db/redis/redis-2.2.11.ebuild
new file mode 100644
index 000000000000..e50df802f425
--- /dev/null
+++ b/dev-db/redis/redis-2.2.11.ebuild
@@ -0,0 +1,112 @@
+# 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.11.ebuild,v 1.1 2011/07/04 08:17:29 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="doc 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
+	if use doc; then
+		dodoc design-documents/*
+		newdoc client-libraries/README README.client-libraries
+		docinto html
+		dodoc doc/*
+	fi
+
+	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"
+}