Bug #427170: version bump.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 117 insertions, 3 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 5edfb6fdc9cb..6879f6f121e4 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.45 2012/06/04 06:52:15 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.46 2012/08/02 18:25:31 robbat2 Exp $
+
+*redis-2.4.16 (02 Aug 2012)
+
+  02 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> +redis-2.4.16.ebuild:
+  Bug #427170: version bump.
 
   04 Jun 2012; Zac Medico <zmedico@gentoo.org> redis-2.4.10.ebuild,
   redis-2.4.13.ebuild, redis-2.4.14.ebuild, redis-2.4.4-r1.ebuild:
@@ -191,4 +196,3 @@
   bugtracker by Geoff Kassel <gkassel@users.sourceforge.net> and W-Mark
   Kubacki <wmark.gentoo@hurrikane.de>. Proxy maintainers welcome.
   Upstream submission was linked from bug #308243.
-
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 58fcb0627bdf..16700fe45275 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -6,10 +6,12 @@ AUX redis.initd 950 SHA256 af87676776b658db1ca1fe87fb4f8d2e2360bae3196543b19f426
 DIST redis-2.4.10.tar.gz 621824 SHA256 4d34482198cec272afd45d0390d4e1f32ee847094834133613a925012810ed21 SHA512 9f8d6b23ecef68660204dc77af4c4d101a21fe729c0f0985422f4aebb22b1da0054e67c48fdcd65bafa764539e83c3fd35f04d21e6826db5f2831e8706ab9fca WHIRLPOOL 2e4e048def205a4ddd99fab56cca2ecbe6f22aa6eaae4355e993876c2c7972c39ff6faac2dc3e9f954d7525c02965864a1c2b228c7e023e3a330597f6b0a7810
 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.4.tar.gz 607718 SHA256 8cb779758315b89969adb588c813bf980e32a760d4204209d90d605dcbc5f708 SHA512 8139c1f41ab49df0b44509316cdde60b6d16cb071c3ab06317a52ea11b9cb5c0eb4ce0b632b186f8e0cac07ee586481c8eba5407c05dc95903eb751864c009b9 WHIRLPOOL a7aed77f39c8efa035e4e162fd16339048dd7a5e50f4c9f5ed9a68c7cc24e0bfe3a4fab6ad4cacca75f186d1f069c1f8070590ac0851d1c6c546738a6be072f3
 EBUILD redis-2.4.10.ebuild 3165 SHA256 96a25a510446418ed9b57f75266882935f8072adcad22ea1cea8de53ffff81c8 SHA512 c9b59d0aac3c640588d0a8ea1850deb700658c0aed797704617916b1a226280b9249c34a7926809ad4c63e7b4043607f5480741beb70002e8b1ea381fcebaf32 WHIRLPOOL b055749a97be309b5dfd50371d2053691066ad1e28b4d55f5b8f61abb75c7e2701a0a60306056cca8b6fcaa327aa056f71658e3f31a14fe8a82d8421a42e11a7
 EBUILD redis-2.4.13.ebuild 3167 SHA256 c3fdc7579332dea3f487b1fcab0d7ce9d08600b19361d734b159a784e2429b25 SHA512 42075065a39bfd5538bece555b7c71978c6c681498a51c2d82aa522e174c97559dd9123920c596894ca1af102b829b4ae081787bb8c6178f8fa6baa8cd15f0be WHIRLPOOL 8c6173e9692914b2521d50f92314229b43dbf5b2bfb9e81a7f027de4cb87ac0a9d78a321b1e7d6ba646df622d572e412cc68b11956dd4912157df2ade9af8131
 EBUILD redis-2.4.14.ebuild 3172 SHA256 a56c01be1e5ac64f15adb6c2cf68d33efcecc95d88cfb88f84149c2fcf25bbb9 SHA512 dab5bbbcd7b0f057bee1a14afab71a6c6f722a8c1baa554e410bd02a39c571ff1bcc95e225ec8511244d6e04a8b3aaa743a580a40572c2db557a526e7b8fcfeb WHIRLPOOL ed3cca1b5efc97a438e264f3a77d47e82144f5407e73b23cd5b182b76291326b6dfdedab421d442c454124450bf14f204f89d164272e6dc37e3ac884a628266d
