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 D4CDF138200 for ; Mon, 29 Apr 2013 23:57:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED797E09BB; Mon, 29 Apr 2013 23:57:46 +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 3A257E09A1 for ; Mon, 29 Apr 2013 23:57:46 +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 2531333E045 for ; Mon, 29 Apr 2013 23:57:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C19FDE4528 for ; Mon, 29 Apr 2013 23:57:43 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1367279480.ff42ea3a24aeed2ce21b3afbc58536d0ecab844c.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: ff42ea3a24aeed2ce21b3afbc58536d0ecab844c X-VCS-Branch: master Date: Mon, 29 Apr 2013 23:57:43 +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: 6e11ed25-dde4-4581-a97c-b09e9186ccd1 X-Archives-Hash: 3ad98cd95083a479ad00b088fbb986ce commit: ff42ea3a24aeed2ce21b3afbc58536d0ecab844c Author: Brian Evans lavabit com> AuthorDate: Mon Apr 29 23:51:20 2013 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Mon Apr 29 23:51:20 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ff42ea3a [eclass/mysql-v2] Update eclass to support mariadb-galera. --- eclass/mysql-v2.eclass | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 0f2922e..eda43a4 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -115,7 +115,7 @@ mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with # Work out the default SERVER_URI correctly if [ -z "${SERVER_URI}" ]; then [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}" - if [ "${PN}" == "mariadb" ]; then + if [ "${PN}" == "mariadb" ] || [ "${PN}" == "mariadb-galera" ]; then MARIA_FULL_PV="$(replace_version_separator 3 '-' ${MY_PV})" MARIA_FULL_P="${PN}-${MARIA_FULL_PV}" SERVER_URI=" @@ -126,6 +126,9 @@ if [ -z "${SERVER_URI}" ]; then http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz " + if [ "${PN}" == "mariadb-galera" ]; then + MY_SOURCEDIR="${PN%%-galera}-${GALERA_FULL_PV}" + fi else URI_DIR="MySQL" URI_FILE="mysql" @@ -154,6 +157,10 @@ if [[ "${PN}" == "mariadb" ]]; then HOMEPAGE="http://mariadb.org/" DESCRIPTION="An enhanced, drop-in replacement for MySQL" fi +if [ "${PN}" == "mariadb-galera" ]; then + HOMEPAGE="http://mariadb.org/" + DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication" +fi LICENSE="GPL-2" SLOT="0" @@ -178,15 +185,15 @@ IUSE="${IUSE} +community profiling" && mysql_check_version_range "5.1.38 to 5.3.99" \ && IUSE="${IUSE} libevent" -[[ ${PN} == "mariadb" ]] \ +([[ ${PN} == "mariadb" ]] || [[ "${PN}" == "mariadb-galera" ]])\ && mysql_version_is_at_least "5.2" \ && IUSE="${IUSE} oqgraph" -[[ ${PN} == "mariadb" ]] \ +([[ ${PN} == "mariadb" ]] || [[ "${PN}" == "mariadb-galera" ]])\ && mysql_version_is_at_least "5.2.5" \ && IUSE="${IUSE} sphinx" -[[ ${PN} == "mariadb" ]] \ +([[ ${PN} == "mariadb" ]] || [[ "${PN}" == "mariadb-galera" ]])\ && mysql_version_is_at_least "5.2.10" \ && IUSE="${IUSE} pam" @@ -215,7 +222,7 @@ DEPEND=" >=sys-libs/zlib-1.2.3 " -[[ ${PN} == mariadb ]] \ +([[ ${PN} == "mariadb" ]] || [[ "${PN}" == "mariadb-galera" ]])\ && mysql_check_version_range "5.1.38 to 5.3.99" \ && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" @@ -225,20 +232,20 @@ for i in "mysql" "mariadb" "mariadb-galera" ; do DEPEND="${DEPEND} !dev-db/${i}" done -[[ "${PN}" == "mariadb" ]] \ +([[ ${PN} == "mariadb" ]] || [[ "${PN}" == "mariadb-galera" ]])\ && mysql_version_is_at_least "5.2" \ && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )" -[[ "${PN}" == "mariadb" ]] \ +([[ ${PN} == "mariadb" ]] || [[ "${PN}" == "mariadb-galera" ]])\ && mysql_version_is_at_least "5.2.5" \ && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )" -[[ "${PN}" == "mariadb" ]] \ +([[ ${PN} == "mariadb" ]] || [[ "${PN}" == "mariadb-galera" ]])\ && mysql_version_is_at_least "5.2.10" \ && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )" # Bug 441700 MariaDB >=5.3 include custom mytop -[[ "${PN}" == "mariadb" ]] \ +([[ ${PN} == "mariadb" ]] || [[ "${PN}" == "mariadb-galera" ]])\ && mysql_version_is_at_least "5.3" \ && DEPEND="${DEPEND} perl? ( !dev-db/mytop )" @@ -259,7 +266,7 @@ RDEPEND="${DEPEND} " # Bug 455016 Add dependancies of mytop -[[ "${PN}" == "mariadb" ]] \ +([[ ${PN} == "mariadb" ]] || [[ "${PN}" == "mariadb-galera" ]])\ && mysql_version_is_at_least "5.3" \ && RDEPEND="${RDEPEND} perl? ( virtual/perl-Getopt-Long @@ -294,13 +301,13 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}" # PBXT_VERSION means that we have a PBXT patch for this PV # PBXT was only introduced after 5.1.12 pbxt_patch_available() { - [[ ${PN} != "mariadb" ]] \ + [[ ${PN} != "mariadb" ]] && [[ ${PN} != "mariadb-galera" ]]\ && [[ -n "${PBXT_VERSION}" ]] return $? } pbxt_available() { - pbxt_patch_available || [[ ${PN} == "mariadb" ]] + pbxt_patch_available || [[ ${PN} == "mariadb" ]] || [[ ${PN} == "mariadb-galera" ]] return $? } @@ -309,7 +316,7 @@ pbxt_available() { # XTRADB_VERS means that we have a XTRADB patch for this PV # XTRADB was only introduced after 5.1.26 xtradb_patch_available() { - [[ ${PN} != "mariadb" ]] \ + [[ ${PN} != "mariadb" ]] && [[ ${PN} != "mariadb-galera" ]] \ && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] return $? }