Drop some of the user changes to the ebuild and keep the code from the 1.2.x series ebuild.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

3 files changed, 33 insertions, 25 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 0262e165f525..c09df5fbfda6 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,10 @@
 # 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.7 2011/01/26 02:26:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.8 2011/01/26 02:43:30 robbat2 Exp $
+
+  26 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> redis-2.2.0_rc4.ebuild:
+  Drop some of the user changes to the ebuild and keep the code from the 1.2.x
+  series ebuild.
 
   26 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> redis-2.2.0_rc4.ebuild:
   QA cleanup.
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index ee8888da88bd..1ccca771c8a6 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -8,6 +8,6 @@ DIST redis-1.2.6.tar.gz 213341 RMD160 a7195e4f9ba1f7b0b3466fad4ccc28a6659db8c0 S
 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 3418 RMD160 fede1cf89d64586f1e34eafb61334193a278ef87 SHA1 b62f8148d033fc41ab3c428c6547fab07e94600b SHA256 141fd7deab40403e15257d8077d38142b413b992d855cf99d8ad3531eccc5f99
-MISC ChangeLog 1535 RMD160 7faa8a04d5c5e6b896f666f1bc41a6d0f3a4234c SHA1 55ff7aa5c49c5b44d37c5eb4c447d6807fce7c88 SHA256 47831dafa5293609a3adfbe23265cbc0bde756fc23c5135ccb8068b36dfb158c
+EBUILD redis-2.2.0_rc4.ebuild 3501 RMD160 50b016fe6b7682064d9b2f93a45722e6e8064d4a SHA1 bea5115398a6ece1a366a36748d9f737b7b02253 SHA256 c285acbd52122c00e1b01ab4b568fab3dcf549d4434cedc6695711cd7a83f039
+MISC ChangeLog 1709 RMD160 163f8d315b0ac701745bbd78646d3f56c869bad1 SHA1 453e34b2f6196f58c2ab2005a507d250ab0c12cb SHA256 1638d2213b0e9891f21b1ddfa90473115f76936fd0168c871e2bbc7f666f1200
 MISC metadata.xml 476 RMD160 ae53a6c7476f0096140d6aeff5b78afd0a537d7e SHA1 90aead6c09a278f0bb46728d6d2a6ad2ca0a7c15 SHA256 3efbbb26ceddfcb72db3eac7b37ebc48d6268d05ba4e32dbccb3e6e396a9d05e
diff --git a/dev-db/redis/redis-2.2.0_rc4.ebuild b/dev-db/redis/redis-2.2.0_rc4.ebuild
index a0647fe901f3..60d8c2566d6c 100644
--- a/dev-db/redis/redis-2.2.0_rc4.ebuild
+++ b/dev-db/redis/redis-2.2.0_rc4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 W-Mark Kubacki, Mao Pu
+# 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.0_rc4.ebuild,v 1.2 2011/01/26 02:26:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.2.0_rc4.ebuild,v 1.3 2011/01/26 02:43:30 robbat2 Exp $
 
 EAPI="2"
 
@@ -9,23 +9,29 @@ 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"
+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 || die "problem adding 'redis' group"
-	enewuser redis 75 -1 /var/lib/redis redis || die "problem adding 'redis' user"
+	enewuser redis 75 -1 ${REDIS_DATAPATH} 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
@@ -54,24 +60,22 @@ src_prepare() {
 	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
+	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
 
@@ -80,6 +84,7 @@ src_install() {
 
 	dodoc 00-RELEASENOTES BUGS Changelog CONTRIBUTING README TODO
 	dodoc design-documents/*
+	newdoc client-libraries/README README.client-libraries
 	docinto html
 	dodoc doc/*
 
@@ -94,8 +99,7 @@ src_install() {
 	else
 	        diropts -m0750 -o redis -g redis
 	fi
-	dodir /var/lib/redis
-	dodir /var/log/redis
+	keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} ${REDIS_PIDDIR}
 }
 
 pkg_postinst() {