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

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index fcf3b4ef9d16d6a82959490e9bef1344c840f822..d045848127f3afbbf7f40420df74186336b27b60 100644 (file)
--- 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 b172bc0c40a047dae72fae7100cc3408fab764aa..a5a0b0b4ed42f0add2037937cf02fa4067d6132e 100644 (file)
--- 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 53cba1eb729754b344d3b43c6268164e1f357dd9..fe379980a800ef40b04e3069d11c0baad30888d9 100644 (file)
--- 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"