From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 877931385AE for ; Sun, 20 Jan 2013 23:02:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3DF721C047; Sun, 20 Jan 2013 23:02:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46A1621C047 for ; Sun, 20 Jan 2013 23:02:53 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3132B33DB03 for ; Sun, 20 Jan 2013 23:02:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C8D51E4079 for ; Sun, 20 Jan 2013 23:02:50 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1358722905.ce009d738e6887c7b5f9053e9681041e338b9404.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-autotools.eclass eclass/mysql-cmake.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: ce009d738e6887c7b5f9053e9681041e338b9404 X-VCS-Branch: master Date: Sun, 20 Jan 2013 23:02:50 +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: b1dd118a-4927-42e8-97ee-b75b9f4cc544 X-Archives-Hash: 2f528ca9bfb1315183d82cd947a7987b commit: ce009d738e6887c7b5f9053e9681041e338b9404 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jan 20 23:01:45 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jan 20 23:01:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ce009d73 Sync from gentoo-x86. --- eclass/mysql-autotools.eclass | 5 ++--- eclass/mysql-cmake.eclass | 7 ++++--- eclass/mysql-v2.eclass | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index 822ae9d..71dba31 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.10 2012/11/01 23:57:50 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.12 2013/01/20 02:41:59 robbat2 Exp $ # @ECLASS: mysql-autotools.eclass # @MAINTAINER: @@ -605,9 +605,8 @@ mysql-autotools_src_install() { einfo "Creating initial directories" # Empty directories ... diropts "-m0750" + keepdir "${MY_DATADIR#${EPREFIX}}" if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then - dodir "${MY_DATADIR#${EPREFIX}}" - keepdir "${MY_DATADIR#${EPREFIX}}" chown -R mysql:mysql "${D}/${MY_DATADIR}" fi diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 560167b..06124b3 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.10 2012/11/01 23:57:50 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.13 2013/01/20 02:37:51 robbat2 Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -15,7 +15,7 @@ # the src_unpack, src_prepare, src_configure, src_compile, scr_install, # pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks. -inherit cmake-utils flag-o-matic multilib +inherit cmake-utils flag-o-matic multilib prefix # # HELPER FUNCTIONS: @@ -335,7 +335,7 @@ mysql-cmake_src_install() { 5.[5-9]|6*|7*) mysql_mycnf_version="5.5" ;; esac einfo "Building default my.cnf (${mysql_mycnf_version})" - insinto "${MY_SYSCONFDIR}" + insinto "${MY_SYSCONFDIR#${EPREFIX}}" doins scripts/mysqlaccess.conf mycnf_src="my.cnf-${mysql_mycnf_version}" sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ @@ -346,6 +346,7 @@ mysql-cmake_src_install() { -e "/character-set/s|utf8|latin1|g" \ "${TMPDIR}/my.cnf.ok" fi + eprefixify "${TMPDIR}/my.cnf.ok" newins "${TMPDIR}/my.cnf.ok" my.cnf # Minimal builds don't have the MySQL server diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 59d3223..221ed61 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.21 2012/11/01 23:57:50 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.22 2013/01/20 02:23:10 robbat2 Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: