[gentoo-commits] gentoo-x86 commit in dev-db/redis: redis-2.2.0_rc4.ebuild metadata.xml ChangeLog redis-1.2.6.ebuild

[Robin H. Johnson (robbat2)]

robbat2     11/01/26 02:25:33

  Modified:             metadata.xml ChangeLog redis-1.2.6.ebuild
  Added:                redis-2.2.0_rc4.ebuild
  Log:
  Bug #321487: Version bump. Bug #352266: Prefix support. Bug #335366: Respect LDFLAGS.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  dev-db/redis/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- metadata.xml	25 Mar 2010 19:01:03 -0000	1.2
+++ metadata.xml	26 Jan 2011 02:25:32 -0000	1.3
@@ -8,4 +8,10 @@
 <maintainer>
   <email>lu_zero@g.o</email>
 </maintainer>
+  <use>
+    <flag name="tcmalloc">
+      Use the <pkg>dev-util/google-perftools</pkg> libraries to
+      replace the malloc() implementation with a possibly faster one.
+    </flag>
+  </use>
 </pkgmetadata>



1.6                  dev-db/redis/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -p -w -b -B -u -u -r1.5 -r1.6
--- ChangeLog	17 May 2010 21:32:23 -0000	1.5
+++ ChangeLog	26 Jan 2011 02:25:32 -0000	1.6
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/redis
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.5 2010/05/17 21:32:23 lu_zero Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.6 2011/01/26 02:25:32 robbat2 Exp $
+
+*redis-2.2.0_rc4 (26 Jan 2011)
+
+  26 Jan 2011; Robin H. Johnson <robbat2@g.o> redis-1.2.6.ebuild,
+  +files/configure.ac-2.2, +redis-2.2.0_rc4.ebuild, metadata.xml:
+  Bug #321487: Version bump. Bug #352266: Prefix support. Bug #335366: Respect
+  LDFLAGS.
 
 *redis-1.2.6 (17 May 2010)
 



1.2                  dev-db/redis/redis-1.2.6.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-1.2.6.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-1.2.6.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-1.2.6.ebuild?r1=1.1&r2=1.2

Index: redis-1.2.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/redis-1.2.6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- redis-1.2.6.ebuild	17 May 2010 21:32:23 -0000	1.1
+++ redis-1.2.6.ebuild	26 Jan 2011 02:25:32 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-1.2.6.ebuild,v 1.1 2010/05/17 21:32:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-1.2.6.ebuild,v 1.2 2011/01/26 02:25:32 robbat2 Exp $
 
 EAPI=2
 
@@ -41,6 +41,7 @@ src_prepare() {
 		-e 's: $(DEBUG)::g' \
 		-e 's:ARCH:GCC_ARCH_FLAG:g' \
 		-e 's:PROF:GCC_PROF_FLAG:g' \
+		-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
 		Makefile.in \
 	|| die "sed failed!"
 



1.1                  dev-db/redis/redis-2.2.0_rc4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.2.0_rc4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/redis-2.2.0_rc4.ebuild?rev=1.1&content-type=text/plain

Index: redis-2.2.0_rc4.ebuild
===================================================================
# Copyright 2010-2011 W-Mark Kubacki, Mao Pu
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.2.0_rc4.ebuild,v 1.1 2011/01/26 02:25:32 robbat2 Exp $

EAPI="2"
WANT_AUTOCONF="latest"

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"
RESTRICT="primaryuri"

LICENSE="BSD"
KEYWORDS="~amd64 ~x86 ~x86-macos"
IUSE="tcmalloc"
SLOT="0"

RDEPEND=""
DEPEND=">=sys-devel/autoconf-2.63
	tcmalloc? ( dev-util/google-perftools )
	${RDEPEND}"

S="${WORKDIR}/${PN}-${PV/_/-}"

pkg_setup() {
	enewgroup redis 75 || die "problem adding 'redis' group"
	enewuser redis 75 -1 /var/lib/redis 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()
	use tcmalloc && export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes"
}

src_prepare() {
	cd "${S}"
	# 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: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_configure() {
	if ! ( use x86 || use amd64 ); then
		replace-flags "-Os" "-O2"
		filter-flags -fomit-frame-pointer "-march=*" "-mtune=*" "-mcpu=*"
	fi
	econf ${myconf} || die "econf"
}


src_install() {
	# configuration file rewrites
	insinto /etc/
	doins redis.conf || ewarn "mysteriously the configuration file is missing"
	dosed "s:daemonize no:daemonize yes:g" /etc/redis.conf
	dosed "s:# bind:bind:g" /etc/redis.conf
	dosed "s:dbfilename :dbfilename /var/lib/redis/:g" /etc/redis.conf
	dosed "s:dir ./:dir /var/lib/redis/:g" /etc/redis.conf
	dosed "s:loglevel debug:loglevel notice:g" /etc/redis.conf
	dosed "s:logfile stdout:logfile /var/log/redis/redis.log:g" /etc/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 COPYING README TODO
	dodoc design-documents/*
	docinto html
	dodoc doc/*

	dobin src/redis-cli \
	|| die "the redis command line client 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
	dodir /var/lib/redis
	dodir /var/log/redis
}

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"
}