Version bump to 2.4.4 (bug 378085, thanks jbergstroem).

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

5 files changed, 154 insertions, 8 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 264dff29fd2e..eaa689d60b2d 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/redis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.26 2011/11/26 10:37:47 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.27 2011/11/30 12:09:36 djc Exp $
+
+*redis-2.4.4 (30 Nov 2011)
+
+  30 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> +redis-2.4.4.ebuild,
+  +files/redis-2.4.4-tcmalloc.patch:
+  Version bump to 2.4.4 (bug 378085, thanks jbergstroem).
 
 *redis-2.4.3 (26 Nov 2011)
 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 435e48878eab..479758780713 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
 AUX redis-2.4.3-shared.patch 708 RMD160 ed2c774f8ae684a722c1b46684e695dfbd596871 SHA1 607819295f05b4374b770395fee05a7710321483 SHA256 a2d3fda42993aa0b75f08e8a328a7cc1de9af97b50e2b479c85421062c9d8e82
+AUX redis-2.4.4-tcmalloc.patch 442 RMD160 f1740f166c23f636c9c703838a49182cc7db4bc5 SHA1 c94bba49b0573cef15d5cc8124610ec8b4069b2b SHA256 59c5dd571143e869395b460d15683acc322bf7092c05279b047ba76243ec818b
 AUX redis.confd 450 RMD160 237a72f30b3ba5c77e7dd31d2dfebc2db2cea2ad SHA1 4c298810900f0e627cd3f7bf480feb639b6cc2d5 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b
 AUX redis.initd 859 RMD160 a5718f3b4eab11450223c21bc98ab75d408e932e SHA1 ba3237364dba1da920ec4f14c13ff2cd45062144 SHA256 8b25b60bca695a8393e381078b2a42330c1b6cc2953bbe3c1b7cbd41ca36fe5d
 DIST redis-2.2.11.tar.gz 450839 RMD160 b5c1802395a0c375e5e9c0702e7086b83989d0ed SHA1 ba4b513c5bf7a28b2e50bbd1ca51bb7962e5685c SHA256 a94c1dd2573e19f1abd335507d5ea280753b092ddf16d014dcd3212f5a5bc0eb
@@ -12,18 +13,20 @@ DIST redis-2.2.2.tar.gz 446269 RMD160 a7a21ab6aa07f79e5cdeb991a26dd1d55446e38e S
 DIST redis-2.2.6.tar.gz 447913 RMD160 76ddcd22ba31a7a9dd8a2fb7b465330c933a15c7 SHA1 dd5a5a443327da09483701c48b7ea87e5d160c69 SHA256 64ab9ec01792c50344b030e19dfc2453ff76822cf5845eb6da5654bc1ea09477
 DIST redis-2.2.8.tar.gz 448877 RMD160 91c95512ecd2b83834bbe4ebd562ae7fc4699599 SHA1 30fb67ed71c179a7294d06d2c83c9b074a98fb79 SHA256 d438fde47fd8a34d8b135744a4264214274e57bc7f132d0cf4ee4e98a6551bb3
 DIST redis-2.4.3.tar.gz 603463 RMD160 1da0661f5d22f046547f2aa9f93d921bd2a50852 SHA1 d917e721a11e38969d92070e9c6476598c6e4621 SHA256 4e0f39968776819a942d1502626ac6072a28e1b148a25f662d80bbcb54d5ba4c
+DIST redis-2.4.4.tar.gz 607718 RMD160 5b9e1e48216c11b3eca76ad0eafee3d7a0df0c68 SHA1 bc1e383c0216fe5bd5dc47eab39b43bbb9d5f8a5 SHA256 8cb779758315b89969adb588c813bf980e32a760d4204209d90d605dcbc5f708
 EBUILD redis-2.2.11.ebuild 3468 RMD160 e2627a8126791d83e61d7052edb13871f1c4a459 SHA1 4e1c62fcec32d26c92744cb42901d7c2c9724a61 SHA256 bf78c62af722fdfc6fde59f6fee4dccdc1a408e7707e9a0896bdd4d5d9c140ad
 EBUILD redis-2.2.12.ebuild 3484 RMD160 c87bbe611f1c786379e090da413bd39533294af2 SHA1 a0cce800e9a6c723a3855dfd554466ddcccf571b SHA256 5e75722290ea06302549d28735ec4e8c8048b4a94b1477f18b47181edc637e5a
 EBUILD redis-2.2.2.ebuild 3435 RMD160 4a780f8f0406c961657e9d18187729cab402a956 SHA1 05e3e4158cf56f5a04b1cdd3cfe32e3b3e37a213 SHA256 1915ebd2aed6a330bead3b86399859d9ce86ee1fcf06aace5fb694f3e0cf70a4
 EBUILD redis-2.2.6.ebuild 3435 RMD160 17842406e198bf6782132e0754bfc873d1e98510 SHA1 44a936fc3358579fce4cf73b0ba61e33be321da4 SHA256 a4cf6a3a1a43daf03c6847bf4e3143be88c59104df93af98751730bc5ac7ce7e
 EBUILD redis-2.2.8.ebuild 3437 RMD160 d005e6f2f91a711e6859b0d0084ef8ec3feedf84 SHA1 d4d1841d5ece9a240069344fbc9eeaff325bf7b6 SHA256 79a243577f0efac78b5a5e04314668add9c1e79d55694ac45909ed56da7d4985
 EBUILD redis-2.4.3.ebuild 3367 RMD160 93d68f8b66a84bc90ce68f0eaeb847b65565b03f SHA1 dbd07f27f8489c239cda3c02dd47424a1038978f SHA256 7e73f59e9f0f52753c579e232a99d9d888a66b7fcd7a50ae8ed296a102ece661
