commit: 5042c7e9c3d00949a820c4c93f8ab01b140e5e24
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 22 19:35:10 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 19:35:10 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5042c7e9
Fix up MariaDB 10.1.1 with new compression patches and note which patches need
a respin
---
dev-db/mariadb/mariadb-10.1.1_alpha.ebuild | 4 ++--
eclass/mysql-cmake.eclass | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
b/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
index 4fb6c32..d308efa 100644
--- a/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.1_alpha.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="5"
-MY_EXTRAS_VER="20140514-0124Z"
+MY_EXTRAS_VER="live"
WSREP_REVISION="25"
inherit toolchain-funcs mysql-multilib
@@ -14,7 +14,7 @@ IUSE="$IUSE"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
+EPATCH_EXCLUDE='01050_all_mariadb_mysql_config_cleanup-5.5.patch
20006_all_cmake_elib-mariadb-10.0.11.patch'
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 4abbd95..c57401f 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -214,8 +214,8 @@ configure_cmake_standard() {
fi
if mysql_version_is_at_least "10.1.1" ; then
- mycmakeargs+=( $(cmake-utils_use_has innodb-lz4 LZ4)
- $(cmake-utils_use_has innodb-lzo LZO) )
+ mycmakeargs+=( $(cmake-utils_use_with innodb-lz4
INNODB_LZ4)
+ $(cmake-utils_use_with innodb-lzo
INNODB_LZO) )
fi
fi
