| 1 |
commit: 9284174708ede26bf3b953f20e2fe10e353b5b7e |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 1 02:01:43 2013 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 1 02:01:43 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=92841747 |
| 7 |
|
| 8 |
[eclass] Fix mytop dependencies. |
| 9 |
Thanks to Brian Evans <grknight <AT> lavabit.com> for noticing the issue. |
| 10 |
|
| 11 |
--- |
| 12 |
eclass/mysql-v2.eclass | 20 +++++++++++--------- |
| 13 |
1 files changed, 11 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 16 |
index 81cd9f2..4b2aa74 100644 |
| 17 |
--- a/eclass/mysql-v2.eclass |
| 18 |
+++ b/eclass/mysql-v2.eclass |
| 19 |
@@ -237,15 +237,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 20 |
mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )" |
| 21 |
# Bug 441700 MariaDB >=5.3 include custom mytop |
| 22 |
mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )" |
| 23 |
- |
| 24 |
- # Bug 455016 Add dependancies of mytop |
| 25 |
- if mysql_version_is_at_least "5.3" ; then |
| 26 |
- RDEPEND="${RDEPEND} perl? ( |
| 27 |
- virtual/perl-Getopt-Long |
| 28 |
- dev-perl/TermReadKey |
| 29 |
- virtual/perl-Term-ANSIColor |
| 30 |
- virtual/perl-Time-HiRes ) " |
| 31 |
- fi |
| 32 |
fi |
| 33 |
|
| 34 |
# Having different flavours at the same time is not a good idea |
| 35 |
@@ -270,6 +261,17 @@ RDEPEND="${DEPEND} |
| 36 |
selinux? ( sec-policy/selinux-mysql ) |
| 37 |
" |
| 38 |
|
| 39 |
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 40 |
+ # Bug 455016 Add dependencies of mytop |
| 41 |
+ if mysql_version_is_at_least "5.3" ; then |
| 42 |
+ RDEPEND="${RDEPEND} perl? ( |
| 43 |
+ virtual/perl-Getopt-Long |
| 44 |
+ dev-perl/TermReadKey |
| 45 |
+ virtual/perl-Term-ANSIColor |
| 46 |
+ virtual/perl-Time-HiRes ) " |
| 47 |
+ fi |
| 48 |
+fi |
| 49 |
+ |
| 50 |
DEPEND="${DEPEND} |
| 51 |
virtual/yacc |
| 52 |
" |
Archives