From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8BBE41389E2 for ; Wed, 26 Nov 2014 00:35:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23C3CE0874; Wed, 26 Nov 2014 00:35:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE0DAE0874 for ; Wed, 26 Nov 2014 00:35:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F19BE3403E5 for ; Wed, 26 Nov 2014 00:35:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9ECA8AEA7 for ; Wed, 26 Nov 2014 00:35:34 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1416962128.0ef9172664b19b1cf2afe6cf97e85d77b549de95.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass eclass/mysql-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 0ef9172664b19b1cf2afe6cf97e85d77b549de95 X-VCS-Branch: master Date: Wed, 26 Nov 2014 00:35:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f0431990-36cb-4bf6-a7b8-c419b08dd8bb X-Archives-Hash: 13e964e8dafe4fc7196c6f30ab801e73 commit: 0ef9172664b19b1cf2afe6cf97e85d77b549de95 Author: Brian Evans gentoo org> AuthorDate: Wed Nov 26 00:35:28 2014 +0000 Commit: Brian Evans gentoo 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: