Remove old versions of redis.

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

4 files changed, 9 insertions, 229 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index d1ca4a59775a..b0f946d03e44 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/redis
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.34 2012/02/16 10:07:16 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.35 2012/02/16 10:10:33 djc Exp $
+
+  16 Feb 2012; Dirkjan Ochtman <djc@gentoo.org> -redis-2.4.3.ebuild,
+  -redis-2.4.4.ebuild:
+  Remove old versions.
 
 *redis-2.4.7 (16 Feb 2012)
 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index a65d9a698913..59e90969a6e5 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -8,20 +8,17 @@ AUX redis-2.4.4-tcmalloc.patch 442 RMD160 f1740f166c23f636c9c703838a49182cc7db4b
 AUX redis.confd 450 RMD160 237a72f30b3ba5c77e7dd31d2dfebc2db2cea2ad SHA1 4c298810900f0e627cd3f7bf480feb639b6cc2d5 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b
 AUX redis.initd 950 RMD160 d918ff0800f923db849dad0318ef96a2a96381f4 SHA1 7c7b3d80f14ac31b2545c2eff1f7d19adb32e6de SHA256 af87676776b658db1ca1fe87fb4f8d2e2360bae3196543b19f42654d25f6b50d
 DIST redis-2.2.12.tar.gz 455240 RMD160 8bf1275fd1d2ad1536ce7081bdf3522d5e92a8d3 SHA1 66d44756e0f3371d9e37b521f5cc17e12e1efba3 SHA256 9e2a4133b920fc4eed731c9cd3a9d0b60e701179ea98b2944ab434e7b1d0db03
-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
 DIST redis-2.4.7.tar.gz 611577 RMD160 586ffa4161d2697fd1249ed699f9f025d5e7e1a9 SHA1 cd0835f1076ad36797ed6543af187ac28a29953f SHA256 f91956377b7ff23cc23e0c8758e0b873032f36545c61d88436ebb741bf4dd5e1
 EBUILD redis-2.2.12.ebuild 3484 RMD160 c87bbe611f1c786379e090da413bd39533294af2 SHA1 a0cce800e9a6c723a3855dfd554466ddcccf571b SHA256 5e75722290ea06302549d28735ec4e8c8048b4a94b1477f18b47181edc637e5a
-EBUILD redis-2.4.3.ebuild 3367 RMD160 93d68f8b66a84bc90ce68f0eaeb847b65565b03f SHA1 dbd07f27f8489c239cda3c02dd47424a1038978f SHA256 7e73f59e9f0f52753c579e232a99d9d888a66b7fcd7a50ae8ed296a102ece661
 EBUILD redis-2.4.4-r1.ebuild 3153 RMD160 9e7803453d4de974f61d86714fa9584be4e17ce8 SHA1 76e33083ac4e82124a2f67edb3add71a215d5d75 SHA256 dd1e206429190ffc11d029c10af8275529c62041bd25806c46f40ca0c74df7a7
-EBUILD redis-2.4.4.ebuild 3482 RMD160 60e49d80e5f525671dc4287a581f1e95d7f53d12 SHA1 f536c333f9c42685bbe45ade469e80024164d8d4 SHA256 d6e1f44959ea7ad4b88cbbe08e7dc9d8b09de53fa73d044b396cbf0d5fd6a532
 EBUILD redis-2.4.7.ebuild 3157 RMD160 e5941b887124063a8796f87559fdc2dd6c85c15f SHA1 6b456f77c9ba7d1a3571d60cf35b0b9c205bbb75 SHA256 22fbeecd793b366249b412e0a9f8d8e90976176c552ef847a8f6824fba83ca44
-MISC ChangeLog 5244 RMD160 4d2f39077db5fdae1a024b50d2eda9062b1ca453 SHA1 638050ce6f4a35e259fdfcda42f11297eddca5e4 SHA256 62e7e180106aba3f2dfb0a24437d642c4bd33f5acccd2beb08234d1855d9ae5b
+MISC ChangeLog 5360 RMD160 fc3ff167155ed8aea2e0481205d9d1e3088db043 SHA1 d0834e957bc71ab963964a1f5b55111455000b0c SHA256 b79718bcb985548e343d6bc543bc1b5059b8903971ccf3a082a76a01bf2e652a
 MISC metadata.xml 735 RMD160 c6ace3bb45b12ec4cdcbbd5449f136f8cde70f26 SHA1 bbb82688cdc6c0ed9fe9ec3e41185f64d989de99 SHA256 b631a82f963f69974818f516c543c56c9c8aee1a5010af3325bf648e64171bd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk881V4ACgkQxeMuLWsGW/s2ZwCgoYV8+72mdGUHDrPSG5fE1q2S
-2nkAoLEJKMl+AiE2a9yQP0Q7JT625VaT
-=G/wg
+iEYEAREKAAYFAk881iUACgkQxeMuLWsGW/u91ACfSh4KTu3Y1h5DvcjQGNGygDO0
+HfoAn0ZWwq6SY7+qBkG0Nm9SheLJT/tw
+=FoUA
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.4.3.ebuild b/dev-db/redis/redis-2.4.3.ebuild
deleted file mode 100644
index 4f2d20598591..000000000000
--- a/dev-db/redis/redis-2.4.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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.3.ebuild,v 1.1 2011/11/26 10:37:47 lu_zero Exp $
-
-EAPI="2"
-
-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="tcmalloc test"
-SLOT="0"
-
-RDEPEND=""
-DEPEND=">=sys-devel/autoconf-2.63
-	tcmalloc? ( dev-util/google-perftools )
-	!tcmalloc? ( dev-libs/jemalloc )
-	test? ( dev-lang/tcl )
-	${RDEPEND}"
-
-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 || die "problem adding 'redis' group"
-	enewuser redis 75 -1 ${REDIS_DATAPATH} redis || die "problem adding 'redis' user"
-	# 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"
-	else
-		export EXTRA_EMAKE="${EXTRA_EMAKE} JEMALLOC_SHARED=yes"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-shared.patch" || die
-	if use !tcmalloc ; then
-		sed -i -e "s/je_/j/" src/zmalloc.c || die
-	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}
-}
diff --git a/dev-db/redis/redis-2.4.4.ebuild b/dev-db/redis/redis-2.4.4.ebuild
deleted file mode 100644
index cd8976811ed7..000000000000
--- a/dev-db/redis/redis-2.4.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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}
-}