Version bump redis to 2.6.9 (bug 453606).

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

4 files changed, 172 insertions, 5 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 693f18697e8a..58bb2d7ef62f 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,12 @@
 # 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.56 2013/01/12 14:51:30 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.57 2013/01/24 12:09:13 djc Exp $
+
+*redis-2.6.9 (24 Jan 2013)
+
+  24 Jan 2013; Dirkjan Ochtman <djc@gentoo.org> +redis-2.6.9.ebuild,
+  +files/redis-2.6.9-tclsh86.patch:
+  Version bump to 2.6.9 (bug 453606).
 
 *redis-2.6.8 (12 Jan 2013)
 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 4fb25c965c7d..d132907b18fa 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -7,6 +7,7 @@ AUX redis-2.4.3-shared.patch 708 SHA256 a2d3fda42993aa0b75f08e8a328a7cc1de9af97b
 AUX redis-2.4.4-tcmalloc.patch 442 SHA256 59c5dd571143e869395b460d15683acc322bf7092c05279b047ba76243ec818b SHA512 374bc086de124be706d84951f7e3178fb158159fc9e7bd19c204f071d5b41bc10bc20167e273f271e4aa9e5909e6d36b644ea9e1f981c6de023451f5fa0c3077 WHIRLPOOL 7e6fd6bf8769237f8f3d5d19fcda29c62e009ad0077a8cf1803e16ab9d7c8662c0bc5735a602fb3e739cbea6a8792c31c2757cfa34d1e11f99a0888d03f5a309
 AUX redis-2.6.7-config.patch 2423 SHA256 f12a536dac364538e31de79fd58d2698e30b0304fd3ff1c19b82c0e82cc3cdfb SHA512 4ce430bae1cf70bd8a2da8f0d2c8fab6a6c3e2216b67bfe728dad895c34b66f06600d747f76fc641829b2de7fd741deeecf32f603913616eab9d6622d601e261 WHIRLPOOL 92b360669b572747ff4ef835751761d916ffc2ca372435f527583c3b292f95db247ad44a4a0567e637f56677b6233f6f2464101280785bb6bb351015ed8bc09e
 AUX redis-2.6.7-shared.patch 920 SHA256 efc252edcb399183d62991130805d53e4566fcd4849c513055b4a21cb58a1331 SHA512 199763116264d3df9c0278d5afb17fa0f99438889f6ec8e0d9105d5ef9ae422b73a9bf22672962ac69dd7cb6250096a6374032560e2e3e6470bce3e0872814ff WHIRLPOOL 68c729678a222f945d85413b927f1790ac8fa97a204c121fdb3c65368e9ad9c5aa2f7d18ae0c7a9ca71b770d4916d0bf537349d7634704a7f4a79e262cac0cb4
+AUX redis-2.6.9-tclsh86.patch 1904 SHA256 35b7a6bfb894d40d6d92202ce78cc6a63fbfe625dac489f922c94af895e48edb SHA512 5d93c997c0e47928fc09a0ffeed96280e6155058bca7ba0371d8730a82e132ef7bc24061574c3db27bc589e585e785358fe0a345d8bd954aaf6b41d8c017b823 WHIRLPOOL 0d19a4f2f65f62451f4025d0f100b168e05739c786c36e3651a143b67e6b0f85c8abd4ad6f8701b20849b3a61dc8ca3288ee84541e78c26d878a39fd529cd5ae
 AUX redis.confd 450 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b SHA512 c6347cc6e17e9ce93fd081608b19c4977c3e1ffd58d2a417804ca3e647967800ac11859bd05d5437c36310dcd7552c11f35965e4521c5266c3414387d4796a6b WHIRLPOOL 72fb07431293f0e382af98c5a0b7eeca146cab84153befdd808328aa27404cd74d55d524b5442ad10de5989917351299bc7610e0be75d11d2e31fb5353beb45a
 AUX redis.initd 950 SHA256 af87676776b658db1ca1fe87fb4f8d2e2360bae3196543b19f42654d25f6b50d SHA512 159a4c622285c259b9379c4ccb328ddd401bb8822887723d1245e775d0681a0bbdab5d26f181a40a9145ebce7f7ac1b70a9c777d7722a44163b6c65cf0f9a839 WHIRLPOOL e196672386c90e540f61ef3718dd49091b543b104422efa93a3f6f705bdb2f93550aa1e29de6023dcd1f9cf147b403e15cc91a6c1973f4198ee624f97f21ddee
 DIST redis-2.4.10.tar.gz 621824 SHA256 4d34482198cec272afd45d0390d4e1f32ee847094834133613a925012810ed21 SHA512 9f8d6b23ecef68660204dc77af4c4d101a21fe729c0f0985422f4aebb22b1da0054e67c48fdcd65bafa764539e83c3fd35f04d21e6826db5f2831e8706ab9fca WHIRLPOOL 2e4e048def205a4ddd99fab56cca2ecbe6f22aa6eaae4355e993876c2c7972c39ff6faac2dc3e9f954d7525c02965864a1c2b228c7e023e3a330597f6b0a7810
