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 7D3EE1381F3 for ; Tue, 16 Jul 2013 02:48:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CE58E09F7; Tue, 16 Jul 2013 02:48:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B566E09F4 for ; Tue, 16 Jul 2013 02:48:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA16433E83C for ; Tue, 16 Jul 2013 02:48:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7972CE5459 for ; Tue, 16 Jul 2013 02:48:49 +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: <1373942821.aea7b2f310904cf7c54d7e6942ffb8d4f3c4e89a.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: aea7b2f310904cf7c54d7e6942ffb8d4f3c4e89a X-VCS-Branch: master Date: Tue, 16 Jul 2013 02:48:49 +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: 360367c4-7755-40d9-b85a-f3374f130dc8 X-Archives-Hash: 3937c6ab836f6450e193d10397b94a03 commit: aea7b2f310904cf7c54d7e6942ffb8d4f3c4e89a Author: Brian Evans lavabit com> AuthorDate: Sun Jul 7 18:55:27 2013 +0000 Commit: Brian Evans lavabit com> CommitDate: Tue Jul 16 02:47:01 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=aea7b2f3 [eclass] Add new deps for mysql-cluster 7.2+ packages --- eclass/mysql-cmake.eclass | 11 +++++++++++ eclass/mysql-v2.eclass | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index f31e4a6..7325f21 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -196,6 +196,17 @@ configure_cmake_standard() { $(cmake-utils_use_with pam) ) fi + + if [[ ${PN} == "mysql-cluster" ]]; then + # TODO: This really should include the following options, + # but the memcached package doesn't install the files it seeks. + # -DWITH_BUNDLED_MEMCACHED=OFF + # -DMEMCACHED_HOME=${EPREFIX}/usr + mycmakeargs+=( + -DWITH_BUNDLED_LIBEVENT=OFF + $(cmake-utils_use_with java NDB_JAVA) + ) + fi } # diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 66d3f07..8e6ba99 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -218,6 +218,10 @@ if [[ ${PN} == "percona-server" ]]; then mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam" fi +if [[ ${PN} == "mysql-cluster" ]] ; then + mysql_version_is_at_least "7.2.9" && IUSE="${IUSE} java" +fi + REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )" # @@ -261,6 +265,13 @@ if mysql_version_is_at_least "5.5.7" ; then DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )" fi +if [[ ${PN} == "mysql-cluster" ]] ; then + # TODO: This really should include net-misc/memcached + # but the package does not install the files it seeks. + mysql_version_is_at_least "7.2.3" && \ + DEPEND="${DEPEND} dev-libs/libevent" +fi + # prefix: first need to implement something for #196294 RDEPEND="${DEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) @@ -284,6 +295,11 @@ if [[ ${PN} == "mariadb-galera" ]] ; then " fi +if [[ ${PN} == "mysql-cluster" ]] ; then + has java ${IUSE} && RDEPEND="${RDEPEND} virtual/jre" && \ + DEPEND="${DEPEND} virtual/jdk" +fi + DEPEND="${DEPEND} virtual/yacc "