[gentoo-commits] repo/gentoo:master commit in: eclass/

[Brian Evans]

commit:     7fbf49170f4269f1c3f01fa272dd7b2a15a50524
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  2 15:06:11 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct  2 15:20:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fbf4917

mysql-{multilib,multilib-r1,v2}.eclass: Remove extra option

Causes the new su bootstrap to fail.

Closes: https://bugs.gentoo.org/show_bug.cgi?id=632694

 eclass/mysql-multilib-r1.eclass | 2 --
 eclass/mysql-multilib.eclass    | 2 --
 eclass/mysql-v2.eclass          | 2 --
 3 files changed, 6 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index fcf3b4ef9d1..d045848127f 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -912,8 +912,6 @@ mysql-multilib-r1_pkg_config() {
        egrep -sq external-locking "${helpfile}" && \
        options="${options/skip-locking/skip-external-locking}"
 
-       use prefix || options="${options} --user=mysql"
-
        einfo "Creating the mysql database and setting proper permissions on it 
..."
 
        # Now that /var/run is a tmpfs mount point, we need to ensure it exists 
before using it

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index b172bc0c40a..a5a0b0b4ed4 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1053,8 +1053,6 @@ mysql-multilib_pkg_config() {
        egrep -sq external-locking "${helpfile}" && \
        options="${options/skip-locking/skip-external-locking}"
 
-       use prefix || options="${options} --user=mysql"
-
        # MySQL 5.6+ needs InnoDB
        if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
                mysql_version_is_at_least "5.6" || options="${options} 
--loose-skip-innodb"

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 53cba1eb729..fe379980a80 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -804,8 +804,6 @@ mysql-v2_pkg_config() {
        egrep -sq external-locking "${helpfile}" && \
        options="${options/skip-locking/skip-external-locking}"
 
-       use prefix || options="${options} --user=mysql"
-
        # MySQL 5.6+ needs InnoDB
        if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
                mysql_version_is_at_least "5.6" || options="${options} 
--loose-skip-innodb"