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 A5DF9138828 for ; Wed, 22 Oct 2014 19:35:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA11EE083C; Wed, 22 Oct 2014 19:35:24 +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 CA26CE083C for ; Wed, 22 Oct 2014 19:35:23 +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 BC2B73402BD for ; Wed, 22 Oct 2014 19:35:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6347787D4 for ; Wed, 22 Oct 2014 19:35:21 +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: <1414006510.5042c7e9c3d00949a820c4c93f8ab01b140e5e24.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mariadb/mariadb-10.1.1_alpha.ebuild eclass/mysql-cmake.eclass X-VCS-Directories: dev-db/mariadb/ eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 5042c7e9c3d00949a820c4c93f8ab01b140e5e24 X-VCS-Branch: master Date: Wed, 22 Oct 2014 19:35:21 +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: 4b4f3d80-95c5-48b6-818f-26a174b0eaf4 X-Archives-Hash: df800f1e544485fe991f634867d59931 commit: 5042c7e9c3d00949a820c4c93f8ab01b140e5e24 Author: Brian Evans gentoo org> AuthorDate: Wed Oct 22 19:35:10 2014 +0000 Commit: Brian Evans gentoo 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