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 C83B013877A for ; Thu, 21 Aug 2014 17:53:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DDCFE077B; Thu, 21 Aug 2014 17:53:34 +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 E2675E077B for ; Thu, 21 Aug 2014 17:53:33 +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 BD083340290 for ; Thu, 21 Aug 2014 17:53:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 362103750 for ; Thu, 21 Aug 2014 17:53:31 +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: <1408643597.d89c29911d3d8e83d68c3818efd849e76dd6fcee.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: d89c29911d3d8e83d68c3818efd849e76dd6fcee X-VCS-Branch: master Date: Thu, 21 Aug 2014 17:53:31 +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: b5db3711-e2b8-45f6-b1b1-5212df9189c2 X-Archives-Hash: 7ae67ae45e77a8b615f113279e96b405 commit: d89c29911d3d8e83d68c3818efd849e76dd6fcee Author: Brian Evans gentoo org> AuthorDate: Thu Aug 21 17:53:17 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Aug 21 17:53:17 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d89c2991 Add lsof to mariadb-galera in prep of new versions. Clean up pam IUSE and dep for percona-server --- eclass/mysql-multilib.eclass | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index bdbaf92..8b5b75a 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.4 2014/07/31 22:26:07 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.5 2014/08/17 22:50:23 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -203,11 +203,12 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then # 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" && \ REQUIRED_USE="odbc? ( extraengine !minimal ) xml? ( extraengine !minimal )" - REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" + REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !pam !sphinx ) tokudb? ( jemalloc )" fi if [[ ${PN} == "percona-server" ]]; then IUSE="${IUSE} pam" + REQUIRED_USE="${REQUIRED_USE} minimal? ( !pam )" fi REQUIRED_USE=" @@ -255,7 +256,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then # Bug 441700 MariaDB >=5.3 include custom mytop DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0:0= ) - !minimal? ( pam? ( virtual/pam:0= ) ) + pam? ( virtual/pam:0= ) perl? ( !dev-db/mytop )" if mysql_version_is_at_least "10.0.5" ; then DEPEND="${DEPEND} @@ -267,6 +268,8 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" fi +[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} pam? ( virtual/pam:0= )" + # Having different flavours at the same time is not a good idea for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do [[ ${i} == ${PN} ]] || @@ -301,8 +304,11 @@ if [[ ${PN} == "mariadb-galera" ]] ; then # The wsrep API version must match between the ebuild and sys-cluster/galera. # This will be indicated by WSREP_REVISION in the ebuild and the first number # in the version of sys-cluster/galera + # + # lsof is required as of 5.5.38 and 10.0.11 for the rsync sst RDEPEND="${RDEPEND} =sys-cluster/galera-${WSREP_REVISION}* + sys-process/lsof " fi