Add unit file (#488114 by Julien Sanchez)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 140 insertions, 6 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 446a301abe17..c3f103d0a1b3 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,12 @@
 # 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.68 2013/08/26 11:48:14 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.69 2013/10/15 18:35:34 pacho Exp $
+
+*redis-2.6.15-r1 (15 Oct 2013)
+
+  15 Oct 2013; Pacho Ramos <pacho@gentoo.org> +files/redis.service,
+  +files/redis.tmpfiles, +redis-2.6.15-r1.ebuild:
+  Add unit file (#488114 by Julien Sanchez)
 
   26 Aug 2013; Dirkjan Ochtman <djc@gentoo.org> -redis-2.4.10.ebuild,
   -redis-2.4.18.ebuild:
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index ae4030ef06ec..3ea8c4654433 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -12,18 +12,21 @@ AUX redis.confd 450 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48e
 AUX redis.initd 950 SHA256 af87676776b658db1ca1fe87fb4f8d2e2360bae3196543b19f42654d25f6b50d SHA512 159a4c622285c259b9379c4ccb328ddd401bb8822887723d1245e775d0681a0bbdab5d26f181a40a9145ebce7f7ac1b70a9c777d7722a44163b6c65cf0f9a839 WHIRLPOOL e196672386c90e540f61ef3718dd49091b543b104422efa93a3f6f705bdb2f93550aa1e29de6023dcd1f9cf147b403e15cc91a6c1973f4198ee624f97f21ddee
 AUX redis.initd-2 669 SHA256 c3d0dad8e5465b0af865ff04af3bf4610282b5efa5e5a59481c11d75c85b8500 SHA512 ed7c628a0ecd1e73e92883f1cb956183833a9abca0858aafb2ec80298ee41972ca7ed3073613b1daf2d7553ce0b7161614b2e0c320cc31cf8d8a8e22b92cc10b WHIRLPOOL b54a75ee1c40842bbc2c9d0bc2765ffe58b2252d0aa09c9cad589b549bdba1fdb6dfec2b26d0832d2f06456aa093553079276f67f668efd7cfbaebb069a9d510
 AUX redis.initd-3 801 SHA256 fd1f703d2099419ed2e0da18811ebce9b9580e83801b2c97e7b26d13b70895ef SHA512 0a3f01936cdd063596fa347e4064591dd252f532b48a62b08711b9c27d871c565f944517b9dfcb3e71326d6a569e811466fe93e4d2d381b66376a0e89103e1e6 WHIRLPOOL 510ce5e610a06342df7d0f773b99f7623a8f8f7e04e4286c3c628a6efa238d635872a19653641e9b46a70e622a4a8855461d37d5f6ba080f05509a2584713d75
+AUX redis.service 254 SHA256 e4b1b282612bf496f92a9287c171227802d79a9aa7e58e77f1cdbefd5b13551b SHA512 a8735fb3d2fff552f0f0dc982224ac73a8b9ca3a5c633d64c5fc528dc1f5a965f693d7aa19801eebaf663992e3d4ef96aa65bdefab47fef98c94aeab2b165b87 WHIRLPOOL c39a75713dca525ff1c1fec9a8972184f19204e08054b3dc62ec265c42abca69d5cfa90fd19097e2e4a35b1829c0c3743f19301a6ba5c7765320a91ee68eb1b9
+AUX redis.tmpfiles 61 SHA256 68e4c7e3159068400cbc7d07e84b5618f9d829dc7a4f18253783c6256a53031a SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738 WHIRLPOOL 2c6f4d9e5382c43e935db16bf120b24cd8de517bc067dcab91b3230a8ddced7ecc5ed37626464d3f1a7880d2d41efdf3cecfd1029a38aaa2edf3d20de74489b4
 DIST redis-2.6.13.tar.gz 994331 SHA256 3b9439636c58ca06bee538a0f7298e02a33fcf98b8fa845c0b0cf8567751e948 SHA512 2676b4afb688aac7b4bfdcd2e6b054ab8ea8b94294c948189ebbf4d29f019d07f5c764328b2fd148ae35627612887b7e7ab9037e5e370c6275a998d9d3a4262b WHIRLPOOL 2813a36e2550873d4201721018486cadc98ac9176919006d496a49f2e1c9266f38be91137f3c8e979c27717b3fff5eb379d60a71c75ccf1870705ad9ebb2523c
 DIST redis-2.6.15.tar.gz 998865 SHA256 b0105c6ec526d40e90a0a0bc9d070a5602d839b930776b8ecaeb9fa32493e3bc SHA512 8614b5531049f99a19e3ba87c7d632ab43d02e1c62b6287534ebec35e4a484e3eefabd94d7ca52eb31eb56675451aef94265514be78fdaebd50db5230a525563 WHIRLPOOL c1eba6bccb17c6733d3b5f6e06933ff7ea8689d4cb16e0005f002fda75bda1d730b815546e5d3b50fcd6f85a05a35585244a7a69263795e7bda53bd1a588db03
 DIST redis-2.6.9.tar.gz 989119 SHA256 4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489 SHA512 5263bccd4e175dd00318436be3818c07b880ba6f2e2552e1811d909fddf1fbbff5addbd684e116bd7f8cca727c61f6f45cd264fff61d2ffad18d57f6ae0456e5 WHIRLPOOL 57828b815e3591bd4b4ce6b1812b8f594062b6e63055fc88f50498aa2605ee79f829350026ac7ebb946bd1207c34935768db2f270197a4b979f8cec9b6d3d6a8
 EBUILD redis-2.6.13.ebuild 2901 SHA256 3e2c780f5db88e5e17099f7dec4e1b9bfae50cb3ab453893d88595d828d2934d SHA512 05c902e6f3a1fdc0a813bbb4edfbcbc68c5a93444d73ea4341ecf9b6c371eddcc7c79f80af66cd601fa2d65ef517d0d4e4778c1a511d26dc4fc63af6ac682527 WHIRLPOOL b4a97b1461bf75e0bb2f38363ffb342a55c68f53625aa89ecba3fd184b1505517d9a25ac26fb5d7541934ce6a5df3161c31a7ba70574a87efdf2d66c482b2c29
+EBUILD redis-2.6.15-r1.ebuild 3023 SHA256 bba21a26aab35d1fabf7ce6c07443d1581224ddde9720ce93d04a2c06bd0c90e SHA512 e393c0ae02deda55b93517ff63cd1e25b64778c9360b52a454414f6fa70339787987aa72366428fb356102a79c1951cf624d3d432f9d9cdceb9f51590fd1d822 WHIRLPOOL 92a2c452bcd082d52c8a423ffc2031a0f9f27753261270f481633b53078acf8d2da9c577c57929e82e4c378d3364ce15397d44b621314e7a018cf04b2f74c8e3
 EBUILD redis-2.6.15.ebuild 2903 SHA256 588a2d85f3c42e75845597cfb4bb9bb603bed84c4a782c3f7deeb890a74bfe60 SHA512 2b05156d5056a8b68335722ffdb59532da57c4507c1b2d528b22816ce33a2e7a7c81311d2d81abbc72d1bfa463979d3d3f69b8f78c03f1f550e8a81707a7f282 WHIRLPOOL 01cae7687aa1ed69bd0e7ce3769b17c4b4156ce5fc03398f9a935bf855c960988861adf302e118097437554b1c44aa41042a2a579ddcdfc0945b5213c1aa8696
 EBUILD redis-2.6.9.ebuild 2737 SHA256 f80b5b31f7a0e1397ec88d028453c663f2b596d1f8e4ade460beb5e4d282c98c SHA512 b5fec0258e4493d4ab14112e5c5011305f79b094a6c7b692b7d2d4cbd19708fd2f9428c31671f2d6cbde9eb830a93497c49d4715bdf56edefebdca62345c0f8a WHIRLPOOL 00709a8c8db4af0ff802264dad962ce73062ed42c9f2f1e889fb2d9810af9c136f435dd93ba68708689501cb046190ae2764ef11f8a6ed692bc6ebaba8aa2741
-MISC ChangeLog 10001 SHA256 4e63176f32b7820762ee68408a4e3205321562aca2f3a8c080b2534eef296d85 SHA512 82cdc6650909df0166736478afd1b12a5b1b6a85a93a42f2f00eafe17d2028aa487d8d850bee0ff650fda153314c269477562452663930bfe072839d053d8707 WHIRLPOOL 7f144bf5e543540312a81aa28124cc6ba762d8385948d5d3f38ba8075af06d6906057ca10d801f92ed52e8e1e1dba18976dad5cb4061948784a29b5f0bba7fe3
+MISC ChangeLog 10198 SHA256 f5f588a6fe8e2dd2501e7d6f899f423a0cbf5d3232c116b136077996c83bc91e SHA512 c072e37907df124ba55dcebe8b69e13c12318cbdcd09c03bbe0bbea65f5c7e4eb500eddcc9e581818c9ba613638f216ab00a51c954873b7a8e2aea39370ad00f WHIRLPOOL 54deea796492ac81f88a3f7b059f33e6d8bac23ce60fba201950b32052ddbb6d04bc89fa33f72a9c04d07b597bd67a9d0fa714b8606a69d20c2b08bec0ce5807
 MISC metadata.xml 768 SHA256 e7b1056e1c95dc38c4d182a55d07c50b7e460d8aba5d271f403f600a01394c1f SHA512 e0255ef12fbfd3c837e577a6c757589e330cd5435091c1ade3c50e7063f20d41ff66f45872178b987ca99a69bd939145985dfbaf413ecf447e72c140dd2f0d0f WHIRLPOOL aa46358f124e77c5bc1026d8cacce7bcca36b48396f94e0192bb192232012cfaf8530c67342f6c6227889157841fec47261718e4be0d6781ab695ad240557d4b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIbQIIACgkQxeMuLWsGW/scCQCdGddq9czc7YV/nRjBNp1wYrS9
-IUoAnRB1Qq2huVVR3slxOCm2IzFB4NKe
-=YJiu
+iEYEAREIAAYFAlJdivcACgkQCaWpQKGI+9Tx9wCfUSji0FXV8mquTDomy+eTXfZi
+39EAoILrs8bTTTtObYPYpQEMc80yoVoX
+=m8VJ
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/files/redis.service b/dev-db/redis/files/redis.service
new file mode 100644
index 000000000000..f1322f69f11e
--- /dev/null
+++ b/dev-db/redis/files/redis.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=A persistent key-value database
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/redis/redis.pid
+ExecStart=/usr/sbin/redis-server /etc/redis.conf
+User=redis
+Group=redis
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/dev-db/redis/files/redis.tmpfiles b/dev-db/redis/files/redis.tmpfiles
new file mode 100644
index 000000000000..657d8a551d4b
--- /dev/null
+++ b/dev-db/redis/files/redis.tmpfiles
@@ -0,0 +1,2 @@
+# redis runtime directory
+d /var/run/redis 0755 redis root -
diff --git a/dev-db/redis/redis-2.6.15-r1.ebuild b/dev-db/redis/redis-2.6.15-r1.ebuild
new file mode 100644
index 000000000000..c1f137e9a6ea
--- /dev/null
+++ b/dev-db/redis/redis-2.6.15-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.6.15-r1.ebuild,v 1.1 2013/10/15 18:35:34 pacho 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.6.7"-{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
+}