diff options
author | Dirkjan Ochtman <djc@gentoo.org> | 2013-01-24 12:10:21 +0000 |
---|---|---|
committer | Dirkjan Ochtman <djc@gentoo.org> | 2013-01-24 12:10:21 +0000 |
commit | 1a522cfd87438aad38adaa02d7cafb6a1054b637 (patch) | |
tree | f397d8f6666e04739c3e341097f819b393fc08da /dev-db/redis | |
parent | Version bump redis to 2.6.9 (bug 453606). (diff) | |
download | gentoo-2-1a522cfd87438aad38adaa02d7cafb6a1054b637.tar.gz gentoo-2-1a522cfd87438aad38adaa02d7cafb6a1054b637.tar.bz2 gentoo-2-1a522cfd87438aad38adaa02d7cafb6a1054b637.zip |
Remove old versions.
(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB)
Diffstat (limited to 'dev-db/redis')
-rw-r--r-- | dev-db/redis/ChangeLog | 6 | ||||
-rw-r--r-- | dev-db/redis/redis-2.4.16.ebuild | 107 | ||||
-rw-r--r-- | dev-db/redis/redis-2.4.17.ebuild | 114 |
3 files changed, 5 insertions, 222 deletions
diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog index 58bb2d7ef62f..d0904ae60792 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.57 2013/01/24 12:09:13 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.58 2013/01/24 12:10:21 djc Exp $ + + 24 Jan 2013; Dirkjan Ochtman <djc@gentoo.org> -redis-2.4.16.ebuild, + -redis-2.4.17.ebuild: + Remove old versions. *redis-2.6.9 (24 Jan 2013) diff --git a/dev-db/redis/redis-2.4.16.ebuild b/dev-db/redis/redis-2.4.16.ebuild deleted file mode 100644 index 8ebc1461b13f..000000000000 --- a/dev-db/redis/redis-2.4.16.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.16.ebuild,v 1.3 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-3.0 )" -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 src/zmalloc.h - 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.17.ebuild b/dev-db/redis/redis-2.4.17.ebuild deleted file mode 100644 index 998db06a9b15..000000000000 --- a/dev-db/redis/redis-2.4.17.ebuild +++ /dev/null @@ -1,114 +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.17.ebuild,v 1.2 2012/10/08 05:15:34 robbat2 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.0 )" -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.3-shared.patch" - epatch "${FILESDIR}/redis-2.4.4-tcmalloc.patch" - if use jemalloc ; then - sed -i -e "s/je_/j/" src/zmalloc.c src/zmalloc.h - 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_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} -} |