Version bump redis to 2.6.13 (bug 457002).

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

3 files changed, 119 insertions, 16 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index df6811df6835..0fcdac615536 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/redis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.61 2013/04/25 09:22:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.62 2013/05/03 08:07:23 djc Exp $
+
+*redis-2.6.13 (03 May 2013)
+
+  03 May 2013; Dirkjan Ochtman <djc@gentoo.org> +redis-2.6.13.ebuild:
+  Version bump redis to 2.6.13 (bug 457002).
 
   25 Apr 2013; Agostino Sarubbo <ago@gentoo.org> redis-2.6.9.ebuild:
   Stable for x86, wrt bug #466934
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index ecde5fb297fd..c0b54711622b 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX configure.ac-2.2 1522 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f SHA512 7a67bbd2f5fcfd7e1bfe18b739438342d40484c3f178ef5e2ddb617480715626e7f5a47d58660761489867ae460a58457a85a14bb2af90fe2e2ab3b8bd940b34 WHIRLPOOL a78a56a8e5963fee703b90d4eba112591693ded8ff8b780b049864be4fe712815ef0743d32b120edadca4e5909982d841cfa4ed1483b9eb91bc030ecdf3d7c70
 AUX redis-2.4.17-shared.patch 729 SHA256 acac1eb8a0f3d37ac1a86fcf054f3fc8a548471344f334825bc14caa268cb033 SHA512 8a4693db569ac168e527df162ec88dea1751b92632119908c01a5cd0b97c80bdd0e657d77fba08cb25f32156ebed01b0a581d6354442e50f74c12e4ed564f552 WHIRLPOOL 3a9f2f8a9f74cde4d7e7b382f3e375b6df2c588440bfca3280d79b4f1f53ff8c3c9f89cb086d37e27d9c4b65d0f6adc1e36488d46ca71d5e290d7e67a8c0bb36
@@ -12,30 +12,22 @@ AUX redis.confd 450 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48e
 AUX redis.initd 950 SHA256 af87676776b658db1ca1fe87fb4f8d2e2360bae3196543b19f42654d25f6b50d SHA512 159a4c622285c259b9379c4ccb328ddd401bb8822887723d1245e775d0681a0bbdab5d26f181a40a9145ebce7f7ac1b70a9c777d7722a44163b6c65cf0f9a839 WHIRLPOOL e196672386c90e540f61ef3718dd49091b543b104422efa93a3f6f705bdb2f93550aa1e29de6023dcd1f9cf147b403e15cc91a6c1973f4198ee624f97f21ddee
 DIST redis-2.4.10.tar.gz 621824 SHA256 4d34482198cec272afd45d0390d4e1f32ee847094834133613a925012810ed21 SHA512 9f8d6b23ecef68660204dc77af4c4d101a21fe729c0f0985422f4aebb22b1da0054e67c48fdcd65bafa764539e83c3fd35f04d21e6826db5f2831e8706ab9fca WHIRLPOOL 2e4e048def205a4ddd99fab56cca2ecbe6f22aa6eaae4355e993876c2c7972c39ff6faac2dc3e9f954d7525c02965864a1c2b228c7e023e3a330597f6b0a7810
 DIST redis-2.4.18.tar.gz 657667 SHA256 d71b6372f42fcbdc77a9601f1dd6a029ed57f7f77ac3b18bfed8670fb8c74697 SHA512 8d612007ff392717c450ef5e8e2bb8adc710add6da6fc6bf3787ca941d300cd3a208e280fb83ff21aa3d0e322427f2a1c5438708171308b3e8cfffc4034eb34c WHIRLPOOL c3b961d0755161ac367f714a92a5dedcbb9e8c539b0481e812d8d56d3669c4849ff91a4d8912a25476fbf9434258c8d42e373a53411527092863e177fdd348d7
