From: Brian Evans <grknight@gentoo.org>
Date: Mon, 2 Oct 2017 17:12:17 +0000 (-0400)
Subject: mysql-{cmake,multilib-r1}.eclass: Remove duplicated management of runtime directories
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bc4b6477a76cbf6a0db03a3fb7582bba49fa581c;p=gentoo.git

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 2963a97ada80..cd9e9fe294f6 100644
--- 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 d045848127f3..6c88c7198937 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 \