[gentoo-commits] gentoo-x86 commit in dev-db/redis: ChangeLog redis-2.4.18.ebuild redis-2.6.7.ebuild

[Dirkjan Ochtman (djc)]

djc         12/12/26 11:15:46

  Modified:             ChangeLog redis-2.4.18.ebuild
  Added:                redis-2.6.7.ebuild
  Log:
  Version bump redis to 2.6.7 (bug 439354), fix up 2.4.18 patch name.
  
  (Portage version: 2.1.11.27/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB)

Revision  Changes    Path
1.55                 dev-db/redis/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog	26 Dec 2012 11:05:46 -0000	1.54
+++ ChangeLog	26 Dec 2012 11:15:46 -0000	1.55
@@ -1,6 +1,13 @@
 # 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.54 2012/12/26 11:05:46 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.55 2012/12/26 11:15:46 djc Exp $
+
+*redis-2.6.7 (26 Dec 2012)
+
+  26 Dec 2012; Dirkjan Ochtman <djc@g.o> redis-2.4.18.ebuild,
+  +redis-2.6.7.ebuild, +files/redis-2.6.7-config.patch,
+  +files/redis-2.6.7-shared.patch:
+  Version bump to 2.6.7 (bug 439354), fix up 2.4.18 patch name.
 
 *redis-2.4.18 (26 Dec 2012)
 



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

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

Index: redis-2.4.18.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.18.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redis-2.4.18.ebuild	26 Dec 2012 11:05:46 -0000	1.1
+++ redis-2.4.18.ebuild	26 Dec 2012 11:15:46 -0000	1.2
@@ -1,6 +1,6 @@
 # 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.18.ebuild,v 1.1 2012/12/26 11:05:46 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.18.ebuild,v 1.2 2012/12/26 11:15:46 djc Exp $
 
 EAPI="4"
 
@@ -37,7 +37,7 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-shared.patch"
+	epatch "${FILESDIR}/redis-2.4.17-shared.patch"
 	epatch "${FILESDIR}/redis-2.4.4-tcmalloc.patch"
 
 	# now we will rewrite present Makefiles



1.1                  dev-db/redis/redis-2.6.7.ebuild

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

Index: redis-2.6.7.ebuild
===================================================================
# 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.6.7.ebuild,v 1.1 2012/12/26 11:15:46 djc 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.2 )"
DEPEND=">=sys-devel/autoconf-2.63
	test? ( dev-lang/tcl )
	${RDEPEND}"
REQUIRED_USE="tcmalloc? ( !jemalloc )
	jemalloc? ( !tcmalloc )"

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

pkg_setup() {
	enewgroup redis 75
	enewuser redis 75 -1 /var/lib/redis redis
}

src_prepare() {
	epatch "${FILESDIR}/${P}"-{shared,config}.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_compile() {
	local myconf=""

	if use tcmalloc ; then
		myconf="${myconf} USE_TCMALLOC=yes"
	elif use jemalloc ; then
		myconf="${myconf} JEMALLOC_SHARED=yes"
	else
		myconf="${myconf} MALLOC=yes"
	fi

	emake ${myconf}
}

src_install() {
	insinto /etc/
	doins redis.conf sentinel.conf
	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
	fperms 0644 /etc/{redis,sentinel}.conf

	newconfd "${FILESDIR}/redis.confd" redis
	newinitd "${FILESDIR}/redis.initd" redis

	nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO 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
	dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel

	if use prefix; then
		diropts -m0750
	else
		diropts -m0750 -o redis -g redis
	fi
	keepdir /var/{log,lib}/redis
}