Version bump redis to 2.4.14.

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

3 files changed, 120 insertions, 5 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index f9f59ceceb95..3cc45d94948f 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,11 @@
 # 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.43 2012/05/31 07:50:06 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.44 2012/05/31 07:54:28 djc Exp $
+
+*redis-2.4.14 (31 May 2012)
+
+  31 May 2012; Dirkjan Ochtman <djc@gentoo.org> +redis-2.4.14.ebuild:
+  Version bump to 2.4.14 for bug 417449 (thanks to jbergstroem).
 
   31 May 2012; Dirkjan Ochtman <djc@gentoo.org> -redis-2.2.12.ebuild,
   -files/redis-2.2-as-needed.patch, -redis-2.4.7.ebuild, -redis-2.4.8.ebuild:
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 8915ca646e24..718bf98dd128 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -8,16 +8,18 @@ AUX redis.confd 450 RMD160 237a72f30b3ba5c77e7dd31d2dfebc2db2cea2ad SHA1 4c29881
 AUX redis.initd 950 RMD160 d918ff0800f923db849dad0318ef96a2a96381f4 SHA1 7c7b3d80f14ac31b2545c2eff1f7d19adb32e6de SHA256 af87676776b658db1ca1fe87fb4f8d2e2360bae3196543b19f42654d25f6b50d
 DIST redis-2.4.10.tar.gz 621824 RMD160 1dc59ff4390b5459ce80d803cbadc3128d239d73 SHA1 fceecc25a332db77cb94d16a3d9a337156600556 SHA256 4d34482198cec272afd45d0390d4e1f32ee847094834133613a925012810ed21
 DIST redis-2.4.13.tar.gz 625464 RMD160 f1c87719627114efcfc64aeb842d1d925f2fd52f SHA1 212128b1c7cc0021beb3dae38b7fe957d6743f3b SHA256 b6e057b6b5cd5946f8b46b2427401400686ed4f6c4af446eb1f0ec170d3f87be
+DIST redis-2.4.14.tar.gz 627494 RMD160 eedc6f2546e8a03b02f78a48a041cec0c683b62c SHA1 3f0a2ac2eef9319edb0d789d3553f77b2a3dc31d SHA256 4f26ae8cad0f9143ef30b9bb9565a1618570654eb86ee911c20966971660cc7e
 DIST redis-2.4.4.tar.gz 607718 RMD160 5b9e1e48216c11b3eca76ad0eafee3d7a0df0c68 SHA1 bc1e383c0216fe5bd5dc47eab39b43bbb9d5f8a5 SHA256 8cb779758315b89969adb588c813bf980e32a760d4204209d90d605dcbc5f708
 EBUILD redis-2.4.10.ebuild 3163 RMD160 9d9e3daa3f35dc458a814c7bad4c12dae8a77b56 SHA1 6683e5bd73dd512de08742819bf9cc3969672a2f SHA256 b3e239db0ac4e4fdd4957fb16a9801d091189a323908e079bb3365a360f42327
 EBUILD redis-2.4.13.ebuild 3158 RMD160 237f3e368791ccab6e763354e73543b2398024b4 SHA1 fb4e102126a80c3a7cbbb4c118af1e2c75743ede SHA256 237e64067aa091151128703f5bd6de74257545305e8ce893f2093fb44d86b975
+EBUILD redis-2.4.14.ebuild 3163 RMD160 694e863e71a40a21cd59b12c807c8d880b44fe4c SHA1 f7238f9d1c7cfd4a751faf29e6e05ee80df455e0 SHA256 f4fc685850c98a6afa580e255a078768bf3e42404aeaf5f58e675e9eb120338d
 EBUILD redis-2.4.4-r1.ebuild 3154 RMD160 c165072861811d513b00ef64affa96eb2f3bd7de SHA1 2f2eaa5f9b4e7d3fcce7c9817b73da69eeac15ab SHA256 d0a916e74183926a28e59d3ab475b475b2f50b8592fbc5678cd52901f1f56c5d
-MISC ChangeLog 6413 RMD160 411dff74d000ab3fa34ae8249c165528c185aba8 SHA1 a6c38ef02cd1d0a0182081df17f6d0ec3f1e4895 SHA256 8ce38786bb6d0ca612a535161ef5610a0e674b1937cf384a093452f10d00c0c8
+MISC ChangeLog 6578 RMD160 5a0a94065e77403173fbaa8064fdccaa0cd52456 SHA1 faba27f4a4e90b0e79020415ed6b7a26a53491af SHA256 0de25499b745d8aa03c197ffa1f32d0d555c481b88068811531f3be6dc43ccf4
 MISC metadata.xml 735 RMD160 c6ace3bb45b12ec4cdcbbd5449f136f8cde70f26 SHA1 bbb82688cdc6c0ed9fe9ec3e41185f64d989de99 SHA256 b631a82f963f69974818f516c543c56c9c8aee1a5010af3325bf648e64171bd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk/HIrsACgkQxeMuLWsGW/ulpACgt+mDS0LY2work7sR7I2TOnZM
-nUwAnR4SHwRlrA0yp6B70/GZj8DRpg0Q
-=ISmM
+iEYEAREKAAYFAk/HI70ACgkQxeMuLWsGW/tI8wCfaAVetCdLO2ZqeiN68BlP4uLr
+HHgAn0Om9vPTtx+LTd7heT+PwQSWoCPq
+=1Roh
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.4.14.ebuild b/dev-db/redis/redis-2.4.14.ebuild
new file mode 100644
index 000000000000..a2b0bd1605b1
--- /dev/null
+++ b/dev-db/redis/redis-2.4.14.ebuild
@@ -0,0 +1,108 @@
+# 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.14.ebuild,v 1.1 2012/05/31 07:54:28 djc Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A persistent caching system, key-value and data structures database."
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://redis.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc test"
+SLOT="0"
+
+RDEPEND=""
+DEPEND=">=sys-devel/autoconf-2.63
+	tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( <dev-libs/jemalloc-3.0 )
+	test? ( dev-lang/tcl )
+	${RDEPEND}"
+REQUIRED_USE="tcmalloc? ( !jemalloc )
+	jemalloc? ( !tcmalloc )"
+
+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
+	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() {
+	epatch "${FILESDIR}/redis-2.4.3-shared.patch"
+	epatch "${FILESDIR}/redis-2.4.4-tcmalloc.patch"
+	if use jemalloc ; then
+		sed -i -e "s/je_/j/" src/zmalloc.c
+	fi
+	# 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
+
+	nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING README TODO
+
+	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
+	else
+	        diropts -m0750 -o redis -g redis
+	fi
+	keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH}
+}