Bug #498110: bump.

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

3 files changed, 119 insertions, 13 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 07b6df7c50e4..44cb4c860a22 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,11 @@
 # 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.73 2013/12/17 21:47:33 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.74 2014/02/07 19:44:23 robbat2 Exp $
+
+*redis-2.8.5 (07 Feb 2014)
+
+  07 Feb 2014; Robin H. Johnson <robbat2@gentoo.org> +redis-2.8.5.ebuild:
+  Bug #498110: bump.
 
 *redis-2.8.3 (17 Dec 2013)
 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 68b5e932e689..33709df7e48d 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX configure.ac-2.2 1522 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f SHA512 7a67bbd2f5fcfd7e1bfe18b739438342d40484c3f178ef5e2ddb617480715626e7f5a47d58660761489867ae460a58457a85a14bb2af90fe2e2ab3b8bd940b34 WHIRLPOOL a78a56a8e5963fee703b90d4eba112591693ded8ff8b780b049864be4fe712815ef0743d32b120edadca4e5909982d841cfa4ed1483b9eb91bc030ecdf3d7c70
 AUX redis-2.4.17-shared.patch 729 SHA256 acac1eb8a0f3d37ac1a86fcf054f3fc8a548471344f334825bc14caa268cb033 SHA512 8a4693db569ac168e527df162ec88dea1751b92632119908c01a5cd0b97c80bdd0e657d77fba08cb25f32156ebed01b0a581d6354442e50f74c12e4ed564f552 WHIRLPOOL 3a9f2f8a9f74cde4d7e7b382f3e375b6df2c588440bfca3280d79b4f1f53ff8c3c9f89cb086d37e27d9c4b65d0f6adc1e36488d46ca71d5e290d7e67a8c0bb36
 AUX redis-2.4.3-shared.patch 708 SHA256 a2d3fda42993aa0b75f08e8a328a7cc1de9af97b50e2b479c85421062c9d8e82 SHA512 12f5494d24b33226422a17d4290fed090a3f529d6d35fa11137598fa1c4bbe3933cd32499fd067a59573fb4b01c2101e69b0b5652b09ece73078f0a5a91aa99e WHIRLPOOL f8090ba54ed6c5d7035b29960ec6b4a83c7d575191e3ad5a6a12af00243c7446477b2ed0d3fc28851dea6e6dbbda3f19f39f43ea72e5589cf383a55e0aa882d3
@@ -21,18 +18,13 @@ DIST redis-2.6.15.tar.gz 998865 SHA256 b0105c6ec526d40e90a0a0bc9d070a5602d839b93
 DIST redis-2.6.16.tar.gz 999579 SHA256 81490918dcf82d124b36e48b0a9911bfba3f13abba04d8c89820324eff7df03a SHA512 469a29e2a755543a3b2c3deb467a72ae62b81c54a60ed1baf6f9d5687ef4b87c22d9cec6a43cec43dd90d4b5561f5bbcd2448f6edf8a784041233b80d9403b0b WHIRLPOOL ed10212f6465083cc689d83cb0c4db63e15697a232a7e6621fb3b41e263cb8d16c7c3085317f0147e3cfe2d1620672b40049b764ebfb2f2710fd6737350f4804
 DIST redis-2.6.9.tar.gz 989119 SHA256 4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489 SHA512 5263bccd4e175dd00318436be3818c07b880ba6f2e2552e1811d909fddf1fbbff5addbd684e116bd7f8cca727c61f6f45cd264fff61d2ffad18d57f6ae0456e5 WHIRLPOOL 57828b815e3591bd4b4ce6b1812b8f594062b6e63055fc88f50498aa2605ee79f829350026ac7ebb946bd1207c34935768db2f270197a4b979f8cec9b6d3d6a8
 DIST redis-2.8.3.tar.gz 1046106 SHA256 c0aa8065c230f9df1b77d1dd1e8840655e7846e23fe23f8e339d6246aec3e63f SHA512 09209c526a2f1e4bac0ecc95b16e67e390c792580d6ad0f4259795966fe1fe9b2850673f3e00e167908f6f4b2e0636dbe31a3f1b5eca17c4f1fa27d7fb024615 WHIRLPOOL 624922fba1a3951640dec710d11c8c8e1fb738125853bab0183bddce5b76c73bc1a1b470d124764325a9399c53216f594ffd86948570da6f8aac789684c2efbf
