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 497691380DC for ; Tue, 4 Feb 2014 21:13:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9C04E09AD; Tue, 4 Feb 2014 21:13:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54585E09AD for ; Tue, 4 Feb 2014 21:13:38 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0546133EECB for ; Tue, 4 Feb 2014 21:13:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 2A1FC18278 for ; Tue, 4 Feb 2014 21:13:35 +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: <1391548375.a4fe4b9bb99d03493b67f88c47ef50aceab16958.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: a4fe4b9bb99d03493b67f88c47ef50aceab16958 X-VCS-Branch: master Date: Tue, 4 Feb 2014 21:13:35 +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: b72b615f-23de-4cbd-91da-744e8951dfa5 X-Archives-Hash: e05a3dfd72547886a825d59861181ed4 commit: a4fe4b9bb99d03493b67f88c47ef50aceab16958 Author: Brian Evans tuffmail com> AuthorDate: Tue Feb 4 21:12:55 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Tue Feb 4 21:12:55 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a4fe4b9b [eclass] Fix bug 446200 and remove unnecessary () --- eclass/mysql-v2.eclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index ddb7e67..39fcbf0 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -365,7 +365,7 @@ pbxt_patch_available() { } pbxt_available() { - pbxt_patch_available || ( [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32" ) + pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32" return $? } @@ -769,6 +769,10 @@ mysql-v2_pkg_config() { use prefix || options="${options} --user=mysql" + # Fix bug 446200. Don't reference host my.cnf + use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \ + && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" + pushd "${TMPDIR}" &>/dev/null #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}" cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db