| 1 |
commit: f3026563c50abae2f0a233dfee178c05b0a137e4 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 29 16:18:45 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 29 16:18:45 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f3026563 |
| 7 |
|
| 8 |
Revert REQUIRED_USE change to pam as it may confuse users |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-multilib.eclass | 7 +++---- |
| 12 |
1 file changed, 3 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 15 |
index a9a3d75..8fe5247 100644 |
| 16 |
--- a/eclass/mysql-multilib.eclass |
| 17 |
+++ b/eclass/mysql-multilib.eclass |
| 18 |
@@ -203,12 +203,11 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then |
| 19 |
# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers |
| 20 |
mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" && \ |
| 21 |
REQUIRED_USE="odbc? ( extraengine !minimal ) xml? ( extraengine !minimal )" |
| 22 |
- REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !pam !sphinx ) tokudb? ( jemalloc )" |
| 23 |
+ REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" |
| 24 |
fi |
| 25 |
|
| 26 |
if [[ ${PN} == "percona-server" ]]; then |
| 27 |
IUSE="${IUSE} pam" |
| 28 |
- REQUIRED_USE="${REQUIRED_USE} minimal? ( !pam )" |
| 29 |
fi |
| 30 |
|
| 31 |
REQUIRED_USE=" |
| 32 |
@@ -256,7 +255,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 33 |
# Bug 441700 MariaDB >=5.3 include custom mytop |
| 34 |
DEPEND="${DEPEND} |
| 35 |
oqgraph? ( >=dev-libs/boost-1.40.0:0= ) |
| 36 |
- pam? ( virtual/pam:0= ) |
| 37 |
+ !minimal? ( pam? ( virtual/pam:0= ) ) |
| 38 |
perl? ( !dev-db/mytop )" |
| 39 |
if mysql_version_is_at_least "10.0.5" ; then |
| 40 |
DEPEND="${DEPEND} |
| 41 |
@@ -268,7 +267,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 42 |
mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" |
| 43 |
fi |
| 44 |
|
| 45 |
-[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} pam? ( virtual/pam:0= )" |
| 46 |
+[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )" |
| 47 |
|
| 48 |
# Having different flavours at the same time is not a good idea |
| 49 |
for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do |
Archives