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 14237138A1A for ; Sun, 23 Nov 2014 20:12:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1D32E0A04; Sun, 23 Nov 2014 20:12:53 +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 691E8E0A04 for ; Sun, 23 Nov 2014 20:12:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6124233FAD7 for ; Sun, 23 Nov 2014 20:12:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C00BAC2B for ; Sun, 23 Nov 2014 20:12:51 +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: <1416773564.b6b2050e05ae634af772043dbc608aa7108c782f.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: b6b2050e05ae634af772043dbc608aa7108c782f X-VCS-Branch: master Date: Sun, 23 Nov 2014 20:12: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 X-Archives-Salt: e3ed9cc7-1a92-4211-a3d0-652a551d0e1c X-Archives-Hash: 809a54b1446bb0860dd49bb9569324c3 commit: b6b2050e05ae634af772043dbc608aa7108c782f Author: Brian Evans gentoo org> AuthorDate: Sun Nov 23 20:12:44 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Sun Nov 23 20:12:44 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b6b2050e Fix multilib bug in eclass where libpcre needs multilib as well. bug 530206 Thanks to Gef gmail.com> for reporting --- eclass/mysql-multilib.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 32e0e0d..881cf3e 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -282,7 +282,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then " fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" - mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" + mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[${MULTILIB_USEDEP}]" mysql_version_is_at_least "10.1.1" && DEPEND="${DEPEND} innodb-lz4? ( app-arch/lz4 )