Version bump redis to 2.4.17 (bug 433850).

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

3 files changed, 120 insertions, 6 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index cdc47a03cf1e..71f34ee6c31a 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.48 2012/09/12 15:52:37 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.49 2012/09/30 12:16:12 djc Exp $
+
+*redis-2.4.17 (30 Sep 2012)
+
+  30 Sep 2012; Dirkjan Ochtman <djc@gentoo.org> +redis-2.4.17.ebuild:
+  Version bump to 2.4.17 (bug 433850).
 
   12 Sep 2012; Jesus Rivero <neurogeek@gentoo.org> redis-2.4.4-r1.ebuild,
   redis-2.4.10.ebuild, redis-2.4.13.ebuild, redis-2.4.14.ebuild,
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 56f73548e36c..03f20622c349 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -10,18 +10,20 @@ DIST redis-2.4.10.tar.gz 621824 SHA256 4d34482198cec272afd45d0390d4e1f32ee847094
 DIST redis-2.4.13.tar.gz 625464 SHA256 b6e057b6b5cd5946f8b46b2427401400686ed4f6c4af446eb1f0ec170d3f87be SHA512 6bd15dc9dd99ba8472de190008bc067656648f0b7c7faca0380f1f05a7e8ca48c94cc6ad754bf2d630a67b368f992884354de4081f1ca5d7e965448519f35c55 WHIRLPOOL 5440e85a7bd92d8efd54983e2b9df5f1bb03c7b7a52a631880b2a325da2822a86459220b05e178935e5f53a84fa32447394644f6ec4017759fb27d59525e3bf8
 DIST redis-2.4.14.tar.gz 627494 SHA256 4f26ae8cad0f9143ef30b9bb9565a1618570654eb86ee911c20966971660cc7e SHA512 4fadd431bab1ed0e0ba9282e226eca1591ba07e7ea1f6219729ce6fc4d9e68c6ec9f11992ac4ede581820cd9db6d64b8a3e19e7a3edccd38a6a60bcbddd7e93b WHIRLPOOL 643f675da719800bae7867cd51f0daba125965772ed186cf05082a78a02afd66268949634a9bc2e411418167352630a87e9c161050b81f036fc60123a82f2e87
 DIST redis-2.4.16.tar.gz 649908 SHA256 d35cc89d73aa1ff05af5f1380a4411c828979b3b446f5caf8b5720225b38e15b SHA512 9e7ff57722322605ac7884449ba7b58a460b7af78f9fb75c461d9ce24be852482b27d80f2c5fbfe6581889d1072d8318b7cfb7d8eb228739be9fb61040215974 WHIRLPOOL 3533b4b4e4689f200151f75c71dece344c886b1da4748f4bdd8280303ea93c55524b38152a7f0473c878bae9e622846ceb74036eb44a0210218182164dfec682
+DIST redis-2.4.17.tar.gz 656155 SHA256 3fae7c47ef84886ff65073593c91586bb675babaf702eb6f3b37855ab3066ebd SHA512 9c4aff041ac2dc430f631330281a7eb4798e956e846cc09c040973c565953ca8f20c3dc19daa38a4bdfa36ca19d79b2e5ac6bf9cfdbea9430747913881daa653 WHIRLPOOL 4314463583930c4e3ed82b1d958837c7f5672668f78a48efb348377d80a66fd61e86f078bf5a5cf6ab5b4b25a87ac292f46c569b35c5a149cbc8a581bf722d90
 DIST redis-2.4.4.tar.gz 607718 SHA256 8cb779758315b89969adb588c813bf980e32a760d4204209d90d605dcbc5f708 SHA512 8139c1f41ab49df0b44509316cdde60b6d16cb071c3ab06317a52ea11b9cb5c0eb4ce0b632b186f8e0cac07ee586481c8eba5407c05dc95903eb751864c009b9 WHIRLPOOL a7aed77f39c8efa035e4e162fd16339048dd7a5e50f4c9f5ed9a68c7cc24e0bfe3a4fab6ad4cacca75f186d1f069c1f8070590ac0851d1c6c546738a6be072f3
 EBUILD redis-2.4.10.ebuild 3165 SHA256 389cdd67e6ea37b05005db96411cef297f6214af73e2c6b6e0f40b6997ff773c SHA512 e9b67c3dc88aaa1dae9ce20e12f4dd294279e5fb2717770b1c0dba0e03af206676374b52acb5ebaf44793c78bc76eab355b6af02c86abe5ff73e2aff89fcd14a WHIRLPOOL fe21368951e117c10386f413915374e77e1b628165d8b1ec569e42d0824dfe1038922e235129612a1e509a14970d85fa0c6be62289398f2efb8cef40d9c73e1a
 EBUILD redis-2.4.13.ebuild 3167 SHA256 9845f60776df9098a479e05b3088b705fcd8307a210e0a48aed73120222c5516 SHA512 09e6f3620076f8a97a275163782b7cbb3e5da2013bf93f8c2ef2ca4ede8c4aca18c9fa54111dab5943af27111de4058060525b7e1809056a47860978b678f442 WHIRLPOOL 20a215f87ffb6b34b858e80d2e88e5d9362588ac52780900ace574e63ede49b0ba921bfc484bd1aedd9915007e8c55537c59c5cc657f1045b0f03436a9fe155e
 EBUILD redis-2.4.14.ebuild 3172 SHA256 30f261d5da58ebf6d027e1440672c36e52a964d99ea68b322fb1edea33a2d34d SHA512 da02980abd2345e34fd2ba65ec7eea5217ec75b0292d8cefc7379597cf4d792f8da52284187149872f278a2331eb1aadd76e83084ae028dcd08160971d49d8fe WHIRLPOOL e7897e3eda5317ae0512412041ac179b7d6de9f7d0e65ae47133955faa925c5ea8fe4bf22a8bc7ff65aca7d3a7da946eb38132683379e8bf053c614b744ea320
 EBUILD redis-2.4.16.ebuild 3187 SHA256 81b26ac5c5674d955f6575f7aa71203fa8bb4c24377d17de4df4d52c75fbce23 SHA512 6c82fb90fe64f72efa1c8e8fc5570ac1f921daba7fc6056372755220bb439df35addfc1a754c1e0988741fa5e0a68acb81d04fef1075bf7839d207f6ac43da0c WHIRLPOOL 4a7770cc5f8a0e7414439b8222269a6cf69feb958ab942a4daff2731fafcccea54397a37f6d7230cfa773ae8b235a887f54ec1a2ec533558f1189dc2b4f3beb6
