commit:     c4da82b024f7606e773e4de982f2865dd8316f4b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 18:46:34 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 18:46:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4da82b0

mysql-multilib-r1.eclass: Use *_is_at_least from versionator eclass

Since dev-db/percona-server was bumped to EAPI=6 usage mysql_fx eclass is
no longer inherited [Link1] which results in an error like

 > # emerge --config dev-db/percona-server
 >
 >   Configuring pkg...
 >
 >   * Creating the mysql database and setting proper permissions on it ...
 >   /var/tmp/portage/dev-db/percona-server-5.6.32.78.0/temp/environment: line 
 > 4697: mysql_version_is_at_least: command not found

To fix this problem I replaced the call to "mysql_version_is_at_least"
function from mysql_fx eclass with a call to "version_is_at_least" function
from versionator eclass we are already inheriting [Link2].

Link1: 
https://gitweb.gentoo.org/repo/gentoo.git/tree/eclass/mysql-multilib-r1.eclass?id=b3ae687988d49123628757aa8c5422bdd3b444fb#n46

Link2: 
https://gitweb.gentoo.org/repo/gentoo.git/tree/eclass/mysql-multilib-r1.eclass?id=b3ae687988d49123628757aa8c5422bdd3b444fb#n43

Gentoo-Bug: https://bugs.gentoo.org/594298

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 858b9b6..3f7372c 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -918,7 +918,7 @@ mysql-multilib-r1_pkg_config() {
 
        local cmd
        local initialize_options
-        if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && 
mysql_version_is_at_least "5.7.6" ; then
+        if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && 
version_is_at_least "5.7.6" ; then
                # --initialize-insecure will not set root password
                # --initialize would set a random one in the log which we don't 
need as we set it ourselves
                cmd="${EROOT}usr/sbin/mysqld"

Reply via email to