From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q3cMq-0007bd-8y for garchives@archives.gentoo.org; Sat, 26 Mar 2011 22:54:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D04F6E05BE; Sat, 26 Mar 2011 22:53:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8AF9EE05BE for ; Sat, 26 Mar 2011 22:53:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E85371B4130 for ; Sat, 26 Mar 2011 22:53:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4BF578006A for ; Sat, 26 Mar 2011 22:53:51 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: f0a97e237807ac69adcc63bbea7062b170f17e0e Date: Sat, 26 Mar 2011 22:53:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3831b5d68c9521708739cbb5eb2cfb21 commit: f0a97e237807ac69adcc63bbea7062b170f17e0e Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Sat Mar 26 22:53:07 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Sat Mar 26 22:53:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3Df0a97e23 Apply the fix for bug 356885 again as it was lost during the branch work. Call mysql_lib_symlinks as we decided to keep the symlinks in place. --- eclass/mysql-cmake.eclass | 2 ++ eclass/mysql-v2.eclass | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index ea33cb0..4beeee3 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -439,4 +439,6 @@ mysql-cmake_src_install() { # done # # fi + + mysql_lib_symlinks "${D}" } diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 03ddbd0..f0ad6ad 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -578,7 +578,6 @@ mysql-v2_pkg_config() { =20 local pwd1=3D"a" local pwd2=3D"b" - local MYSQL_ROOT_PASSWORD=3D'' local maxtry=3D15 =20 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then @@ -598,8 +597,8 @@ mysql-v2_pkg_config() { =20 if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then =20 - einfo "Please provide a password for the mysql 'root' user now," - einfo "or in the MYSQL_ROOT_PASSWORD env var." + einfo "Please provide a password for the mysql 'root' user now, in the= " + einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file." ewarn "Avoid [\"'\\_%] characters in the password" read -rsp " >" pwd1 ; echo =20