diff options
-rw-r--r-- | eclass/mysql.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 435734c5dd9a..ed65cd917597 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.120 2009/12/09 18:46:53 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.121 2009/12/09 18:54:05 robbat2 Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: @@ -159,7 +159,7 @@ mysql_version_is_at_least "5.1.12" \ # Get the percona tarball if XTRADB_VER and PERCONA_VER are both set XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/percona-xtradb-${XTRADB_VER}.tar.gz" mysql_version_is_at_least "5.1.26" \ -&& [[ -n ${XTRADB_VER} && -n ${PERCONA_VER} ]] \ +&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \ && SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )" DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." @@ -184,9 +184,11 @@ mysql_version_is_at_least "5.1" \ || IUSE="${IUSE} berkdb" mysql_version_is_at_least "5.1.12" \ +&& [[ -n "${PBXT_VERSION}" ]] \ && IUSE="${IUSE} pbxt" mysql_version_is_at_least "5.1.26" \ +&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \ && IUSE="${IUSE} xtradb" [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \ |