mysql-{cmake,multilib-r1}.eclass: Remove duplicated management of runtime directories

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

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 2963a97ada805417e8e3175e5cb36bc3b750f3ad..cd9e9fe294f6240b4f630e90fd7b3364b1c756d8 100644 (file)
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -501,27 +501,6 @@ mysql-cmake_src_install() {
        eprefixify "${TMPDIR}/my.cnf.ok"
        newins "${TMPDIR}/my.cnf.ok" my.cnf
 
-       # Minimal builds don't have the MySQL server
-       if use_if_iuse minimal ; then
-               :
-       elif ! in_iuse server || use_if_iuse server ; then
-               einfo "Creating initial directories"
-               # Empty directories ...
-               diropts "-m0750"
-               if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
-                       dodir "${MY_DATADIR#${EPREFIX}}"
-                       keepdir "${MY_DATADIR#${EPREFIX}}"
-                       nonfatal fowners -R mysql:mysql "${D}/${MY_DATADIR}"
-               fi
-
-               diropts "-m0755"
-               for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
-                       dodir "${folder}"
-                       keepdir "${folder}"
-                       nonfatal fowners -R mysql:mysql "${ED}/${folder}"
-               done
-       fi
-
        # Minimal builds don't have the MySQL server
        if use_if_iuse minimal ; then
                :

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index d045848127f3afbbf7f40420df74186336b27b60..6c88c71989378ac99dae3d0c55677f186102760c 100644 (file)
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -598,22 +598,6 @@ multilib_src_install() {
                newins "${TMPDIR}/my.cnf.ok" my.cnf
 
                if use server ; then
-                       einfo "Creating initial directories"
-                       # Empty directories ...
-                       diropts "-m0750"
-                       if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
-                               dodir "${MY_DATADIR#${EPREFIX}}"
-                               keepdir "${MY_DATADIR#${EPREFIX}}"
-                               nonfatal fowners -R mysql:mysql "${D}/${MY_DATADIR}"
-                       fi
-
-                       diropts "-m0755"
-                       for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
-                               dodir "${folder}"
-                               keepdir "${folder}"
-                               nonfatal fowners -R mysql:mysql "${ED}/${folder}"
-                       done
-
                        einfo "Including support files and sample configurations"
                        docinto "support-files"
                        for script in \