Remove old version.

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

3 files changed, 8 insertions, 126 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 3b2fc137ad91..0aa04e3aaa3f 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/redis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.9 2011/04/04 09:28:26 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.10 2011/04/04 09:31:24 djc Exp $
+
+  04 Apr 2011; Dirkjan Ochtman <djc@gentoo.org> -redis-1.2.5.ebuild:
+  Remove old version.
 
   04 Apr 2011; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
   Add myself as a maintainer.
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 11b3d5c096ac..02eefa3378e6 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -6,18 +6,16 @@ AUX configure.ac-1.02 1496 RMD160 41e3f453f993020ce6477392fed18261c199a9a5 SHA1
 AUX configure.ac-2.2 1522 RMD160 76faaedfd1debd7e10d9a7a15a8ca845a7c4dad8 SHA1 baa5e21f7b90a35811e05560278ad233fa049178 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f
 AUX redis.confd 450 RMD160 237a72f30b3ba5c77e7dd31d2dfebc2db2cea2ad SHA1 4c298810900f0e627cd3f7bf480feb639b6cc2d5 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b
 AUX redis.initd 859 RMD160 a5718f3b4eab11450223c21bc98ab75d408e932e SHA1 ba3237364dba1da920ec4f14c13ff2cd45062144 SHA256 8b25b60bca695a8393e381078b2a42330c1b6cc2953bbe3c1b7cbd41ca36fe5d
-DIST redis-1.2.5.tar.gz 204039 RMD160 c2c6606a4d4607f897f673cf0e32f76e51794571 SHA1 f28d840d8100586796cab02ccd8e91545a92179d SHA256 43bbb937b530cf736c19110dae8cd71d3369b2a6129654396956e62683902025
 DIST redis-1.2.6.tar.gz 213341 RMD160 a7195e4f9ba1f7b0b3466fad4ccc28a6659db8c0 SHA1 c71aef0b3f31acb66353d86ba57dd321b541043f SHA256 bed0641225f786f225a2c4897ffbec1e6573a3c31e9f899884ee3041eab96873
 DIST redis-2.2.0-rc4.tar.gz 445431 RMD160 3df1c4d866b3af1f90ce7d299f5132d83dee5627 SHA1 f4cd8e1b7dee04f1e9f07a1dcef8a09d190002a0 SHA256 5f3398c0b6d8e01132ea07f2b3143193db0a1e4dc8408cc5bd789a1e97cffc85
-EBUILD redis-1.2.5.ebuild 3388 RMD160 edc603a73058aff2a1af1db7b30a9a89b42657f8 SHA1 deb68e77c0f561121aee10b1065088b462314c79 SHA256 4a39dfb4878ca4f7bc1bece7efb156d284485a8d8d83e6b7f53b69a1d6c4eea4
 EBUILD redis-1.2.6.ebuild 3424 RMD160 73b93a1a26b70e3c1d57dc7d2706237f03bae5e8 SHA1 8ac89e4e53986b2285c3d1017f75b764f2d699da SHA256 a4bba1ac854ebb4ac6829f0883882fa57eda01b3b8ad67de6ad19413eb5547c2
 EBUILD redis-2.2.0_rc4.ebuild 3501 RMD160 50b016fe6b7682064d9b2f93a45722e6e8064d4a SHA1 bea5115398a6ece1a366a36748d9f737b7b02253 SHA256 c285acbd52122c00e1b01ab4b568fab3dcf549d4434cedc6695711cd7a83f039
-MISC ChangeLog 1798 RMD160 2538841ddeeb5a1f3f902631c8f5da2aec834a3c SHA1 f373ad46823a26aecf8c1631d4ae030d87dfeb0f SHA256 6aacfdef7b38fdf1eb506323ef9a766b9b0d46b9e9c234ef6a4cdfdaaf12d26b
+MISC ChangeLog 1891 RMD160 d30e91009bc5058e85be232fb14a43c64a772474 SHA1 21ecbc4b832528817c7722c99a8dec06ed3a63a1 SHA256 14fb68bea858a038548d7606f7f4489aeeb96187dcb44a47ef2b05a0064fb32b
 MISC metadata.xml 553 RMD160 3be3be322cb813db7b6ca636b6fdca13a9a0483c SHA1 7d5dd7d39f782f4903052bc1f78a8baeff06460e SHA256 0533101247089bd059f8740d38b49a326307d60d0c6d66818ab552f3a65f0e34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2Zj0QACgkQxeMuLWsGW/s7RACeKbul6uu9XKnxdHW27KuIdd3D
