From b9d3ff19d33784c3ca5f270585a91bf5b5979d1e Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Thu, 31 May 2012 07:50:06 +0000 Subject: Remove old versions of redis. Package-Manager: portage-2.1.10.63/cvs/Linux x86_64 --- dev-db/redis/ChangeLog | 6 +- dev-db/redis/Manifest | 15 +--- dev-db/redis/files/redis-2.2-as-needed.patch | 53 ------------- dev-db/redis/redis-2.2.12.ebuild | 111 --------------------------- dev-db/redis/redis-2.4.7.ebuild | 108 -------------------------- dev-db/redis/redis-2.4.8.ebuild | 108 -------------------------- 6 files changed, 9 insertions(+), 392 deletions(-) delete mode 100644 dev-db/redis/files/redis-2.2-as-needed.patch delete mode 100644 dev-db/redis/redis-2.2.12.ebuild delete mode 100644 dev-db/redis/redis-2.4.7.ebuild delete mode 100644 dev-db/redis/redis-2.4.8.ebuild (limited to 'dev-db/redis') diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog index 1e2c8766872e..f9f59ceceb95 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.42 2012/05/21 09:28:19 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.43 2012/05/31 07:50:06 djc Exp $ + + 31 May 2012; Dirkjan Ochtman -redis-2.2.12.ebuild, + -files/redis-2.2-as-needed.patch, -redis-2.4.7.ebuild, -redis-2.4.8.ebuild: + Remove old versions. 21 May 2012; Pawel Hajdan jr redis-2.4.10.ebuild: x86 stable wrt bug #415893 diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index d42f2deccad2..8915ca646e24 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -2,29 +2,22 @@ Hash: SHA512 AUX configure.ac-2.2 1522 RMD160 76faaedfd1debd7e10d9a7a15a8ca845a7c4dad8 SHA1 baa5e21f7b90a35811e05560278ad233fa049178 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f -AUX redis-2.2-as-needed.patch 1994 RMD160 63810e94ec9f765b08ec12fb405fc769c704605d SHA1 eaf65b408468a60249b94fcd22110db51dabfe04 SHA256 be3b3f243dbc39ee8ac57bc77022f9866f4675a708ed2a33d5b76dc3289f8584 AUX redis-2.4.3-shared.patch 708 RMD160 ed2c774f8ae684a722c1b46684e695dfbd596871 SHA1 607819295f05b4374b770395fee05a7710321483 SHA256 a2d3fda42993aa0b75f08e8a328a7cc1de9af97b50e2b479c85421062c9d8e82 AUX redis-2.4.4-tcmalloc.patch 442 RMD160 f1740f166c23f636c9c703838a49182cc7db4bc5 SHA1 c94bba49b0573cef15d5cc8124610ec8b4069b2b SHA256 59c5dd571143e869395b460d15683acc322bf7092c05279b047ba76243ec818b 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.10.tar.gz 621824 RMD160 1dc59ff4390b5459ce80d803cbadc3128d239d73 SHA1 fceecc25a332db77cb94d16a3d9a337156600556 SHA256 4d34482198cec272afd45d0390d4e1f32ee847094834133613a925012810ed21 DIST redis-2.4.13.tar.gz 625464 RMD160 f1c87719627114efcfc64aeb842d1d925f2fd52f SHA1 212128b1c7cc0021beb3dae38b7fe957d6743f3b SHA256 b6e057b6b5cd5946f8b46b2427401400686ed4f6c4af446eb1f0ec170d3f87be 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 -DIST redis-2.4.8.tar.gz 618164 RMD160 235d607326e57cb296178112c8073db8b473a3e6 SHA1 d050838530e2b77dc1724efd29e5367a4c5c1e18 SHA256 8166ca6ddea4bdb311510590a1ef94e3e32eed2fae44875a5b44fe72bda556f3 -EBUILD redis-2.2.12.ebuild 3484 RMD160 c87bbe611f1c786379e090da413bd39533294af2 SHA1 a0cce800e9a6c723a3855dfd554466ddcccf571b SHA256 5e75722290ea06302549d28735ec4e8c8048b4a94b1477f18b47181edc637e5a EBUILD redis-2.4.10.ebuild 3163 RMD160 9d9e3daa3f35dc458a814c7bad4c12dae8a77b56 SHA1 6683e5bd73dd512de08742819bf9cc3969672a2f SHA256 b3e239db0ac4e4fdd4957fb16a9801d091189a323908e079bb3365a360f42327 EBUILD redis-2.4.13.ebuild 3158 RMD160 237f3e368791ccab6e763354e73543b2398024b4 SHA1 fb4e102126a80c3a7cbbb4c118af1e2c75743ede SHA256 237e64067aa091151128703f5bd6de74257545305e8ce893f2093fb44d86b975 EBUILD redis-2.4.4-r1.ebuild 3154 RMD160 c165072861811d513b00ef64affa96eb2f3bd7de SHA1 2f2eaa5f9b4e7d3fcce7c9817b73da69eeac15ab SHA256 d0a916e74183926a28e59d3ab475b475b2f50b8592fbc5678cd52901f1f56c5d -EBUILD redis-2.4.7.ebuild 3157 RMD160 e5941b887124063a8796f87559fdc2dd6c85c15f SHA1 6b456f77c9ba7d1a3571d60cf35b0b9c205bbb75 SHA256 22fbeecd793b366249b412e0a9f8d8e90976176c552ef847a8f6824fba83ca44 -EBUILD redis-2.4.8.ebuild 3157 RMD160 dec4204e41f850055ee0feceebec7e46996c5b9a SHA1 63e987f4c0a8551d6f048ca0164002c95fb6097d SHA256 1a317e32444b1be2bf367d18239f1780ba850dad2c4437feb5a2273c4b15f872 -MISC ChangeLog 6248 RMD160 d46b168ec4a43899edd4190e6a35286074edf76d SHA1 c8985a651d4bf32e93a8c7dd3b6df111d8caff59 SHA256 46babea4618981dee8a6091c97ac69bf7aa4468b4646e27069e91e711c8d8db4 +MISC ChangeLog 6413 RMD160 411dff74d000ab3fa34ae8249c165528c185aba8 SHA1 a6c38ef02cd1d0a0182081df17f6d0ec3f1e4895 SHA256 8ce38786bb6d0ca612a535161ef5610a0e674b1937cf384a093452f10d00c0c8 MISC metadata.xml 735 RMD160 c6ace3bb45b12ec4cdcbbd5449f136f8cde70f26 SHA1 bbb82688cdc6c0ed9fe9ec3e41185f64d989de99 SHA256 b631a82f963f69974818f516c543c56c9c8aee1a5010af3325bf648e64171bd5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREKAAYFAk+6CrEACgkQuUQtlDBCeQI4hQCcCKF817FqnFnfxx0CLZOpFTiN -cfIAn0R1Okey0zvzJQouAp5TBBnutt+f -=46Av +iEYEAREKAAYFAk/HIrsACgkQxeMuLWsGW/ulpACgt+mDS0LY2work7sR7I2TOnZM +nUwAnR4SHwRlrA0yp6B70/GZj8DRpg0Q +=ISmM -----END PGP SIGNATURE----- diff --git a/dev-db/redis/files/redis-2.2-as-needed.patch b/dev-db/redis/files/redis-2.2-as-needed.patch deleted file mode 100644 index d40cf0dbae6c..000000000000 --- a/dev-db/redis/files/redis-2.2-as-needed.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e1f01c9b28751d71ba0df682fb0f6b62f4db9191 Mon Sep 17 00:00:00 2001 -From: Pieter Noordhuis -Date: Thu, 28 Jul 2011 10:38:11 +0200 -Subject: [PATCH] Fix link order for ld --as-needed (thanks to Nigel Babu) - ---- - src/Makefile | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 67b0972..f2bbfac 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -32,7 +32,7 @@ ifeq ($(USE_TCMALLOC),yes) - CCLINK+= -ltcmalloc - CFLAGS+= -DUSE_TCMALLOC - endif --CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) -+CCOPT= $(CFLAGS) $(ARCH) $(PROF) - - PREFIX= /usr/local - INSTALL_BIN= $(PREFIX)/bin -@@ -130,12 +130,12 @@ dependencies: - cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)" - - redis-server: $(OBJ) -- $(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) -+ $(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(CCLINK) - - redis-benchmark: dependencies $(BENCHOBJ) - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR) - cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)" -- $(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a -+ $(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a $(CCLINK) - - redis-benchmark.o: - $(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $< -@@ -147,10 +147,10 @@ redis-cli.o: - $(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis -I../deps/linenoise $(DEBUG) $(COMPILE_TIME) $< - - redis-check-dump: $(CHECKDUMPOBJ) -- $(QUIET_LINK)$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ) -+ $(QUIET_LINK)$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ) $(CCLINK) - - redis-check-aof: $(CHECKAOFOBJ) -- $(QUIET_LINK)$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) -+ $(QUIET_LINK)$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) $(CCLINK) - - .c.o: - $(QUIET_CC)$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $< --- -1.7.6 - diff --git a/dev-db/redis/redis-2.2.12.ebuild b/dev-db/redis/redis-2.2.12.ebuild deleted file mode 100644 index 6f4001d2ff55..000000000000 --- a/dev-db/redis/redis-2.2.12.ebuild +++ /dev/null @@ -1,111 +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.2.12.ebuild,v 1.4 2011/11/02 21:40:35 vapier Exp $ - -EAPI="2" - -inherit autotools eutils flag-o-matic - -DESCRIPTION="A persistent caching system, key-value and data structures database." -HOMEPAGE="http://code.google.com/p/redis/" -SRC_URI="http://redis.googlecode.com/files/${PN}-${PV/_/-}.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 ) - 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 - 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() - use tcmalloc && export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes" -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-2.2-as-needed.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_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,,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.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 Changelog CONTRIBUTING README TODO - dodoc design-documents/* - newdoc client-libraries/README README.client-libraries - docinto html - dodoc doc/* - - 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} -} - -pkg_postinst() { - einfo "New features of Redis you want to consider enabling in redis.conf:" - einfo " * unix sockets (using this is highly recommended)" - einfo " * logging to syslog" - einfo " * VM aka redis' own swap mechanism" -} diff --git a/dev-db/redis/redis-2.4.7.ebuild b/dev-db/redis/redis-2.4.7.ebuild deleted file mode 100644 index 3704824c8287..000000000000 --- a/dev-db/redis/redis-2.4.7.ebuild +++ /dev/null @@ -1,108 +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.7.ebuild,v 1.1 2012/02/16 10:07:16 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 - 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,,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.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.8.ebuild b/dev-db/redis/redis-2.4.8.ebuild deleted file mode 100644 index 9eb1a212ad35..000000000000 --- a/dev-db/redis/redis-2.4.8.ebuild +++ /dev/null @@ -1,108 +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.8.ebuild,v 1.1 2012/03/02 08:57:11 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 - 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,,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.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} -} -- cgit v1.2.3-65-gdbad