diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2014-06-05 04:36:30 -0700 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-06-05 04:36:30 -0700 |
| commit | e90365ed44152f0567a31c4eaa55088d796f24fa (patch) | |
| tree | b7225354f362d9bee32980454346c491e8dfacd6 | |
| parent | x11-libs/*: live ebuilds from x11-overlay w/ multilib merges (diff) | |
| download | gmt-e90365ed44152f0567a31c4eaa55088d796f24fa.tar.gz gmt-e90365ed44152f0567a31c4eaa55088d796f24fa.tar.bz2 gmt-e90365ed44152f0567a31c4eaa55088d796f24fa.zip | |
eclass/mysql-v2.eclass: fix some mismerges
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
| -rw-r--r-- | eclass/mysql-v2.eclass | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index d79f9ee..1e7dd4b 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -193,7 +193,7 @@ if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then http://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" fi -DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" HOMEPAGE="http://www.mysql.com/" if [[ ${PN} == "mariadb" ]]; then HOMEPAGE="http://mariadb.org/" @@ -226,6 +226,8 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent" mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \ REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph )" + mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx" && \ + REQUIRED_USE="${REQUIRED_USE} minimal? ( !sphinx )" mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam" # 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} tokudb odbc xml" && \ @@ -277,8 +279,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4${_mysql_v2_multilib_usedep} )" mysql_version_is_at_least "5.2" && \ DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0${_mysql_v2_multilib_usedep} )" - mysql_version_is_at_least "5.2.5" && \ - DEPEND="${DEPEND} sphinx? ( app-misc/sphinx${_mysql_v2_multilib_usedep} )" mysql_version_is_at_least "5.2.10" && \ DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam${_mysql_v2_multilib_usedep} ) )" # Bug 441700 MariaDB >=5.3 include custom mytop @@ -329,12 +329,13 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then # Bug 455016 Add dependencies of mytop if mysql_version_is_at_least "5.3" ; then RDEPEND="${RDEPEND} - perl? ( - virtual/perl-Getopt-Long - dev-perl/TermReadKey - virtual/perl-Term-ANSIColor - virtual/perl-Time-HiRes - ) " + perl? ( + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes + ) + " fi fi |