+DIST redis-2.6.13.tar.gz 994331 SHA256 3b9439636c58ca06bee538a0f7298e02a33fcf98b8fa845c0b0cf8567751e948 SHA512 2676b4afb688aac7b4bfdcd2e6b054ab8ea8b94294c948189ebbf4d29f019d07f5c764328b2fd148ae35627612887b7e7ab9037e5e370c6275a998d9d3a4262b WHIRLPOOL 2813a36e2550873d4201721018486cadc98ac9176919006d496a49f2e1c9266f38be91137f3c8e979c27717b3fff5eb379d60a71c75ccf1870705ad9ebb2523c
 DIST redis-2.6.7.tar.gz 987306 SHA256 e1a05b02665dbbd3ae2fed10906888310d5e82e28b868b32085c30659f3bdcd0 SHA512 60ac4f5ae9fed038117cbcb5d81c0c1c6bb274ff9ed3792dbd5bac4bc5db835b87431c41a99ca1d455638171a587a27bdec882b175db69945d1493bcb62278cc WHIRLPOOL 04ff333502e0e565c97601ffadde50739ce0829e235c5519409d4ab6d6c334e30953d6911fa902ac0f533aaa6a4a5b388eea129d217fcad5722acba56967355f
 DIST redis-2.6.8.tar.gz 987578 SHA256 b04083127f5e11e82045314c4ff9ad92e33f89772cc435ef8bccd75572eec9bd SHA512 fdcdff9987de29754d1c0fb7b6f3c3644e9e88557293cd51217fb689e250933322f51c5451b0d5dec1bb7420397c0ecda4a53742582e64686dfbafeaaed2285d WHIRLPOOL b68fcf8c9349ab9f12dd27a575267cbd6e1190be173ff802a7b9e037bb76ea4aa5932c527affa5ddb7acf7f182f8c5d77a295422686ad45996cae89ef950aded
 DIST redis-2.6.9.tar.gz 989119 SHA256 4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489 SHA512 5263bccd4e175dd00318436be3818c07b880ba6f2e2552e1811d909fddf1fbbff5addbd684e116bd7f8cca727c61f6f45cd264fff61d2ffad18d57f6ae0456e5 WHIRLPOOL 57828b815e3591bd4b4ce6b1812b8f594062b6e63055fc88f50498aa2605ee79f829350026ac7ebb946bd1207c34935768db2f270197a4b979f8cec9b6d3d6a8
 EBUILD redis-2.4.10.ebuild 3165 SHA256 389cdd67e6ea37b05005db96411cef297f6214af73e2c6b6e0f40b6997ff773c SHA512 e9b67c3dc88aaa1dae9ce20e12f4dd294279e5fb2717770b1c0dba0e03af206676374b52acb5ebaf44793c78bc76eab355b6af02c86abe5ff73e2aff89fcd14a WHIRLPOOL fe21368951e117c10386f413915374e77e1b628165d8b1ec569e42d0824dfe1038922e235129612a1e509a14970d85fa0c6be62289398f2efb8cef40d9c73e1a
 EBUILD redis-2.4.18.ebuild 3099 SHA256 fac26e447bc986d2725acbde498b2c001542fcb53e3a3463afba232e7d0d1168 SHA512 9946120e8a1be336abe02ee639911486bbf3a2b1930c072d035959f67a9606e8c390bbc8c0091737a6985b94b72ecbd0441c883bc30b9249bec63c1c7ff38906 WHIRLPOOL 6cd2e679340f20bf9b3447367cb6b227ddd458abb220828ea5759be797ce07e828016da42a3954c4fb6a3bf77e1e9b8cfc397d5eed4c3bea1f5bf7e1d9a2a9a1
