Version bump redis to 2.2.2 (bug 360299).

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

3 files changed, 118 insertions, 12 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 0aa04e3aaa3f..b8d14ac9b2d7 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.10 2011/04/04 09:31:24 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.11 2011/04/04 11:31:42 djc Exp $
+
+*redis-2.2.2 (04 Apr 2011)
+
+  04 Apr 2011; Dirkjan Ochtman <djc@gentoo.org> +redis-2.2.2.ebuild:
+  Version bump to 2.2.2.
 
   04 Apr 2011; Dirkjan Ochtman <djc@gentoo.org> -redis-1.2.5.ebuild:
   Remove old version.
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 02eefa3378e6..29feed7e4827 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 01-dont-print-pid-on-startup.diff 647 RMD160 ad9fcf603a37ebe6fe1c6028b64cd40bb7ed748c SHA1 630e3c656a9e0dfa507272716a24e5ed86a33947 SHA256 d0a048cf4cd0d342404cfe7af23aecb7b04975eb7336052d645303b09b30b758
 AUX configure.ac-1.02 1496 RMD160 41e3f453f993020ce6477392fed18261c199a9a5 SHA1 bbf22e3d8aff6cb9745d6316c6ba6c64bca96865 SHA256 16d546fc036e2ef8a020e3b042ff2c49b13a0dcddc6de1046c9dac039af0e877
 AUX configure.ac-2.2 1522 RMD160 76faaedfd1debd7e10d9a7a15a8ca845a7c4dad8 SHA1 baa5e21f7b90a35811e05560278ad233fa049178 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f
@@ -8,14 +5,9 @@ AUX redis.confd 450 RMD160 237a72f30b3ba5c77e7dd31d2dfebc2db2cea2ad SHA1 4c29881
 AUX redis.initd 859 RMD160 a5718f3b4eab11450223c21bc98ab75d408e932e SHA1 ba3237364dba1da920ec4f14c13ff2cd45062144 SHA256 8b25b60bca695a8393e381078b2a42330c1b6cc2953bbe3c1b7cbd41ca36fe5d
 DIST redis-1.2.6.tar.gz 213341 RMD160 a7195e4f9ba1f7b0b3466fad4ccc28a6659db8c0 SHA1 c71aef0b3f31acb66353d86ba57dd321b541043f SHA256 bed0641225f786f225a2c4897ffbec1e6573a3c31e9f899884ee3041eab96873
 DIST redis-2.2.0-rc4.tar.gz 445431 RMD160 3df1c4d866b3af1f90ce7d299f5132d83dee5627 SHA1 f4cd8e1b7dee04f1e9f07a1dcef8a09d190002a0 SHA256 5f3398c0b6d8e01132ea07f2b3143193db0a1e4dc8408cc5bd789a1e97cffc85
+DIST redis-2.2.2.tar.gz 446269 RMD160 a7a21ab6aa07f79e5cdeb991a26dd1d55446e38e SHA1 75b953e4a3067570555c5f3f5e8f481c40489904 SHA256 4c5ff589ec80bf019ebebcf5fb5187939d7e50c34fa9f8a0511e40825a3ec235
 EBUILD redis-1.2.6.ebuild 3424 RMD160 73b93a1a26b70e3c1d57dc7d2706237f03bae5e8 SHA1 8ac89e4e53986b2285c3d1017f75b764f2d699da SHA256 a4bba1ac854ebb4ac6829f0883882fa57eda01b3b8ad67de6ad19413eb5547c2
 EBUILD redis-2.2.0_rc4.ebuild 3501 RMD160 50b016fe6b7682064d9b2f93a45722e6e8064d4a SHA1 bea5115398a6ece1a366a36748d9f737b7b02253 SHA256 c285acbd52122c00e1b01ab4b568fab3dcf549d4434cedc6695711cd7a83f039
-MISC ChangeLog 1891 RMD160 d30e91009bc5058e85be232fb14a43c64a772474 SHA1 21ecbc4b832528817c7722c99a8dec06ed3a63a1 SHA256 14fb68bea858a038548d7606f7f4489aeeb96187dcb44a47ef2b05a0064fb32b
+EBUILD redis-2.2.2.ebuild 3470 RMD160 a2dccf18f5ac38e12cb00f373b758371cdd518d6 SHA1 7af6db192ddd7271caa049e81f0e9c927eea132e SHA256 1f72b6834d3b8d202fc3d603720cdbdb84e5792776c1fc8a02f57a2ed6a5564b
+MISC ChangeLog 2014 RMD160 5b5d2ead61fc890462fc17252eddcc072c5d07e4 SHA1 367133ddc4ac1caa7f2a6ce888869f78c2159dec SHA256 25603c30bf58aea15f9d2e481b9bcca871a0fa0d8f53626aafe07f57f44397eb
 MISC metadata.xml 553 RMD160 3be3be322cb813db7b6ca636b6fdca13a9a0483c SHA1 7d5dd7d39f782f4903052bc1f78a8baeff06460e SHA256 0533101247089bd059f8740d38b49a326307d60d0c6d66818ab552f3a65f0e34
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2Zj/UACgkQxeMuLWsGW/sSWgCfbPkBjNGIqeLZE+6Oe+1AdvQ7
-fooAnAwDD/EY60fhGEgLpAvpxY5xw/lU
-=R/Ye
------END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.2.2.ebuild b/dev-db/redis/redis-2.2.2.ebuild
new file mode 100644
index 000000000000..8824520da6e2
--- /dev/null
+++ b/dev-db/redis/redis-2.2.2.ebuild
@@ -0,0 +1,109 @@
+# 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.2.ebuild,v 1.1 2011/04/04 11:31:42 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"
+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: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"
+}