-WqMAniobHaKgllKpqWT5snQdKdhpOxLU
-=Jm5m
+iEYEARECAAYFAk2Zj/UACgkQxeMuLWsGW/sSWgCfbPkBjNGIqeLZE+6Oe+1AdvQ7
+fooAnAwDD/EY60fhGEgLpAvpxY5xw/lU
+=R/Ye
 -----END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-1.2.5.ebuild b/dev-db/redis/redis-1.2.5.ebuild
deleted file mode 100644
index 53cd2693010d..000000000000
--- a/dev-db/redis/redis-1.2.5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-1.2.5.ebuild,v 1.4 2010/05/17 21:32:23 lu_zero Exp $
-
-EAPI=2
-
-inherit autotools eutils
-
-DESCRIPTION="Persistent distributed key-value data caching system."
-HOMEPAGE="http://code.google.com/p/redis/"
-SRC_URI="http://redis.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="test? ( dev-lang/tcl )"
-
-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"
-}
-
-src_prepare() {
-	# Borrowed from debian
-	epatch "${FILESDIR}"/01-dont-print-pid-on-startup.diff
-	# Now autotoolize this
-	cp "${FILESDIR}"/configure.ac-1.02 configure.ac
-	mv Makefile Makefile.in
-	sed -i \
-		-e 's:$(CC):@CC@:g' \
-		-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-		-e 's: $(DEBUG)::g' \
-		-e 's:ARCH:GCC_ARCH_FLAG:g' \
-		-e 's:PROF:GCC_PROF_FLAG:g' \
-		Makefile.in \
-	|| die "sed failed!"
-
-	eautoreconf
-}
-
-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
-	fowners root:redis /etc/redis.conf
-	fperms 0640 /etc/redis.conf
-
-	newconfd "${FILESDIR}/redis.confd" redis
-	newinitd "${FILESDIR}/redis.initd" redis
-
-	dodoc 00-RELEASENOTES BETATESTING.txt BUGS Changelog README TODO
-	newdoc client-libraries/README README.client-libraries
-	dohtml doc/*
-
-	dobin redis-benchmark redis-cli
-	dosbin redis-server
-
-	diropts -m0750 -o redis -g redis
-	keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} ${REDIS_PIDDIR}
-}
-
-src_test() {
-	local PORT=$(((RANDOM % 32767)+32768))
-	local PIDFILE=redis-test.pid
-	einfo "Preparing redis test config"
-	# The port number is hardcoded in lots of places
-	sed -r <redis.conf >redis-test.conf \
-		-e "/^pidfile/s~ .*~ ${PIDFILE}~" \
-		-e '/^daemonize/s~ no~ yes~' \
-		-e "/^port/s~ [0-9]+~ ${PORT}~" \
-		-e '/^(# )?bind/s,^,#,g' \
-		-e '/\<bind\>/abind 127.0.0.1' \
-		|| die "Failed to build test server config"
-	# The port number is hardcoded in lots of places
-	for i in test-redis.tcl redis.tcl ; do
-		sed -r <$i >${i/.tcl/-${PORT}.tcl} \
-			-e "/^source redis.tcl/s,redis.tcl,redis-${PORT}.tcl,g" \
-			-e "/6379/s~6379~${PORT}~" \
-			|| die "Failed to build test client config ($i)"
-	done
-	einfo "Starting test server"
-	./redis-server redis-test.conf
-	rc1=$?
-	sleep 2
-	[[ $rc1 -ne 0 ]] && die "Failed to start redis server!"
-	pidof redis-server | fgrep -f ${PIDFILE}
-	rc1=$?
-	[[ $rc1 -ne 0 ]] && die "Could not find started redis server!"
-	unset rc1
-
-	einfo "Starting redis tests"
-	tclsh test-redis-$PORT.tcl
-	rc1=$?
-	kill -9 $(<${PIDFILE})
-	rc2=$?
-	[[ $rc1 -ne 0 ]] && die "Failed testsuite"
-	[[ $rc2 -ne 0 ]] && die "Failed to shut down redis server"
-}