+EBUILD redis-2.6.13.ebuild 2901 SHA256 e3c642a0d31f3f00fc22e42aafb7a214f7d5148feb05ab58be00013c11f727d3 SHA512 b6d6830ed0781a31a7083cb94285c8353b70084217c0726214304e0f547812f5d70e9960bba84a79ad824363bdeceb59d6ea74b513fb4fbe77fc91ed0fe347bb WHIRLPOOL bf7bf21333641dd1dc9cb00587a9affa2a5ad68bf3e447baef6701bbf709c01386ba79ab01624cac97edd9ea45206a54aa185178063b35356a2d75550a5c01d7
 EBUILD redis-2.6.7.ebuild 2467 SHA256 6f83bc32dabc364d92a774119c83cf134b49415497f6c4c70870e63bf50a2cd7 SHA512 3575105d1535d4cf0de573e6f50bb7ab7984efeb86e5a0d51c99ab141c212e100abcea38f3a614907d8e21272dd039c0dfb5dbd9f71c5b46feb3a8a136640ccb WHIRLPOOL 18029dfec1e31a7e34e42b69fcfa896c83c912b268d9d2df978652c4dee11abe9351ddcef9323796dafda41d63fc75989dcab478c636f89a08c7b26c9f74d224
 EBUILD redis-2.6.8.ebuild 2474 SHA256 0864333a072aed69d92aba9c18c63bd754a3ae7f5a693cd1da45fbe4a991efac SHA512 f278f65c1bca8dd278a135b8e51bb1b3b178302fb254f6b37e6f4b4ba9b11d4d3a56cd426105fd981e1eae1c3f30945bc89b0319c40efc954e2714d7863ba8b9 WHIRLPOOL b7d3b663178c81afa4ebdfb4404d20d4b4a1778e6438e181fc956dac54305cabb3c68833db789e2fda6c735586e5a787d386e5eab6eefa7cc766c10eb9adbc88
 EBUILD redis-2.6.9.ebuild 2737 SHA256 f80b5b31f7a0e1397ec88d028453c663f2b596d1f8e4ade460beb5e4d282c98c SHA512 b5fec0258e4493d4ab14112e5c5011305f79b094a6c7b692b7d2d4cbd19708fd2f9428c31671f2d6cbde9eb830a93497c49d4715bdf56edefebdca62345c0f8a WHIRLPOOL 00709a8c8db4af0ff802264dad962ce73062ed42c9f2f1e889fb2d9810af9c136f435dd93ba68708689501cb046190ae2764ef11f8a6ed692bc6ebaba8aa2741
-MISC ChangeLog 9074 SHA256 cc2abc93fb0bc94dfe3361ebc3a37614ed6b36281615572d785d05982666caf5 SHA512 9deb33c8a3b4805052c787bd819ade918573110d8ee08c6f1abcb348b1818c173fe033eca503e336432bdfda8efdc1fe807c88506bf5b81fb8aabd1883d5e355 WHIRLPOOL e0aa8df127cc4f67f5a68606a2316cc9bfab1fff0d3ac24a29769f2a4cf575f876dea3ae78f31581371ab8f8ecd549a60c0312baf3f077d695a728114ea7204c
+MISC ChangeLog 9219 SHA256 13fde936303f0a36c6e437c93ecab275b8024b25600d93be57794b9d152fb8e9 SHA512 e6588ae5e0fc5f3d3eecc20ebcc351f926c2ed43680e2c1835a72f51d5f0a38d2b575fd95a6f5f0dd64807c963e95163d42f1aac59512df2a00df37ab489b289 WHIRLPOOL 0e2395e592f8afaaa2af0dbab9c61dbe6483137aaf1c60c4e4635c7e5293fa31a67ec7060d6da5988629539a97807672ba6e2efe544aac9d0468926700dcb71c
 MISC metadata.xml 768 SHA256 e7b1056e1c95dc38c4d182a55d07c50b7e460d8aba5d271f403f600a01394c1f SHA512 e0255ef12fbfd3c837e577a6c757589e330cd5435091c1ade3c50e7063f20d41ff66f45872178b987ca99a69bd939145985dfbaf413ecf447e72c140dd2f0d0f WHIRLPOOL aa46358f124e77c5bc1026d8cacce7bcca36b48396f94e0192bb192232012cfaf8530c67342f6c6227889157841fec47261718e4be0d6781ab695ad240557d4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRePW7AAoJELp701BxlEWf3V8P/2lyrLIDbNLaf76kk7UPMw7h