+EBUILD redis-2.4.16.ebuild 3172 SHA256 358dd5762cba4b3d195cd737e476756ab7865d0cf6944ff4410c714daf1f89bb SHA512 51d89b7c7ec6ce6b4b798ece10d0bca9673d5dcfcb0d9582431ca8c29ac0dc90ac4853650335fe40139df21ec24d587c8f45c45de9fcc68b0b13e31a6604e9f0 WHIRLPOOL cecda186810e5bf576129cdf137c0fb1ed5269596db67a443560639ed48d8fa54ea331c3e58e8087faf86dbb0799c0a030a00bbeaddfac3fa2d78f2740ffda85
 EBUILD redis-2.4.4-r1.ebuild 3160 SHA256 bc79658d4167d474cc7a76fe011dc1db188b62fa3632710133dbaf63a046b1da SHA512 9c5e9dc42f2e37690cb75edada4ac6db51147440b7371113c8f304df515bf4a90d67b03f84020a141aef33c1b9a7cf9be45c4ae67a6bf9252141cf6004ae5767 WHIRLPOOL d9d639513acd85c23b67a118f7475c983ae65421af03cfd702e36ffbe325a9fd1953584d174c697293868eba1e2949334a09af6e88ef2df37f2b59ba6b321753
-MISC ChangeLog 6760 SHA256 253d3f4f76d328d0d61eed875d227b968b6a9686290191b17a4419b054328dd1 SHA512 3f3c88b4716d0618b014f6b18704339507b03033c4917db6216d7d20b8759b58e8ba0f59814a1da5b8bd40cc6d23b04fe896c5c6c734281ac3657a1fe4cf7434 WHIRLPOOL d7757b88152a950dfa9a03fb73f1f01fcd4cf09b408e3833df8e39c8440a722c72be4b67cffe87e73b9c0bda8e1a20b1228a521d1f91a20a1fee8653f1b2d584
+MISC ChangeLog 6893 SHA256 3f706fb9acbfd1e5259d14ce91d1798cfa97b8342e7b6b16a1c3b946c11f49db SHA512 29d1946e08cb4e432cb56658fd466d3c12bada49e4b4118fc153b4b7b02276499b9ea12966e2ceb643a99b64a385121b5bac0297dc0ae388752778f22cc0ce9a WHIRLPOOL 8ae887038907f96d0bfd98fc0ffcabb63b002ed00669d153be27c65f94137d2f7d3e5099f098c426d0571b18a5d3e7e801b553b1ac76d1322f914c12588d4f31
 MISC metadata.xml 735 SHA256 b631a82f963f69974818f516c543c56c9c8aee1a5010af3325bf648e64171bd5 SHA512 a61a72783016c3b13f2be1ec20f1639c3c73b04576bc3dfb0b999dd33104592d529b7665ea5e31f3798969bccad5664009a3b6ad9deac0cae1e494f7769969e3 WHIRLPOOL ce75f8ebeb6a006b1a9f5a25a481443b411fc951a7cc5eef57a65e13b12683ad4f9f5eb691a2b1b30d788847d6df03acaa79c8686895e5bd5fc1ab61bb6bcc98
diff --git a/dev-db/redis/redis-2.4.16.ebuild b/dev-db/redis/redis-2.4.16.ebuild
new file mode 100644
index 000000000000..74627b62fe22
--- /dev/null
+++ b/dev-db/redis/redis-2.4.16.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.16.ebuild,v 1.1 2012/08/02 18:25:31 robbat2 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=""
+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}
+}