@@ -15,18 +16,20 @@ DIST redis-2.4.17.tar.gz 656155 SHA256 3fae7c47ef84886ff65073593c91586bb675babaf
 DIST redis-2.4.18.tar.gz 657667 SHA256 d71b6372f42fcbdc77a9601f1dd6a029ed57f7f77ac3b18bfed8670fb8c74697 SHA512 8d612007ff392717c450ef5e8e2bb8adc710add6da6fc6bf3787ca941d300cd3a208e280fb83ff21aa3d0e322427f2a1c5438708171308b3e8cfffc4034eb34c WHIRLPOOL c3b961d0755161ac367f714a92a5dedcbb9e8c539b0481e812d8d56d3669c4849ff91a4d8912a25476fbf9434258c8d42e373a53411527092863e177fdd348d7
 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.16.ebuild 3187 SHA256 81b26ac5c5674d955f6575f7aa71203fa8bb4c24377d17de4df4d52c75fbce23 SHA512 6c82fb90fe64f72efa1c8e8fc5570ac1f921daba7fc6056372755220bb439df35addfc1a754c1e0988741fa5e0a68acb81d04fef1075bf7839d207f6ac43da0c WHIRLPOOL 4a7770cc5f8a0e7414439b8222269a6cf69feb958ab942a4daff2731fafcccea54397a37f6d7230cfa773ae8b235a887f54ec1a2ec533558f1189dc2b4f3beb6
 EBUILD redis-2.4.17.ebuild 3180 SHA256 ab7f146fffc6b8de65e0c1eae8e1a65ff699d06803d3117c52501626e00de6c5 SHA512 0435823f90806a19e10fec7b16d2287c27abe355b7643e8174b576aaaf98f63b491f7410d22bbd4d2e73381971ac41bf1cae0eeeed1ea90082678d80a3e75584 WHIRLPOOL c0b45ebe6447548a1552d15b57858093117b4a9912ca210652945b8d70f1872544cc25325fcf8a19cac63b13cb88df4ee9383f9d99ef673648ea8530964b4471
 EBUILD redis-2.4.18.ebuild 3099 SHA256 fac26e447bc986d2725acbde498b2c001542fcb53e3a3463afba232e7d0d1168 SHA512 9946120e8a1be336abe02ee639911486bbf3a2b1930c072d035959f67a9606e8c390bbc8c0091737a6985b94b72ecbd0441c883bc30b9249bec63c1c7ff38906 WHIRLPOOL 6cd2e679340f20bf9b3447367cb6b227ddd458abb220828ea5759be797ce07e828016da42a3954c4fb6a3bf77e1e9b8cfc397d5eed4c3bea1f5bf7e1d9a2a9a1
 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
-MISC ChangeLog 8466 SHA256 f82d567f50f4013d6aa5aa87964a34c1e3038dd1b54a1df0eccf6606464f4022 SHA512 1b080dab7975dbe8724edef31a36430075fcd024fd7bc1c621dec23db01b7066989a3917bbc245f19d11702db5302134454590f238730d6f2e60a2eef269e06b WHIRLPOOL c2b3f85d87c432b2e99d59b1f913ef0f0e6f66c82a264702d4e429387b5776b149d0808dcaad0251cd5c76a562d3951dd9736937b4cd6da4f01b70bca8ec8cfc
+EBUILD redis-2.6.9.ebuild 2739 SHA256 eb214cefd720ff61c77dfe740e5e7520613cde01f4d8c4dd27acbe7eba3dcd85 SHA512 30e1725aa06dc198d0b7e61f66e2a7c2e00a5fc6513b6adc062dd6a08571d205482cc5da5e39b172d1d4ba0b53c4d90d345fa4796c54fc0f58754c3b4f0218d3 WHIRLPOOL 16f3df118f807408e3d07162e8b71023b6a7f2a2bce8e11e8522be50fc0bed87bb46904ae48dc026a4186c1f27fc5055c6314e31a320126fb15e5248a6eac099
+MISC ChangeLog 8638 SHA256 7786fd72920fb491a5f1df76c8093a11d4a52e21f19c7d54517741e8286493ca SHA512 22b5c228591b91fe5d37d3060d38f683eb1ab697fd71ba42b15f8be659d304a69fc1f8e881ebc280fa28bb0d217d5432bc0251879524e1e780ef08d34212c4c6 WHIRLPOOL d7108bb0a192091738bf354fea779397a25891bb9fe8adf38f4e0fb7b38be171a1f6c0d9b241d05db6e88aa016bfdbceb7a3e8c8f219be0ac3d53ad8adcf4c8b
 MISC metadata.xml 735 SHA256 b631a82f963f69974818f516c543c56c9c8aee1a5010af3325bf648e64171bd5 SHA512 a61a72783016c3b13f2be1ec20f1639c3c73b04576bc3dfb0b999dd33104592d529b7665ea5e31f3798969bccad5664009a3b6ad9deac0cae1e494f7769969e3 WHIRLPOOL ce75f8ebeb6a006b1a9f5a25a481443b411fc951a7cc5eef57a65e13b12683ad4f9f5eb691a2b1b30d788847d6df03acaa79c8686895e5bd5fc1ab61bb6bcc98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDxeKAACgkQxeMuLWsGW/vLYgCfYTUVxr3MQ3FXc5cCbDvcQDOU
