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 1RC26N-0007gT-Qb for garchives@archives.gentoo.org; Fri, 07 Oct 2011 04:32:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AAB621C0B6; Fri, 7 Oct 2011 04:31:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6679F21C0B6 for ; Fri, 7 Oct 2011 04:31:56 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E97B51B4031 for ; Fri, 7 Oct 2011 04:31:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EC45080042 for ; Fri, 7 Oct 2011 04:31:54 +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: <953c6a749837de2e68eceb7f5abcf28f84d6bb14.jmbsvicetto@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: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 953c6a749837de2e68eceb7f5abcf28f84d6bb14 Date: Fri, 7 Oct 2011 04:31:54 +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: ba9dc6d94d46a1245dcecab40a2a80a4 commit: 953c6a749837de2e68eceb7f5abcf28f84d6bb14 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Fri Oct 7 04:30:39 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Fri Oct 7 04:30:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D953c6a74 [mysql-v2.eclass] Add some fixes from tree. Allow setting MY_EXTRAS_VER=3D"none" to disable it - bug 360731. Use --basedir in the mysql_install_db call - fixes bug 377707. Review procps dep - fixes bug 385001. --- eclass/mysql-v2.eclass | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index d50c9c2..5b41d12 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.8 2011/09/= 25 12:43:28 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.9 2011/10/= 07 04:30:18 jmbsvicetto Exp $ =20 # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -43,6 +43,7 @@ MYSQL_EXTRAS=3D"" # @ECLASS-VARIABLE: MYSQL_EXTRAS_VER # @DESCRIPTION: # The version of the MYSQL_EXTRAS repo to use to build mysql +# Use "none" to disable it's use [[ "${MY_EXTRAS_VER}" =3D=3D "live" ]] && MYSQL_EXTRAS=3D"git-2" =20 inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} m= ysql_fx versionator toolchain-funcs @@ -174,7 +175,7 @@ fi SRC_URI=3D"${SERVER_URI}" =20 # Gentoo patches to MySQL -[[ ${MY_EXTRAS_VER} !=3D live ]] \ +[[ ${MY_EXTRAS_VER} !=3D live ]] && [[ ${MY_EXTRAS_VER} !=3D none ]] \ && SRC_URI=3D"${SRC_URI} mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 @@ -235,7 +236,7 @@ IUSE=3D"${IUSE} berkdb" # These are used for both runtime and compiletime DEPEND=3D" ssl? ( >=3Ddev-libs/openssl-0.9.6d ) - userland_GNU? ( sys-process/procps ) + kernel_linux? ( sys-process/procps ) >=3Dsys-apps/sed-4 >=3Dsys-apps/texinfo-4.7-r1 >=3Dsys-libs/readline-4.1 @@ -639,7 +640,7 @@ mysql-v2_pkg_config() { help_tables=3D"${TMPDIR}/fill_help_tables.sql" =20 pushd "${TMPDIR}" &>/dev/null - "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>= &1 + "${ROOT}/usr/bin/mysql_install_db --basedir=3D/usr" >"${TMPDIR}"/mysql_= install_db.log 2>&1 if [ $? -ne 0 ]; then grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysq= ld.err AND ${TMPDIR}/mysql_install_db.log"