+DIST redis-2.8.5.tar.gz 1050480 SHA256 2741bf67093e38ec23494f0882794160f01e9f34a379a2ddf828b64260015d3b SHA512 f7b1502f9d102b98f0b124b9c52376ca655798cdc6d4da422f3f74d36d09b246fc04d2339f55d413f700b74c1fce85b70759f04c62e21ef11edcc0dc24691005 WHIRLPOOL 944b5e2526f663d1370b69812b26466898c8de5a01c7c04c13711abf0f63dc51f0a361b02af612335a9f67ed06932a75ff5e5d1d3b0fb32dcea2723eba244958
 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.15.ebuild 2903 SHA256 588a2d85f3c42e75845597cfb4bb9bb603bed84c4a782c3f7deeb890a74bfe60 SHA512 2b05156d5056a8b68335722ffdb59532da57c4507c1b2d528b22816ce33a2e7a7c81311d2d81abbc72d1bfa463979d3d3f69b8f78c03f1f550e8a81707a7f282 WHIRLPOOL 01cae7687aa1ed69bd0e7ce3769b17c4b4156ce5fc03398f9a935bf855c960988861adf302e118097437554b1c44aa41042a2a579ddcdfc0945b5213c1aa8696
 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.3.ebuild 3015 SHA256 c9e635385aed62b16d30fbacc1f9adaab11a8589cfc7aea5636b892e7a46ac29 SHA512 02cc0a2c06d03135a5e1b02de23dd24eca27cb7dc85ad5e0966b3a70c748f2693f740b10ddb29df856791260b280e4bd1026cdbe4014ea651eb0e609e9aa87c3 WHIRLPOOL 9695ec05f0775efeac8b4d1646cdfafbbfbd5cbc93c7a60fa7cf6d4e59c0cb23e893936b38c5e6e3f278e8eaa265a8e326c95325909fad6fc0be088c7dd7a6a7
-MISC ChangeLog 10791 SHA256 2f5f5f3066475ca2b13c33e5569acf7b6ef4af16328cea9581c69ed80281d368 SHA512 1751d3753ec8bb4e3a844726991c434e78d4eafe85e6f698dc51053cee41ae0c451a333b550dee9ce77fb7b153555b05e2139b240a83f1508883a1aec7fe9124 WHIRLPOOL 19cc88297b9123037feeac1ce032f3742f51e0caaccffee28f507b6ccd4ae9bfaea08f71b25e1e1b0a21f55cc638782bda9faad34674da39abce8da4c7bd0da3
+EBUILD redis-2.8.5.ebuild 3021 SHA256 1038fb5672093274c1437b8f6d4ec2e3ddc3aab85f7162cbfb682a014cee00ca SHA512 ff5977ccbeef52ee71fc00931c61c5ec56ad0537585b182ffa43cf9dfd58130c94cd670f977e70289caabbac84e4894082702a5b60ea53861701f02cda4b70a2 WHIRLPOOL 61c71eba40b60c91fec5ad422b5b80e9de82a0f73526b5985c3edf944cde73534e19e8e1b4b2ca74c454f879d277e9c032abf87c2b27c664c625c7e31be5123d
+MISC ChangeLog 10914 SHA256 b3be7cc1aa852ba21c828b6a0f043b7498ba57a4a9356ffd74c3894d4ace1743 SHA512 0631093b47c96350d2137e3b99944f8a4b22867c3566fb7d61e1681daf8cbcbd4212f72a0da0e9ef5c528e7642ddf284ecaa025c949f4df9ae1e2052db8bab46 WHIRLPOOL 990509c405368dd7da28a336ba3523ab9157e205e858e6f8d4a4a2ed55135814a87805018cbfd552cf64dfa18185a03963d2a9a71b6cc5df6e36aa3ea24dba89
 MISC metadata.xml 838 SHA256 04f66683a85a33b8376ee8238fd28be3ed95bb9f18f93021f3513e75ea9e82e2 SHA512 859585ee0e468fb464f55d7169acccb9ea52bcdd1399cb4e9ee1a094f59e704b9f5e6e9f5a8fdb41c40a2f25557e3fbd65ee8116e93c71c46cd660be55be5827 WHIRLPOOL 66a403c334d1b2339e4120701648dd9dbb555ed6cf3fef03290fdc2fe45bcadcc1600c85b2458622e6f814307f7605330d06956c279c9bea5b891181853e5fbf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlLBMZ0ACgkQKiQSS7ZY+hOJuQD/SQlLRoRQrwP2O8tNGtGmd2E0
-L/xCMHlvRWTiEKUYzlEA/0Xt614c63b3dOIH01XdNHuh8ajoMZau9dO8AAMkuXGh
-=8aAb
------END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.8.5.ebuild b/dev-db/redis/redis-2.8.5.ebuild
new file mode 100644
index 000000000000..20c03e905d8d
--- /dev/null
+++ b/dev-db/redis/redis-2.8.5.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.5.ebuild,v 1.1 2014/02/07 19:44:23 robbat2 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
+}