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

[Brian Evans]

commit:     bc4b6477a76cbf6a0db03a3fb7582bba49fa581c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  2 17:12:17 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct  2 17:13:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4b6477

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

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

 eclass/mysql-cmake.eclass       | 21 ---------------------
 eclass/mysql-multilib-r1.eclass | 16 ----------------
 2 files changed, 37 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 2963a97ada8..cd9e9fe294f 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -504,27 +504,6 @@ mysql-cmake_src_install() {
        # 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
-               :
        elif ! in_iuse server || use_if_iuse server; then
                einfo "Including support files and sample configurations"
                docinto "support-files"

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index d045848127f..6c88c719893 100644
--- 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 \