-wfMAoL89gouC3avsFuHRym93ikZzx5/N
-=3ka4
+iEYEAREIAAYFAlEBJIMACgkQxeMuLWsGW/v+5gCgrLT96B7+D+RoU44k/5OTgztu
+91oAn1XVmsf+CVAj8OA88xZ1AgOzbKHh
+=3faE
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/files/redis-2.6.9-tclsh86.patch b/dev-db/redis/files/redis-2.6.9-tclsh86.patch
new file mode 100644
index 000000000000..00d81dfafcc7
--- /dev/null
+++ b/dev-db/redis/files/redis-2.6.9-tclsh86.patch
@@ -0,0 +1,57 @@
+diff --git a/runtest b/runtest
+index 0eb384c..fadc283 100755
+--- a/runtest
++++ b/runtest
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-TCL=tclsh8.5
++TCL=tclsh
+ which $TCL
+ if [ "$?" != "0" ]
+ then
+diff --git a/tests/integration/replication-4.tcl b/tests/integration/replication-4.tcl
+index 69fcab3..58a70fa 100644
+--- a/tests/integration/replication-4.tcl
++++ b/tests/integration/replication-4.tcl
+@@ -1,5 +1,5 @@
+ proc start_bg_complex_data {host port db ops} {
+-    exec tclsh8.5 tests/helpers/bg_complex_data.tcl $host $port $db $ops &
++    exec tclsh tests/helpers/bg_complex_data.tcl $host $port $db $ops &
+ }
+
+ proc stop_bg_complex_data {handle} {
+diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl
+index da94b08..30baf6a 100644
+--- a/tests/integration/replication.tcl
++++ b/tests/integration/replication.tcl
+@@ -78,7 +78,7 @@ start_server {tags {"repl"}} {
+ }
+
+ proc start_write_load {host port seconds} {
+-    exec tclsh8.5 tests/helpers/gen_write_load.tcl $host $port $seconds &
++    exec tclsh tests/helpers/gen_write_load.tcl $host $port $seconds &
+ }
+
+ proc stop_write_load {handle} {
+diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
+index b2e58b4..253e955 100644
+--- a/tests/test_helper.tcl
++++ b/tests/test_helper.tcl
+@@ -2,6 +2,8 @@
+ # This softare is released under the BSD License. See the COPYING file for
+ # more information.
+
++package require Tcl 8.5
++
+ set tcl_precision 17
+ source tests/support/redis.tcl
+ source tests/support/server.tcl
+@@ -189,7 +191,7 @@ proc test_server_main {} {
+     set start_port [expr {$::port+100}]
+     for {set j 0} {$j < $::numclients} {incr j} {
+         set start_port [find_available_port $start_port]
+-        set p [exec tclsh8.5 [info script] {*}$::argv \
++        set p [exec tclsh [info script] {*}$::argv \
+             --client $port --port $start_port &]
+         lappend ::clients_pids $p
+         incr start_port 10
\ No newline at end of file
diff --git a/dev-db/redis/redis-2.6.9.ebuild b/dev-db/redis/redis-2.6.9.ebuild
new file mode 100644
index 000000000000..6c5f7ec291b9
--- /dev/null
+++ b/dev-db/redis/redis-2.6.9.ebuild
@@ -0,0 +1,101 @@
+# 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.9.ebuild,v 1.1 2013/01/24 12:09:13 djc Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic 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
+	epatch "${FILESDIR}/${P}"-tclsh86.patch
+	# 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() {
+	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}
+}
+
+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
+}