[gentoo-commits] proj/mysql:master commit in: eclass/

["Brian Evans" <grknight@gentoo.org>]

commit:     0ef9172664b19b1cf2afe6cf97e85d77b549de95
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 26 00:35:28 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Nov 26 00:35:28 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0ef91726

Header sync

---
 eclass/mysql-cmake.eclass    | 11 +++--------
 eclass/mysql-multilib.eclass |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 85444ee..b7f4799 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.25 2014/10/08 17:25:46 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.26 2014/11/26 00:34:41 grknight Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:
@@ -218,15 +218,10 @@ configure_cmake_standard() {
 			)
 		fi
 
-		if mysql_version_is_at_least "10.0.15"; then
-			# Disable mroonga until the groonga options can be analyzed
-			# Groonga is bundled in and lots of defaults and possible dep magic
-			# It can be a package on its own
-			mycmakeargs+=( -DWITHOUT_MROONGA=1 )
-		fi
-
 		if in_iuse mroonga ; then
 			use mroonga || mycmakeargs+=( -DWITHOUT_MROONGA=1 )
+		else
+			mycmakeargs+=( -DWITHOUT_MROONGA=1 )
 		fi
 
 		if in_iuse galera ; then

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 881cf3e..ba5b299 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.10 2014/10/08 17:25:46 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.11 2014/11/26 00:34:41 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER: