From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 458351396D0 for ; Mon, 2 Oct 2017 17:14:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3B87E0DBE; Mon, 2 Oct 2017 17:14:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F017E0DBE for ; Mon, 2 Oct 2017 17:14:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C7F63416EA for ; Mon, 2 Oct 2017 17:14:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F4599085 for ; Mon, 2 Oct 2017 17:14:04 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1506964432.bc4b6477a76cbf6a0db03a3fb7582bba49fa581c.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/mysql-cmake.eclass eclass/mysql-multilib-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: bc4b6477a76cbf6a0db03a3fb7582bba49fa581c X-VCS-Branch: master Date: Mon, 2 Oct 2017 17:14:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7009edaa-1896-44f4-83eb-20a8d545ab99 X-Archives-Hash: 31acb4e71da6baace8a1f3bbfea14c86 commit: bc4b6477a76cbf6a0db03a3fb7582bba49fa581c Author: Brian Evans gentoo org> AuthorDate: Mon Oct 2 17:12:17 2017 +0000 Commit: Brian Evans gentoo 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 \