Fix verbosity issue per bus #428722 and EMAKE_EXTRA bug #437344.

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

3 files changed, 25 insertions, 25 deletions

diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 217c724c00e9..d71a127b3e61 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,9 @@
 # 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.51 2012/09/30 13:18:59 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.52 2012/10/08 05:15:35 robbat2 Exp $
+
+  08 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> redis-2.4.17.ebuild:
+  Fix verbosity issue per bus #428722 and EMAKE_EXTRA bug #437344.
 
   30 Sep 2012; Dirkjan Ochtman <djc@gentoo.org> -redis-2.4.4-r1.ebuild:
   Remove another old version.
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index cbc632872c73..81527e18de19 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX configure.ac-2.2 1522 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f SHA512 7a67bbd2f5fcfd7e1bfe18b739438342d40484c3f178ef5e2ddb617480715626e7f5a47d58660761489867ae460a58457a85a14bb2af90fe2e2ab3b8bd940b34 WHIRLPOOL a78a56a8e5963fee703b90d4eba112591693ded8ff8b780b049864be4fe712815ef0743d32b120edadca4e5909982d841cfa4ed1483b9eb91bc030ecdf3d7c70
 AUX redis-2.4.3-shared.patch 708 SHA256 a2d3fda42993aa0b75f08e8a328a7cc1de9af97b50e2b479c85421062c9d8e82 SHA512 12f5494d24b33226422a17d4290fed090a3f529d6d35fa11137598fa1c4bbe3933cd32499fd067a59573fb4b01c2101e69b0b5652b09ece73078f0a5a91aa99e WHIRLPOOL f8090ba54ed6c5d7035b29960ec6b4a83c7d575191e3ad5a6a12af00243c7446477b2ed0d3fc28851dea6e6dbbda3f19f39f43ea72e5589cf383a55e0aa882d3
 AUX redis-2.4.4-tcmalloc.patch 442 SHA256 59c5dd571143e869395b460d15683acc322bf7092c05279b047ba76243ec818b SHA512 374bc086de124be706d84951f7e3178fb158159fc9e7bd19c204f071d5b41bc10bc20167e273f271e4aa9e5909e6d36b644ea9e1f981c6de023451f5fa0c3077 WHIRLPOOL 7e6fd6bf8769237f8f3d5d19fcda29c62e009ad0077a8cf1803e16ab9d7c8662c0bc5735a602fb3e739cbea6a8792c31c2757cfa34d1e11f99a0888d03f5a309
@@ -11,13 +8,6 @@ DIST redis-2.4.16.tar.gz 649908 SHA256 d35cc89d73aa1ff05af5f1380a4411c828979b3b4
 DIST redis-2.4.17.tar.gz 656155 SHA256 3fae7c47ef84886ff65073593c91586bb675babaf702eb6f3b37855ab3066ebd SHA512 9c4aff041ac2dc430f631330281a7eb4798e956e846cc09c040973c565953ca8f20c3dc19daa38a4bdfa36ca19d79b2e5ac6bf9cfdbea9430747913881daa653 WHIRLPOOL 4314463583930c4e3ed82b1d958837c7f5672668f78a48efb348377d80a66fd61e86f078bf5a5cf6ab5b4b25a87ac292f46c569b35c5a149cbc8a581bf722d90
 EBUILD redis-2.4.10.ebuild 3165 SHA256 389cdd67e6ea37b05005db96411cef297f6214af73e2c6b6e0f40b6997ff773c SHA512 e9b67c3dc88aaa1dae9ce20e12f4dd294279e5fb2717770b1c0dba0e03af206676374b52acb5ebaf44793c78bc76eab355b6af02c86abe5ff73e2aff89fcd14a WHIRLPOOL fe21368951e117c10386f413915374e77e1b628165d8b1ec569e42d0824dfe1038922e235129612a1e509a14970d85fa0c6be62289398f2efb8cef40d9c73e1a
 EBUILD redis-2.4.16.ebuild 3187 SHA256 81b26ac5c5674d955f6575f7aa71203fa8bb4c24377d17de4df4d52c75fbce23 SHA512 6c82fb90fe64f72efa1c8e8fc5570ac1f921daba7fc6056372755220bb439df35addfc1a754c1e0988741fa5e0a68acb81d04fef1075bf7839d207f6ac43da0c WHIRLPOOL 4a7770cc5f8a0e7414439b8222269a6cf69feb958ab942a4daff2731fafcccea54397a37f6d7230cfa773ae8b235a887f54ec1a2ec533558f1189dc2b4f3beb6
