Clean out redis-2.4.*.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

4 files changed, 9 insertions, 228 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 89e379d97c6b..446a301abe17 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,10 @@
 # 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.67 2013/08/26 11:47:13 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.68 2013/08/26 11:48:14 djc Exp $
+
+  26 Aug 2013; Dirkjan Ochtman <djc@gentoo.org> -redis-2.4.10.ebuild,
+  -redis-2.4.18.ebuild:
+  Clean out redis-2.4.*.
 
 *redis-2.6.15 (26 Aug 2013)
 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 4b77c601074e..ae4030ef06ec 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -12,22 +12,18 @@ 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
-DIST redis-2.4.10.tar.gz 621824 SHA256 4d34482198cec272afd45d0390d4e1f32ee847094834133613a925012810ed21 SHA512 9f8d6b23ecef68660204dc77af4c4d101a21fe729c0f0985422f4aebb22b1da0054e67c48fdcd65bafa764539e83c3fd35f04d21e6826db5f2831e8706ab9fca WHIRLPOOL 2e4e048def205a4ddd99fab56cca2ecbe6f22aa6eaae4355e993876c2c7972c39ff6faac2dc3e9f954d7525c02965864a1c2b228c7e023e3a330597f6b0a7810
-DIST redis-2.4.18.tar.gz 657667 SHA256 d71b6372f42fcbdc77a9601f1dd6a029ed57f7f77ac3b18bfed8670fb8c74697 SHA512 8d612007ff392717c450ef5e8e2bb8adc710add6da6fc6bf3787ca941d300cd3a208e280fb83ff21aa3d0e322427f2a1c5438708171308b3e8cfffc4034eb34c WHIRLPOOL c3b961d0755161ac367f714a92a5dedcbb9e8c539b0481e812d8d56d3669c4849ff91a4d8912a25476fbf9434258c8d42e373a53411527092863e177fdd348d7
 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.4.10.ebuild 3165 SHA256 389cdd67e6ea37b05005db96411cef297f6214af73e2c6b6e0f40b6997ff773c SHA512 e9b67c3dc88aaa1dae9ce20e12f4dd294279e5fb2717770b1c0dba0e03af206676374b52acb5ebaf44793c78bc76eab355b6af02c86abe5ff73e2aff89fcd14a WHIRLPOOL fe21368951e117c10386f413915374e77e1b628165d8b1ec569e42d0824dfe1038922e235129612a1e509a14970d85fa0c6be62289398f2efb8cef40d9c73e1a
-EBUILD redis-2.4.18.ebuild 3099 SHA256 fac26e447bc986d2725acbde498b2c001542fcb53e3a3463afba232e7d0d1168 SHA512 9946120e8a1be336abe02ee639911486bbf3a2b1930c072d035959f67a9606e8c390bbc8c0091737a6985b94b72ecbd0441c883bc30b9249bec63c1c7ff38906 WHIRLPOOL 6cd2e679340f20bf9b3447367cb6b227ddd458abb220828ea5759be797ce07e828016da42a3954c4fb6a3bf77e1e9b8cfc397d5eed4c3bea1f5bf7e1d9a2a9a1
 EBUILD redis-2.6.13.ebuild 2901 SHA256 3e2c780f5db88e5e17099f7dec4e1b9bfae50cb3ab453893d88595d828d2934d SHA512 05c902e6f3a1fdc0a813bbb4edfbcbc68c5a93444d73ea4341ecf9b6c371eddcc7c79f80af66cd601fa2d65ef517d0d4e4778c1a511d26dc4fc63af6ac682527 WHIRLPOOL b4a97b1461bf75e0bb2f38363ffb342a55c68f53625aa89ecba3fd184b1505517d9a25ac26fb5d7541934ce6a5df3161c31a7ba70574a87efdf2d66c482b2c29
 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 9881 SHA256 62353973d382350102df84a1d043290c7e92b00ce3a633f70558c8cde72e1a24 SHA512 eed091356f362b763c926c331b3b8e9e5fdaa1dd9bf9cb773585055ad95b205e420211ab842e3f6059bd86184ee76ece8e32eae449f31834066eaf6dbbcc735d WHIRLPOOL 66b82f9edd8c58d89ea0ef032b68eec6c836bbd69b36be2179110171c0e486d2240d8252705010d7c623d5201c5e48ef5366d17063a4c0323bd36aabe5d92d82
+MISC ChangeLog 10001 SHA256 4e63176f32b7820762ee68408a4e3205321562aca2f3a8c080b2534eef296d85 SHA512 82cdc6650909df0166736478afd1b12a5b1b6a85a93a42f2f00eafe17d2028aa487d8d850bee0ff650fda153314c269477562452663930bfe072839d053d8707 WHIRLPOOL 7f144bf5e543540312a81aa28124cc6ba762d8385948d5d3f38ba8075af06d6906057ca10d801f92ed52e8e1e1dba18976dad5cb4061948784a29b5f0bba7fe3
 MISC metadata.xml 768 SHA256 e7b1056e1c95dc38c4d182a55d07c50b7e460d8aba5d271f403f600a01394c1f SHA512 e0255ef12fbfd3c837e577a6c757589e330cd5435091c1ade3c50e7063f20d41ff66f45872178b987ca99a69bd939145985dfbaf413ecf447e72c140dd2f0d0f WHIRLPOOL aa46358f124e77c5bc1026d8cacce7bcca36b48396f94e0192bb192232012cfaf8530c67342f6c6227889157841fec47261718e4be0d6781ab695ad240557d4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIbQFwACgkQxeMuLWsGW/tmaQCgt6vipWJWxTKrGGnJXim5IJh9
-GPUAn2iHezQfdQ2OEc771i/feUnQ9IOG
-=SHT9
+iEYEAREIAAYFAlIbQIIACgkQxeMuLWsGW/scCQCdGddq9czc7YV/nRjBNp1wYrS9
+IUoAnRB1Qq2huVVR3slxOCm2IzFB4NKe
+=YJiu
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.4.10.ebuild b/dev-db/redis/redis-2.4.10.ebuild
deleted file mode 100644
index 2cca57967f59..000000000000
--- a/dev-db/redis/redis-2.4.10.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.10.ebuild,v 1.5 2012/09/12 15:52:37 neurogeek 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="tcmalloc? ( dev-util/google-perftools )
-	jemalloc? ( dev-libs/jemalloc )"
-DEPEND=">=sys-devel/autoconf-2.63
-	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}
-}
diff --git a/dev-db/redis/redis-2.4.18.ebuild b/dev-db/redis/redis-2.4.18.ebuild
deleted file mode 100644
index 9eaa21c972f2..000000000000
--- a/dev-db/redis/redis-2.4.18.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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.18.ebuild,v 1.2 2012/12/26 11:15:46 djc 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="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/_/-}"
-
-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
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/redis-2.4.17-shared.patch"
-	epatch "${FILESDIR}/redis-2.4.4-tcmalloc.patch"
-
-	# 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_compile() {
-	local myconf=""
-
-	if use tcmalloc ; then
-		myconf="${myconf} USE_TCMALLOC=yes"
-	elif use jemalloc ; then
-		myconf="${myconf} JEMALLOC_SHARED=yes"
-	else
-		myconf="${myconf} FORCE_LIBC_MALLOC=yes"
-	fi
-
-	emake ${myconf}
-}
-
-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:(verbose|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
-
-	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}
-}