version bump fix #503548

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

3 files changed, 121 insertions, 5 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 93e7a7fab58f..5101344b2a93 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/redis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.75 2014/02/26 11:07:13 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.76 2014/03/10 08:36:15 ultrabug Exp $
+
+*redis-2.8.7 (10 Mar 2014)
+
+  10 Mar 2014; Ultrabug <ultrabug@gentoo.org> +redis-2.8.7.ebuild:
+  version bump fix #503548 thx to Johan Bergström
 
 *redis-2.8.6 (26 Feb 2014)
 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 1273e49e4c38..6106bbb6f645 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -22,18 +22,20 @@ DIST redis-2.6.16.tar.gz 999579 SHA256 81490918dcf82d124b36e48b0a9911bfba3f13abb
 DIST redis-2.6.9.tar.gz 989119 SHA256 4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489 SHA512 5263bccd4e175dd00318436be3818c07b880ba6f2e2552e1811d909fddf1fbbff5addbd684e116bd7f8cca727c61f6f45cd264fff61d2ffad18d57f6ae0456e5 WHIRLPOOL 57828b815e3591bd4b4ce6b1812b8f594062b6e63055fc88f50498aa2605ee79f829350026ac7ebb946bd1207c34935768db2f270197a4b979f8cec9b6d3d6a8
 DIST redis-2.8.5.tar.gz 1050480 SHA256 2741bf67093e38ec23494f0882794160f01e9f34a379a2ddf828b64260015d3b SHA512 f7b1502f9d102b98f0b124b9c52376ca655798cdc6d4da422f3f74d36d09b246fc04d2339f55d413f700b74c1fce85b70759f04c62e21ef11edcc0dc24691005 WHIRLPOOL 944b5e2526f663d1370b69812b26466898c8de5a01c7c04c13711abf0f63dc51f0a361b02af612335a9f67ed06932a75ff5e5d1d3b0fb32dcea2723eba244958
 DIST redis-2.8.6.tar.gz 1052017 SHA256 efd0c9cb8d2696db44d8cb8309fed96607f68b93bb126615e64bff364e716658 SHA512 55949b27ca1cdb7d865ad3eb25a3ee280b2cbbbbb1f806f5ec7fe1d6541d6a64ec97a5e1ba2384deaf1a5e8ef60f004c0d63fc5fc71527dff8b47f44b828a6a0 WHIRLPOOL 23b19581adef3434f356d4ad6a7e77e9a6009ea7fc1796d27a434f1e90f287ea43f86a6ba6cdce060edeed124c1a6d28f6838b573b3199584aece410916ba6c8
+DIST redis-2.8.7.tar.gz 1064262 SHA256 a93e352e50bcc076e649174319c2a819306735c1a1ee83d498ced146eda78670 SHA512 2c484699628f02c1e1a0637f2b62ca8a206a8771e2c9b3821a34800b5893b90890048363b4a9b1202283dee46e087a0e5e7acc0d46801b844b5217f3ca65b3d9 WHIRLPOOL 2c11d36bd86593d295e868a145a41eda1dbcbd6046e34b0f1028adf6f59f9aac17bff82741b28c7a10965007a0d11885ec5e4bcd19863e238d9d94da0db0957d
 EBUILD redis-2.6.13.ebuild 2901 SHA256 3e2c780f5db88e5e17099f7dec4e1b9bfae50cb3ab453893d88595d828d2934d SHA512 05c902e6f3a1fdc0a813bbb4edfbcbc68c5a93444d73ea4341ecf9b6c371eddcc7c79f80af66cd601fa2d65ef517d0d4e4778c1a511d26dc4fc63af6ac682527 WHIRLPOOL b4a97b1461bf75e0bb2f38363ffb342a55c68f53625aa89ecba3fd184b1505517d9a25ac26fb5d7541934ce6a5df3161c31a7ba70574a87efdf2d66c482b2c29
 EBUILD redis-2.6.15-r1.ebuild 3021 SHA256 2ba1e8305b463ebbb543e2a04cf6c9969fb7c6bf191b8c4151a8631001da43b1 SHA512 c83ce2463e8951655631342ad5bdd8fa8b918d46507ff391170e81385cabe8d4c9c7476016fa3dd03d200ddcc19482a97c02d648fcd455974a826d3f78409a6a WHIRLPOOL 53ad9806054babfacde241cf284af130857707c5537dea6ce481f3ba8b885161034286963267a3ec570822aedf246652e607152bf2993fed64f6fa5401538ed8
 EBUILD redis-2.6.16.ebuild 3018 SHA256 9b5c10f7d4a9b1143426f009507b22522486b613a7de63203950eb14ae9bb716 SHA512 75dc6e6c3436b2d31ebd6e5e0e6e3bbeeba3076ee62f7fe8eec9c5384c5cb8a3446f34350071a5f8d9091aaa79eafa4689195bb4756f7063e5766efb8edd4c47 WHIRLPOOL 6c64911f85754a191591d0b9d5d5622a4a94e652811c64e16ae85718d0090777a88b5ce23749fea72323bcf47e513efc86d08d25f979ee4b28f1b1d3d9fe3a78
 EBUILD redis-2.6.9.ebuild 2737 SHA256 f80b5b31f7a0e1397ec88d028453c663f2b596d1f8e4ade460beb5e4d282c98c SHA512 b5fec0258e4493d4ab14112e5c5011305f79b094a6c7b692b7d2d4cbd19708fd2f9428c31671f2d6cbde9eb830a93497c49d4715bdf56edefebdca62345c0f8a WHIRLPOOL 00709a8c8db4af0ff802264dad962ce73062ed42c9f2f1e889fb2d9810af9c136f435dd93ba68708689501cb046190ae2764ef11f8a6ed692bc6ebaba8aa2741
 EBUILD redis-2.8.5.ebuild 3021 SHA256 1038fb5672093274c1437b8f6d4ec2e3ddc3aab85f7162cbfb682a014cee00ca SHA512 ff5977ccbeef52ee71fc00931c61c5ec56ad0537585b182ffa43cf9dfd58130c94cd670f977e70289caabbac84e4894082702a5b60ea53861701f02cda4b70a2 WHIRLPOOL 61c71eba40b60c91fec5ad422b5b80e9de82a0f73526b5985c3edf944cde73534e19e8e1b4b2ca74c454f879d277e9c032abf87c2b27c664c625c7e31be5123d
 EBUILD redis-2.8.6.ebuild 3022 SHA256 f015a28b71d6ffcdfeef55ac26a41783374c575e9aad0bbea9a9b41946a13547 SHA512 a6eb095b2de493feeae901f3e33e732e14bdbab6724ddfe3fb726add6dd3a6dbb5567a5231a55797e9b7b3063da239ca4ea71e58bb8d6fe76f056d0ee6c1bfca WHIRLPOOL 71046eb70cc7fb6cad242df0f50323ce902560521d3f1af9cc20adb59d7bb29fbb8524fa7aa07876ea881a18d4b8c1b6a0d70f3b97ffa6c1c4bb2abccf4f1945
