[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit:     8f467c68408121762877fe16227d23a023c82cce
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 18 20:55:37 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Aug 19 13:36:43 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8f467c68

Add boost as a requirement for mysql 5.7

---
 eclass/mysql-multilib.eclass | 8 +++++---
 eclass/mysql-v2.eclass       | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 41312a8..69bf3b7 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -247,6 +247,10 @@ else
        DEPEND="${DEPEND} !bindist? ( 
>=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
 fi
 
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
+       mysql_verison_is_at_least "5.7.5" && DEPEND="${DEPEND} 
dev-libs/boost:0="
+fi
+
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
        # Bug 441700 MariaDB >=5.3 include custom mytop
        DEPEND="${DEPEND}
@@ -260,9 +264,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; 
then
                        "
        fi
        mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( 
dev-libs/judy:0= )"
-       if mysql_version_is_at_least "10.0.9" ; then
-               DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
-       fi
+       mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} 
>=dev-libs/libpcre-8.35:3="
 fi
 
 # Having different flavours at the same time is not a good idea

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index dafc0f8..bb5044e 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -290,6 +290,10 @@ else
        fi
 fi
 
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
+       mysql_verison_is_at_least "5.7.5" && DEPEND="${DEPEND} dev-libs/boost"
+fi
+
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
        mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} 
libevent? ( >=dev-libs/libevent-1.4 )"
        mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( 
>=dev-libs/boost-1.40.0 )"