-MISC ChangeLog 4174 RMD160 d7c0e5f82f1034d796f60a603ba06c46a188798b SHA1 5e28ba4a619341e1d02a0c776969d1299fa9fb1f SHA256 a81a1758947e368c75f1dc49989f3b5c430f4b0cb0546ecd2bbdc41205991a98
-MISC metadata.xml 532 RMD160 68ae8544dab5fbd33f2baa5c5e02a0dd6636602d SHA1 0149e2e944773f7bda6c1873d9479aecb56924ec SHA256 2c9078c79029f6d2f4990e6322531c125fe6594a2c723ace011910b375374fe7
+EBUILD redis-2.4.4.ebuild 3482 RMD160 60e49d80e5f525671dc4287a581f1e95d7f53d12 SHA1 f536c333f9c42685bbe45ade469e80024164d8d4 SHA256 d6e1f44959ea7ad4b88cbbe08e7dc9d8b09de53fa73d044b396cbf0d5fd6a532
+MISC ChangeLog 4363 RMD160 cf8b573197a71350e724f6bd826dc4bfe3d0b9ad SHA1 b0346f3e4082f87930dee3a02f5311918440088d SHA256 ac9a3074dbb3bac1bfc1e5d34a4eef32428bac13476008650397af2dac99fa04
+MISC metadata.xml 627 RMD160 9b08999079c6ee69962c0d6d2eaa3952e6d11e07 SHA1 3ac3e00d89541d8f5c5e760cb00412f2030159e8 SHA256 810fe762375ca5635f27d412e96dd1da0bfc9634a89b829cf96cb6d0579257fa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7QwYsACgkQYpJnKVbCxcyqAwD8CZDlFMYOi72eBK85NTYqXmo6
-xiER4hM4jbji6pbWTc4A/iW+sNrww+Ogdvbsr5zDbHfMNo6WaKdz88E36jFSYc3Z
-=EJst
+iEYEAREKAAYFAk7WHQkACgkQxeMuLWsGW/ugCgCfYX9J3d/nJiH01joJAz+Aim+e
+FRgAoJbpumj9ayCnBK0EvEWSP+d4ydMM
+=DSN8
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/files/redis-2.4.4-tcmalloc.patch b/dev-db/redis/files/redis-2.4.4-tcmalloc.patch
new file mode 100644
index 000000000000..964ce71d5f78
--- /dev/null
+++ b/dev-db/redis/files/redis-2.4.4-tcmalloc.patch
@@ -0,0 +1,21 @@
+https://github.com/antirez/redis/pull/218
+
+diff --git a/src/Makefile b/src/Makefile
+index 72edcad..3e43990 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -35,12 +35,14 @@ else
+ endif
+ 
+ ifeq ($(USE_TCMALLOC),yes)
++  USE_JEMALLOC=no
+   ALLOC_DEP=
+   ALLOC_LINK=-ltcmalloc
+   ALLOC_FLAGS=-DUSE_TCMALLOC
+ endif
+ 
+ ifeq ($(USE_TCMALLOC_MINIMAL),yes)
++  USE_JEMALLOC=no
+   ALLOC_DEP=
+   ALLOC_LINK=-ltcmalloc_minimal
+   ALLOC_FLAGS=-DUSE_TCMALLOC
\ No newline at end of file
diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml
index 5e0ea5d24b93..af302f577b90 100644
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@@ -15,5 +15,8 @@
       Use the <pkg>dev-util/google-perftools</pkg> libraries to
       replace the malloc() implementation with a possibly faster one.
     </flag>
+    <flag name="jemalloc">
+      Use <pkg>dev-libs/jemalloc</pkg> for allocations.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/dev-db/redis/redis-2.4.4.ebuild b/dev-db/redis/redis-2.4.4.ebuild
new file mode 100644
index 000000000000..cd8976811ed7
--- /dev/null
+++ b/dev-db/redis/redis-2.4.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.4.ebuild,v 1.1 2011/11/30 12:09:36 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
+	# set tcmalloc-variable for the build as specified in
+	# https://github.com/antirez/redis/blob/2.2/README. If build system gets
+	# better integrated into autotools, replace with append-flags and
+	# append-ldflags in src_configure()
+	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}/${P}-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
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING README TODO
+
+	dobin src/redis-cli || die "redis-cli could not be found"
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump \
+	|| die "some redis executables could not be found"
+	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} ${REDIS_PIDDIR}
+}