Version bump redis to 2.4.13 (bug 413357).

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

3 files changed, 121 insertions, 6 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 303271abb186..3e82434d8f6e 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.39 2012/04/09 12:12:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.40 2012/05/02 12:09:02 djc Exp $
+
+*redis-2.4.13 (02 May 2012)
+
+  02 May 2012; Dirkjan Ochtman <djc@gentoo.org> +redis-2.4.13.ebuild:
+  Version bump to 2.4.13 (bug 413357).
 
   09 Apr 2012; Markus Meier <maekke@gentoo.org> redis-2.4.4-r1.ebuild:
   x86 stable, bug #404083
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 2444c0e9f5df..18b783428db6 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX configure.ac-2.2 1522 RMD160 76faaedfd1debd7e10d9a7a15a8ca845a7c4dad8 SHA1 baa5e21f7b90a35811e05560278ad233fa049178 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f
 AUX redis-2.2-as-needed.patch 1994 RMD160 63810e94ec9f765b08ec12fb405fc769c704605d SHA1 eaf65b408468a60249b94fcd22110db51dabfe04 SHA256 be3b3f243dbc39ee8ac57bc77022f9866f4675a708ed2a33d5b76dc3289f8584
@@ -9,20 +9,22 @@ AUX redis.confd 450 RMD160 237a72f30b3ba5c77e7dd31d2dfebc2db2cea2ad SHA1 4c29881
 AUX redis.initd 950 RMD160 d918ff0800f923db849dad0318ef96a2a96381f4 SHA1 7c7b3d80f14ac31b2545c2eff1f7d19adb32e6de SHA256 af87676776b658db1ca1fe87fb4f8d2e2360bae3196543b19f42654d25f6b50d
 DIST redis-2.2.12.tar.gz 455240 RMD160 8bf1275fd1d2ad1536ce7081bdf3522d5e92a8d3 SHA1 66d44756e0f3371d9e37b521f5cc17e12e1efba3 SHA256 9e2a4133b920fc4eed731c9cd3a9d0b60e701179ea98b2944ab434e7b1d0db03
 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.4.tar.gz 607718 RMD160 5b9e1e48216c11b3eca76ad0eafee3d7a0df0c68 SHA1 bc1e383c0216fe5bd5dc47eab39b43bbb9d5f8a5 SHA256 8cb779758315b89969adb588c813bf980e32a760d4204209d90d605dcbc5f708
 DIST redis-2.4.7.tar.gz 611577 RMD160 586ffa4161d2697fd1249ed699f9f025d5e7e1a9 SHA1 cd0835f1076ad36797ed6543af187ac28a29953f SHA256 f91956377b7ff23cc23e0c8758e0b873032f36545c61d88436ebb741bf4dd5e1
 DIST redis-2.4.8.tar.gz 618164 RMD160 235d607326e57cb296178112c8073db8b473a3e6 SHA1 d050838530e2b77dc1724efd29e5367a4c5c1e18 SHA256 8166ca6ddea4bdb311510590a1ef94e3e32eed2fae44875a5b44fe72bda556f3
 EBUILD redis-2.2.12.ebuild 3484 RMD160 c87bbe611f1c786379e090da413bd39533294af2 SHA1 a0cce800e9a6c723a3855dfd554466ddcccf571b SHA256 5e75722290ea06302549d28735ec4e8c8048b4a94b1477f18b47181edc637e5a
 EBUILD redis-2.4.10.ebuild 3162 RMD160 303ea786ac17180e58eeb65673ce34d5aa3453f4 SHA1 e144b91d41a4828ecc960e27ea4b9b50d3abd642 SHA256 6b2e1cc4c359f430f4a18654c48056b073ca198a06552d869eac7ac7df5b396a
+EBUILD redis-2.4.13.ebuild 3158 RMD160 237f3e368791ccab6e763354e73543b2398024b4 SHA1 fb4e102126a80c3a7cbbb4c118af1e2c75743ede SHA256 237e64067aa091151128703f5bd6de74257545305e8ce893f2093fb44d86b975
 EBUILD redis-2.4.4-r1.ebuild 3154 RMD160 c165072861811d513b00ef64affa96eb2f3bd7de SHA1 2f2eaa5f9b4e7d3fcce7c9817b73da69eeac15ab SHA256 d0a916e74183926a28e59d3ab475b475b2f50b8592fbc5678cd52901f1f56c5d
 EBUILD redis-2.4.7.ebuild 3157 RMD160 e5941b887124063a8796f87559fdc2dd6c85c15f SHA1 6b456f77c9ba7d1a3571d60cf35b0b9c205bbb75 SHA256 22fbeecd793b366249b412e0a9f8d8e90976176c552ef847a8f6824fba83ca44
 EBUILD redis-2.4.8.ebuild 3157 RMD160 dec4204e41f850055ee0feceebec7e46996c5b9a SHA1 63e987f4c0a8551d6f048ca0164002c95fb6097d SHA256 1a317e32444b1be2bf367d18239f1780ba850dad2c4437feb5a2273c4b15f872
-MISC ChangeLog 5892 RMD160 d30298eb73a0076f56a89f9de85daa8c2fd1bc5b SHA1 cd0b43402ef4d4fe68a8c4cbdbdd10a5c8a3c8bb SHA256 d81d765ac3c72e99649855e3bcbf821362978a52e9c74fff2b3c609256d7d78e
+MISC ChangeLog 6028 RMD160 3cf744d42ff32663d4c2979321524a06f7d66d72 SHA1 3b778832a7ce71586fc5fa8b47639a5fec648709 SHA256 dc898aa945c9764472ed246e77d455fd85456a12a267754bab0c0250665eb321
 MISC metadata.xml 735 RMD160 c6ace3bb45b12ec4cdcbbd5449f136f8cde70f26 SHA1 bbb82688cdc6c0ed9fe9ec3e41185f64d989de99 SHA256 b631a82f963f69974818f516c543c56c9c8aee1a5010af3325bf648e64171bd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+C0vEACgkQkKaRLQcq0GLYrACfafEvdBQ0QWzUx5yFbyjfZM3s
-mEQAoKMWnv2NjHGqoDOS83Ubrpsgfc7Q
-=5f0G
+iEYEAREKAAYFAk+hI+kACgkQxeMuLWsGW/vGGwCeLYORWSNJPA7U2HWlyeZugLfA
+SPEAnj/pHqeLEGD4I+olHR4Nt8zVy22+
+=6tIW
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.4.13.ebuild b/dev-db/redis/redis-2.4.13.ebuild
new file mode 100644
index 000000000000..6037b947e094
--- /dev/null
+++ b/dev-db/redis/redis-2.4.13.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.13.ebuild,v 1.1 2012/05/02 12:09:02 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 )
+	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}
+}