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 7C1FB13877A for ; Fri, 29 Aug 2014 20:34:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B875E0D36; Fri, 29 Aug 2014 20:34:17 +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 AA802E0D36 for ; Fri, 29 Aug 2014 20:34:16 +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 A9CE73400A4 for ; Fri, 29 Aug 2014 20:34:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 544B0431E for ; Fri, 29 Aug 2014 20:34:14 +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: <1409329125.f3026563c50abae2f0a233dfee178c05b0a137e4.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: f3026563c50abae2f0a233dfee178c05b0a137e4 X-VCS-Branch: master Date: Fri, 29 Aug 2014 20:34:14 +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: 0bcf1e81-7d96-4f71-80c5-3dc0c7bd864d X-Archives-Hash: 532f9441d21469bb6ed462a75d480eea commit: f3026563c50abae2f0a233dfee178c05b0a137e4 Author: Brian Evans gentoo org> AuthorDate: Fri Aug 29 16:18:45 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Aug 29 16:18:45 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f3026563 Revert REQUIRED_USE change to pam as it may confuse users --- eclass/mysql-multilib.eclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index a9a3d75..8fe5247 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -203,12 +203,11 @@ 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 !pam !sphinx ) tokudb? ( jemalloc )" + REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" fi if [[ ${PN} == "percona-server" ]]; then IUSE="${IUSE} pam" - REQUIRED_USE="${REQUIRED_USE} minimal? ( !pam )" fi REQUIRED_USE=" @@ -256,7 +255,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= ) - pam? ( virtual/pam:0= ) + !minimal? ( pam? ( virtual/pam:0= ) ) perl? ( !dev-db/mytop )" if mysql_version_is_at_least "10.0.5" ; then DEPEND="${DEPEND} @@ -268,7 +267,7 @@ 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= )" +[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( 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