-udmzo8vnoGdbOyE2uoOedwMtaPH78IAEbOvnh74qz44mjdPBjuSL3wfxCb7PYBka
-U9H+0S7cZa9bL4e6Ee3VH+MlWeTjXSP/PDB8DOG9JdeiPvhAsJMSo1A2ANetF79M
-JvnS+DkBTkPdsqbrAvB/b0O5mEjAQw1eP+wWpKsfgQSS5HjhLKnuVDZZdhRWeniP
-OJnZPffZXE2+uV/pCY7Iu3IUEip+LNA7g11HOcfl9+X7d49RMhBUWWAgymAUS4ep
-6IPYo99Ru1sX4ng3OjF40BuYILMw+gfMee7X+92YdjrJ+k2EtKekP0siZAyN0xbo
-AbfMPQx0RBv+ha+BZ1DFEUVHsGCehAoUXUcmtWuAPbOui33cHVXQ5l3C8PBu5RFU
-sTtTZVULqJIKN94hrp+d+f5w0DVWdIINsnClLu4RSLwAjsZQo7wpOL8HdHHduvPr
-21CKmwqkdFgjSpWgQg+gW0ilWKg+oH+DyLU2YtPeU9WNyqIcwlc84xJ8J7E75wRG
-x8GWN3M39ZYzMV7/Z0WNPM6erKkmKYcKR/xyg3LL4BgkyqP71lKATfd2UXIiPr7+
-K/1PyHFfBIxekFsTuBe59dJPNLwoDAA9H2ZY8HaAZ+FlH6Urmdz7LK9sP8jZHSDV
-QJ3qHfxrJ2k8IMwy1zMi
-=FTZV
+iEYEAREIAAYFAlGDcFoACgkQxeMuLWsGW/tcGQCcDkIVCeGse7/+y2q+V2OfLhTm
+5MYAnjacysP/D8c1IBRR1xYkgVIAzCI6
+=1gI3
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.6.13.ebuild b/dev-db/redis/redis-2.6.13.ebuild
new file mode 100644
index 000000000000..253e5b8c8f4a
--- /dev/null
+++ b/dev-db/redis/redis-2.6.13.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.6.13.ebuild,v 1.1 2013/05/03 08:07:23 djc Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic toolchain-funcs user
+
+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="tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+DEPEND=">=sys-devel/autoconf-2.63
+	test? ( dev-lang/tcl )
+	${RDEPEND}"
+REQUIRED_USE="tcmalloc? ( !jemalloc )
+	jemalloc? ( !tcmalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_setup() {
+	enewgroup redis 75
+	enewuser redis 75 -1 /var/lib/redis redis
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.6.7"-{shared,config}.patch
+
+	# bug 467172, 467174
+	sed -i -e 's:AR=:AR?=:g' -e 's:RANLIB=:RANLIB?=:g' "${S}/deps/lua/src/Makefile" || die
+
+	# 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_configure() {
+	econf
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+
+	local myconf=""
+
+	if use tcmalloc ; then
+		myconf="${myconf} USE_TCMALLOC=yes"
+	elif use jemalloc ; then
+		myconf="${myconf} JEMALLOC_SHARED=yes"
+	else
+		myconf="${myconf} MALLOC=yes"
+	fi
+
+	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+	insinto /etc/
+	doins redis.conf sentinel.conf
+	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+	fperms 0644 /etc/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd" redis
+	newinitd "${FILESDIR}/redis.initd" redis
+
+	nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
+
+	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
+	dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}