[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/

[Brian Evans]

commit:     1d826337195a43c7542ae47f43aa8da98c700dbb
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Oct 29 17:46:33 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Oct 29 17:46:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1d826337

[mariadb] Revbump to use tokudb patch and erase system depends

---
 .../mariadb/{mariadb-5.5.33a.ebuild => mariadb-5.5.33a-r1.ebuild}   | 4 ++--
 eclass/mysql-v2.eclass                                              | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dev-db/mariadb/mariadb-5.5.33a.ebuild b/dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
similarity index 96%
rename from dev-db/mariadb/mariadb-5.5.33a.ebuild
rename to dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
index 7e94379..57edaca 100644
--- a/dev-db/mariadb/mariadb-5.5.33a.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.33a-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+# $Header: $
 
 EAPI="4"
-MY_EXTRAS_VER="20130120-0100Z"
+MY_EXTRAS_VER="live"
 
 # Build system
 BUILD="cmake"

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index b3c0676..503e768 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -199,7 +199,7 @@ case "${BUILD}" in
 	"autotools")
 		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
 		;;
-	"cmake"*)
+	cmake*)
 		IUSE="debug embedded minimal +perl selinux ssl static test"
 		;;
 esac
@@ -259,10 +259,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
 	# Bug 441700 MariaDB >=5.3 include custom mytop
 	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
-	has tokudb ${IUSE} && DEPEND="${DEPEND} tokudb? (
-		>=sys-devel/gcc-4.7[lto]
-		app-arch/xz-utils
-	)"
 fi
 
 # Having different flavours at the same time is not a good idea