From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-489596-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 510241381FD
	for <garchives@archives.gentoo.org>; Fri, 27 Jul 2012 16:11:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 3754DE060F;
	Fri, 27 Jul 2012 16:09:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 07E43E0587
	for <gentoo-commits@lists.gentoo.org>; Fri, 27 Jul 2012 16:09:08 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 746421B40BE
	for <gentoo-commits@lists.gentoo.org>; Fri, 27 Jul 2012 16:09:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 07A17E5443
	for <gentoo-commits@lists.gentoo.org>; Fri, 27 Jul 2012 16:09:06 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <1343349643.6da661c4f751c1337b516f4f91de99dd9c6ebcae.robbat2@gentoo>
Subject: [gentoo-commits] proj/mysql:master commit in: eclass/
X-VCS-Repository: proj/mysql
X-VCS-Files: eclass/mysql-v2.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: 6da661c4f751c1337b516f4f91de99dd9c6ebcae
X-VCS-Branch: master
Date: Fri, 27 Jul 2012 16:09:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 4123c8c3-135d-4765-996d-3c4dcd8fe42c
X-Archives-Hash: d728107370f83ad374f900925c7f9cbe

commit:     6da661c4f751c1337b516f4f91de99dd9c6ebcae
Author:     jbergstroem <bugs <AT> bergstroem <DOT> nu>
AuthorDate: Fri Jul 27 00:40:43 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 00:40:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6da661c4

Simplify logic for allocators

Signed-off-by: jbergstroem <bugs <AT> bergstroem.nu>

---
 eclass/mysql-v2.eclass |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 13bdd9b..df795cb 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -186,15 +186,10 @@ IUSE="${IUSE} +community profiling"
 && mysql_version_is_at_least "5.2.5" \
 && IUSE="${IUSE} sphinx"
 
-mysql_version_is_at_least "5.5" \
-&& REQUIRED_USE="tcmalloc? ( !jemalloc )
-    jemalloc? ( !tcmalloc )"
-
-mysql_version_is_at_least "5.5" \
-&& IUSE="${IUSE} jemalloc"
-
-mysql_version_is_at_least "5.5" \
-&& IUSE="${IUSE} tcmalloc"
+if mysql_version_is_at_least "5.5"; then
+	REQUIRED_USE="tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )"
+	IUSE="${IUSE} jemalloc tcmalloc"
+fi
 
 mysql_version_is_at_least "5.5.7" \
 && IUSE="${IUSE} systemtap"