+EBUILD redis-2.4.17.ebuild 3181 SHA256 8fda007349b1275b9cb88473ba856283a340c4d805bacee295c0a0ca3c4be523 SHA512 f74447f76a32ff8b2e6a3c92b0b8a6c0003731376bfd354ce4c2a630f0619f3503f7e7c9e0d5d63c44b491b1900810de042b301f10e5f9e3a27f300a1c03ff39 WHIRLPOOL 615db08818ac0dd403a77fc7667e57cf7be3d3c138c6fee3ebd2839048dd58e21d600899f556e0e85504a9c50557e57aa895594fa556a90def5326fe352e7bb3
 EBUILD redis-2.4.4-r1.ebuild 3160 SHA256 7167bf9205594ad6b6b75bdc98dc1b4709415162d33fc3bfd2668c0e8f2482ac SHA512 9a62ce6e201deeeecd99200da093d6c83ed24199010d6829b0e65aeeb82d3d4d2acf9e2aef93c91f61a6e8ac8a0b3407fefd0614b926afa0478588e385875ee0 WHIRLPOOL 7ea126677b56d279aaf3081680246bf97d1835e99d9bbe63b15833253338d60b46a445715ec64c61b96edc625773d8631e306d3ac685764ea494bddfb9e8aba6
-MISC ChangeLog 7207 SHA256 63bb7131da776694d9221791acc76cbde4be38dc0187ce42011f81af5d2e198e SHA512 73692f6dcfceead6d360538342061a90607a6bee510213b3239e667daa8cbc1610816a95bf0dd75ec2ad7d667d4824b6c5bd5c4d4f61c925c58ccfa7effd7c17 WHIRLPOOL 84178824190439abd2a4f96107b561ac448e0701f49578e57e5015fb815bb609e011fe342d9748216e8a8b86cf33b610d51c3847191381be2419c4d3148c9cbb
+MISC ChangeLog 7340 SHA256 2fd266234cbd129dbb11c0cbfcd8a73a5129e03bd41f20bdcac531df5e912ee8 SHA512 abda5588e0cfb0bb3fea76a18f78be83a9fac823530fe5d45c0a92e884c76d54d1fb199dd9cf01aa5ee3f140975422e9205db7bbc2bf632b07ce92156d69e01a WHIRLPOOL b8b6bf288a29cf02f7ba8f23069aad8aa3facbf1136746ec293c13dc698c13a64405f3c5e896d358d2a9d2489069f8310c80b424f7b88d100d2ca944e05c4814
 MISC metadata.xml 735 SHA256 b631a82f963f69974818f516c543c56c9c8aee1a5010af3325bf648e64171bd5 SHA512 a61a72783016c3b13f2be1ec20f1639c3c73b04576bc3dfb0b999dd33104592d529b7665ea5e31f3798969bccad5664009a3b6ad9deac0cae1e494f7769969e3 WHIRLPOOL ce75f8ebeb6a006b1a9f5a25a481443b411fc951a7cc5eef57a65e13b12683ad4f9f5eb691a2b1b30d788847d6df03acaa79c8686895e5bd5fc1ab61bb6bcc98
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBQd64ACgkQdIssYB9vBoNgVwCdHBclDICyY6Gx7A8q7VahXXE9
-Af0AnjIhHh4n6mXWPfhRtAO4lExbOolY
-=sGTV
+iEYEAREIAAYFAlBoOB8ACgkQxeMuLWsGW/ubmwCgh84tYtbOWFwRUhTS8c7VHGBV
+OYwAoJrEDBVECNfeZ07Vpbq1/bxGlBZ6
+=BunU
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.4.17.ebuild b/dev-db/redis/redis-2.4.17.ebuild
new file mode 100644
index 000000000000..858877239ed9
--- /dev/null
+++ b/dev-db/redis/redis-2.4.17.ebuild
@@ -0,0 +1,107 @@
+# 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.17.ebuild,v 1.1 2012/09/30 12:16:12 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.0 )"
+DEPEND=">=sys-devel/autoconf-2.63
+	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 src/zmalloc.h
+	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}
+}