-EBUILD redis-2.4.17.ebuild 3181 SHA256 8fda007349b1275b9cb88473ba856283a340c4d805bacee295c0a0ca3c4be523 SHA512 f74447f76a32ff8b2e6a3c92b0b8a6c0003731376bfd354ce4c2a630f0619f3503f7e7c9e0d5d63c44b491b1900810de042b301f10e5f9e3a27f300a1c03ff39 WHIRLPOOL 615db08818ac0dd403a77fc7667e57cf7be3d3c138c6fee3ebd2839048dd58e21d600899f556e0e85504a9c50557e57aa895594fa556a90def5326fe352e7bb3
-MISC ChangeLog 7561 SHA256 a16cb7673d8df82f492b04d12d28368204b3f951e7e60a04bc4477652ef4f1db SHA512 15a113c6ab2108c23b8ba9c035d03957c38fd4d57f67b75bd5ae8136994d1277ba5ef1c37003264ee3f8434fcf4cb5e9014d037d4527dc4063d63cf42987812c WHIRLPOOL 1f74da91acf6c8be494882c1c25b72eec1c2ffd46ec2b68590c43ac093273d0461d76bb1c4607cda44b26e8ae33aef2fd9dba71a7b37751afa885e7695805362
+EBUILD redis-2.4.17.ebuild 3180 SHA256 ab7f146fffc6b8de65e0c1eae8e1a65ff699d06803d3117c52501626e00de6c5 SHA512 0435823f90806a19e10fec7b16d2287c27abe355b7643e8174b576aaaf98f63b491f7410d22bbd4d2e73381971ac41bf1cae0eeeed1ea90082678d80a3e75584 WHIRLPOOL c0b45ebe6447548a1552d15b57858093117b4a9912ca210652945b8d70f1872544cc25325fcf8a19cac63b13cb88df4ee9383f9d99ef673648ea8530964b4471
+MISC ChangeLog 7707 SHA256 9703a0a3bd801dd643030aeee7e7068155b32714c88ce7ef353ce035e97452b3 SHA512 bd5cea732bd5df11a44a7e63ec2d03381a28449ef1bb63f3d50d511428b44ac771c7648169c8d66a079d47da435bc24fb8043f226137b41e985444dc501f04a3 WHIRLPOOL 31ed7e7b05db5fe29c2a0c41778cb1dfaf8630c84ffe8738e7ef402aa2eb799a245d469f5af47dd9751ba3c46ad3ee424630e45507cdb90426ba4efc1d9574c0
 MISC metadata.xml 735 SHA256 b631a82f963f69974818f516c543c56c9c8aee1a5010af3325bf648e64171bd5 SHA512 a61a72783016c3b13f2be1ec20f1639c3c73b04576bc3dfb0b999dd33104592d529b7665ea5e31f3798969bccad5664009a3b6ad9deac0cae1e494f7769969e3 WHIRLPOOL ce75f8ebeb6a006b1a9f5a25a481443b411fc951a7cc5eef57a65e13b12683ad4f9f5eb691a2b1b30d788847d6df03acaa79c8686895e5bd5fc1ab61bb6bcc98
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlBoRssACgkQxeMuLWsGW/sKXQCfcwp7lhTE/jMRTHqL+h8DXajD
-6x8AnRrQUBFYHpHVwlMBGlW3GKfyzCj2
-=k1/h
------END PGP SIGNATURE-----
diff --git a/dev-db/redis/redis-2.4.17.ebuild b/dev-db/redis/redis-2.4.17.ebuild
index 858877239ed9..998db06a9b15 100644
--- a/dev-db/redis/redis-2.4.17.ebuild
+++ b/dev-db/redis/redis-2.4.17.ebuild
@@ -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.17.ebuild,v 1.1 2012/09/30 12:16:12 djc Exp $
+# $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"
 
@@ -34,13 +34,6 @@ 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() {
@@ -70,6 +63,20 @@ src_prepare() {
 	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/
@@ -81,7 +88,7 @@ src_install() {
 		-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 '/^loglevel\>/s:(verbose|debug):notice:' \
 		-e "/^logfile\>/s:stdout:${REDIS_LOGFILE}:" \
 		<redis.conf \
 		>redis.conf.gentoo
@@ -92,16 +99,16 @@ src_install() {
 	newconfd "${FILESDIR}/redis.confd" redis
 	newinitd "${FILESDIR}/redis.initd" redis
 
-	nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING README TODO
+	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
+		diropts -m0750
 	else
-	        diropts -m0750 -o redis -g redis
+		diropts -m0750 -o redis -g redis
 	fi
 	keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH}
 }