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 1EEC413877A for ; Tue, 19 Aug 2014 18:41:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C056E08C1; Tue, 19 Aug 2014 18:41:05 +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 B38A4E08C1 for ; Tue, 19 Aug 2014 18:41:04 +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 B463A340177 for ; Tue, 19 Aug 2014 18:41:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 610AB3948 for ; Tue, 19 Aug 2014 18:41:02 +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: <1408455403.8f467c68408121762877fe16227d23a023c82cce.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 8f467c68408121762877fe16227d23a023c82cce X-VCS-Branch: master Date: Tue, 19 Aug 2014 18:41:02 +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: 7b91698d-2479-4c63-b15e-80a3bc59b19d X-Archives-Hash: 50ae0f87d56470c0c3f4c64d1d6ad8e8 commit: 8f467c68408121762877fe16227d23a023c82cce Author: Brian Evans gentoo org> AuthorDate: Mon Aug 18 20:55:37 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Aug 19 13:36:43 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8f467c68 Add boost as a requirement for mysql 5.7 --- eclass/mysql-multilib.eclass | 8 +++++--- eclass/mysql-v2.eclass | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 41312a8..69bf3b7 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -247,6 +247,10 @@ else DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" fi +if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then + mysql_verison_is_at_least "5.7.5" && DEPEND="${DEPEND} dev-libs/boost:0=" +fi + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then # Bug 441700 MariaDB >=5.3 include custom mytop DEPEND="${DEPEND} @@ -260,9 +264,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then " fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" - if mysql_version_is_at_least "10.0.9" ; then - DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" - fi + mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" fi # Having different flavours at the same time is not a good idea diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index dafc0f8..bb5044e 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -290,6 +290,10 @@ else fi fi +if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then + mysql_verison_is_at_least "5.7.5" && DEPEND="${DEPEND} dev-libs/boost" +fi + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"