-MISC ChangeLog 11093 SHA256 483fd02bf5fa4bc0c7b82e1a4b46132832c8cc2ad59eec0efaee600539a32c02 SHA512 1f4b02dd852c8757b7f6d094ad63f316d466a91a7582ba07a5de9a5fd60b270431a73ae8562b32244800dba98081585e5e52249edd7aaa96843d48595749ce78 WHIRLPOOL f911c08afc3ef2f0aabb890c8701338b2dc5ecee64d996ef56b0895b3eb369efd831b55fa52f5d7fd5759d8920b195c3f6755a4b275ca0c59d7b595112750c83
+EBUILD redis-2.8.7.ebuild 3022 SHA256 0a98e724502375f0fe12fb25e87ad7200d105218091e83b44278939e1cbac87d SHA512 1065f35bd16127f211551622b243161e78513a9920f72e284f1274c364979201b160019ad7d65e30f517da432209e6c42c4fdb98fbeb73553e82ac8a65091444 WHIRLPOOL 87c22f170ed33437be8f081829cb6ab2cfa829f3d4b125ed6337fe3a9793989955434968b40120af7ac03634236adee31ff7a1bfa3e638f441d69143a9e6fda2
+MISC ChangeLog 11240 SHA256 a8259a2e1b02bf69aa0c4659d86fda9adaf191df42b1d59c1887fe089682722f SHA512 891245f159d1f1f2b94d539a6a813e088e12c30f0d3ae2bc307aa3e2a58eebb7f05e0a7b7d555e7f2342d03534e4bc7e92254797156d0fdb11d10d6e27b59068 WHIRLPOOL 33bf97360aeecbcc109c130688c530135da847d501027cf199efd34498a0d0883bd6c8599c4b49d93711869441de9bac238ef7f0998021f19af50e0c4870a7f9
 MISC metadata.xml 838 SHA256 04f66683a85a33b8376ee8238fd28be3ed95bb9f18f93021f3513e75ea9e82e2 SHA512 859585ee0e468fb464f55d7169acccb9ea52bcdd1399cb4e9ee1a094f59e704b9f5e6e9f5a8fdb41c40a2f25557e3fbd65ee8116e93c71c46cd660be55be5827 WHIRLPOOL 66a403c334d1b2339e4120701648dd9dbb555ed6cf3fef03290fdc2fe45bcadcc1600c85b2458622e6f814307f7605330d06956c279c9bea5b891181853e5fbf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMNyucACgkQKiQSS7ZY+hOAowEA1YYv0EksJTkj13R9BEYILPui
-iHvbgvo8zgz7JAjhnoEA/jeYmBIns8nhVq8Jbw13+pBPZCkaPkQXG3+SU2YeM8ea
-=oXtZ
+iF4EAREIAAYFAlMdeYYACgkQKiQSS7ZY+hNYywEA13nsKZJ7Tac2Ht3eQ647KSoc
+U8ixRD+PXShC/+lMHYsA/2c+RhjxOx1vhPTVyiIjmRhCPVe3yGX4WWCKyW9l63wS
+=hwER
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.8.7.ebuild b/dev-db/redis/redis-2.8.7.ebuild
new file mode 100644
index 000000000000..a742a20848b9
--- /dev/null
+++ b/dev-db/redis/redis-2.8.7.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.8.7.ebuild,v 1.1 2014/03/10 08:36:15 ultrabug Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user
+
+DESCRIPTION="A persistent caching system, key-value and data structures database."
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://download.redis.io/releases/${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.8.3-{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-3" redis
+
+	systemd_dounit "${FILESDIR}/redis.service"
+	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
+
+	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
+}