commit: f3026563c50abae2f0a233dfee178c05b0a137e4
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 29 16:18:45 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> 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
